Skip to content

Commit ae502d9

Browse files
mustafaimanmustafaiman
committed
Adapts serialization service tests to change in serialization service constructor
1 parent d2b447e commit ae502d9

File tree

11 files changed

+21
-23
lines changed

11 files changed

+21
-23
lines changed

‎src/aggregation/AggregatorFactory.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
NumberAverageAggregator,
3232
} from './Aggregator';
3333
import {ILogger} from '../logging/ILogger';
34+
import {HazelcastError} from '../HazelcastError';
3435

3536
export class AggregatorFactory implements IdentifiedDataSerializableFactory {
3637

@@ -56,11 +57,9 @@ export class AggregatorFactory implements IdentifiedDataSerializableFactory {
5657
static readonly MAX_BY = 17; // needs object to implement Java's Comparable interface
5758
static readonly MIN_BY = 18; // needs object to implement Java's Comparable interface
5859

59-
private logger: ILogger;
6060
private idToConstructor: { [id: number]: Aggregator<any> } = {};
6161

62-
constructor(logger: ILogger) {
63-
this.logger = logger;
62+
constructor() {
6463
this.idToConstructor[AggregatorFactory.COUNT] = CountAggregator;
6564
this.idToConstructor[AggregatorFactory.DOUBLE_AVG] = DoubleAverageAggregator;
6665
this.idToConstructor[AggregatorFactory.DOUBLE_SUM] = DoubleSumAggregator;
@@ -80,8 +79,7 @@ export class AggregatorFactory implements IdentifiedDataSerializableFactory {
8079
try {
8180
return (new (this.idToConstructor[type] as FunctionConstructor)()) as any;
8281
} catch (e) {
83-
this.logger.error('Aggregatorfactory', 'There is no known aggregator with type id ' + type, e);
84-
return null;
82+
throw new HazelcastError('There is no known aggregator with type id ' + type, e);
8583
}
8684
}
8785

‎src/serialization/SerializationService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export class SerializationServiceV1 implements SerializationService {
279279
factories[PREDICATE_FACTORY_ID] = new PredicateFactory(DefaultPredicates);
280280
factories[RELIABLE_TOPIC_MESSAGE_FACTORY_ID] = new ReliableTopicMessageFactory();
281281
factories[ClusterDataFactoryHelper.FACTORY_ID] = new ClusterDataFactory();
282-
factories[AggregatorFactory.FACTORY_ID] = new AggregatorFactory(this.client.getLoggingService().getLogger());
282+
factories[AggregatorFactory.FACTORY_ID] = new AggregatorFactory();
283283
this.registerSerializer('identified', new IdentifiedDataSerializableSerializer(factories));
284284
}
285285

‎test/nearcache/NearCacheTest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ describe('NearCacheImpl', function () {
261261

262262
function createSerializationService() {
263263
var cfg = new Config.ClientConfig().serializationConfig;
264-
return new SerializationService(cfg);
264+
return new SerializationService(undefined, cfg);
265265
}
266266

267267
function promiseBefore(boundaryInSec, func) {

‎test/serialization/BinaryCompatibilityTest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('Binary serialization compatibility test', function () {
114114
});
115115
cfg.isBigEndian = isBigEndian;
116116
cfg.defaultNumberType = defaultNumberType;
117-
return new SerializationService(cfg)
117+
return new SerializationService(undefined, cfg)
118118
}
119119

120120
before(function () {

‎test/serialization/CustomSerializerTest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('Custom Serializer', function () {
4242
return obj;
4343
}
4444
});
45-
service = new SerializationService.SerializationServiceV1(cfg.serializationConfig);
45+
service = new SerializationService.SerializationServiceV1(undefined, cfg.serializationConfig);
4646
});
4747

4848
it('write-read', function () {

‎test/serialization/DefaultSerializersTest.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ describe('Default serializers Test', function () {
7070

7171
parameters.forEach(function (obj) {
7272
it('type: ' + typeof obj + ', isArray: ' + Array.isArray(obj) + ', value: ' + JSON.stringify(obj), function () {
73-
var serializationService = new SerializationService.SerializationServiceV1(new Config.ClientConfig().serializationConfig);
73+
var serializationService = new SerializationService.SerializationServiceV1(undefined, new Config.ClientConfig().serializationConfig);
7474
var serialized = serializationService.toData(obj);
7575
expect(serializationService.toObject(serialized)).to.deep.equal(obj);
7676
})
@@ -93,7 +93,7 @@ describe('Default serializers Test', function () {
9393
}
9494
var serializationConfig = new Config.ClientConfig().serializationConfig;
9595
serializationConfig.defaultNumberType = type;
96-
var serializationService = new SerializationService.SerializationServiceV1(serializationConfig);
96+
var serializationService = new SerializationService.SerializationServiceV1(undefined, serializationConfig);
9797
var serialized = serializationService.toData(num);
9898
expect(serializationService.toObject(serialized)).to.deep.equal(num);
9999
})
@@ -108,7 +108,7 @@ describe('Default serializers Test', function () {
108108
}
109109
var serializationConfig = new Config.ClientConfig().serializationConfig;
110110
serializationConfig.defaultNumberType = type;
111-
var serializationService = new SerializationService.SerializationServiceV1(serializationConfig);
111+
var serializationService = new SerializationService.SerializationServiceV1(undefined, serializationConfig);
112112
var serialized = serializationService.toData(nums);
113113
expect(serializationService.toObject(serialized)).to.deep.equal(nums);
114114
})

‎test/serialization/GlobalSerializerTest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('Global Serializer', function () {
3939
return obj;
4040
}
4141
};
42-
service = new SerializationService.SerializationServiceV1(cfg.serializationConfig);
42+
service = new SerializationService.SerializationServiceV1(undefined, cfg.serializationConfig);
4343
});
4444

4545
it('write-read', function () {

‎test/serialization/IdentifiedDataSerializableTest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ describe('Identified Data Serializable', function () {
106106
it('serialize deserialize identified data serializable', function () {
107107
var cfg = new Config.ClientConfig();
108108
cfg.serializationConfig.dataSerializableFactories[1] = identifiedFactory;
109-
service = new SerializationService.SerializationServiceV1(cfg.serializationConfig);
109+
service = new SerializationService.SerializationServiceV1(undefined, cfg.serializationConfig);
110110
var dd = new IdentifiedDataClass(99, true, 'a', 23, 54375456, Long.fromBits(243534, 43543654), 24.1, 32435.6533,
111111
'hazelcast', [99, 100, 101], [true, false, false, true], ['a', 'b', 'v'], [12, 545, 23, 6], [325, 6547656, 345],
112112
[Long.fromNumber(342534654), Long.fromNumber(-3215243654), Long.fromNumber(123123)], [233.2, 65.88, 657.345],

‎test/serialization/PortableTest.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ describe('Portable Serialization', function () {
3838
}
3939
}
4040
};
41-
return new SerializationService.SerializationServiceV1(cfg.serializationConfig);
41+
return new SerializationService.SerializationServiceV1(undefined, cfg.serializationConfig);
4242
}
4343

4444
it('write-read', function () {

‎test/serialization/SerializationServiceTest.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ describe('SerializationServiceTest', function () {
4444

4545
var identifiedDataSerializableFactoryDefaultExportConfig = {
4646
path: Path.resolve(__filename, '../../javaclasses/IdentifiedFactory.js')
47-
}
47+
};
4848

4949
it('adds data serializable factory by its name', function () {
5050
var serializationConfig = new Config.SerializationConfig();
5151
serializationConfig.dataSerializableFactoryConfigs[1] = identifiedDataSerializableFactoryConfig;
5252

53-
var serializationService = new SerializationService(serializationConfig);
53+
var serializationService = new SerializationService(undefined, serializationConfig);
5454

5555
var data = serializationService.toData(new IDataSerializable(3));
5656
var object = serializationService.toObject(data);
@@ -62,7 +62,7 @@ describe('SerializationServiceTest', function () {
6262
var serializationConfig = new Config.SerializationConfig();
6363
serializationConfig.portableFactoryConfigs[2] = portableSerializableFactoryConfig;
6464

65-
var serializationService = new SerializationService(serializationConfig);
65+
var serializationService = new SerializationService(undefined, serializationConfig);
6666

6767
var data = serializationService.toData(new Portable(3));
6868
var object = serializationService.toObject(data);
@@ -74,7 +74,7 @@ describe('SerializationServiceTest', function () {
7474
var serializationConfig = new Config.SerializationConfig();
7575
serializationConfig.customSerializerConfigs[44] = customSerializerConfig;
7676

77-
var serializationService = new SerializationService(serializationConfig);
77+
var serializationService = new SerializationService(undefined, serializationConfig);
7878

7979
var data = serializationService.toData(new CustomObject(3));
8080
var object = serializationService.toObject(data);
@@ -87,7 +87,7 @@ describe('SerializationServiceTest', function () {
8787
var serializationConfig = new Config.SerializationConfig();
8888
serializationConfig.globalSerializerConfig = globalSerializerConfig;
8989

90-
var serializationService = new SerializationService(serializationConfig);
90+
var serializationService = new SerializationService(undefined, serializationConfig);
9191

9292
var data = serializationService.toData(new AnyObject(3));
9393
var object = serializationService.toObject(data);
@@ -100,7 +100,7 @@ describe('SerializationServiceTest', function () {
100100
var serializationConfig = new Config.SerializationConfig();
101101
serializationConfig.dataSerializableFactoryConfigs[66] = identifiedDataSerializableFactoryDefaultExportConfig;
102102

103-
var serializationService = new SerializationService(serializationConfig);
103+
var serializationService = new SerializationService(undefined, serializationConfig);
104104

105105
var data = serializationService.toData(new IdentifiedEntryProcessor('x'));
106106
var object = serializationService.toObject(data);

0 commit comments

Comments
 (0)