Skip to content

Commit 892c393

Browse files
committed
Replace utf with string in public API
As decided with the team, methods containing the word `utf` is renamed with `string`. (`read_utf` -> `read_string` etc.). For backwards compatibility, old methods are still there but we have a deprecation documentation for them.
1 parent d459ff7 commit 892c393

30 files changed

+345
-181
lines changed

docs/serialization.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,16 @@ The following is an example of a class that extends
9898
return 1
9999
100100
def write_data(self, output):
101-
output.write_utf(self.street)
101+
output.write_string(self.street)
102102
output.write_int(self.zip_code)
103-
output.write_utf(self.city)
104-
output.write_utf(self.state)
103+
output.write_string(self.city)
104+
output.write_string(self.state)
105105
106106
def read_data(self, input):
107-
self.street = input.read_utf()
107+
self.street = input.read_string()
108108
self.zip_code = input.read_int()
109-
self.city = input.read_utf()
110-
self.state = input.read_utf()
109+
self.city = input.read_string()
110+
self.state = input.read_string()
111111
112112
113113
.. Note:: Refer to ``ObjectDataInput``/``ObjectDataOutput`` classes in
@@ -199,10 +199,10 @@ following:
199199
return 1
200200
201201
def write_portable(self, writer):
202-
writer.write_utf("foo", self.foo)
202+
writer.write_string("foo", self.foo)
203203
204204
def read_portable(self, reader):
205-
self.foo = reader.read_utf("foo")
205+
self.foo = reader.read_string("foo")
206206
207207
208208
.. Note:: Refer to ``PortableReader``/``PortableWriter`` classes in the
@@ -299,12 +299,12 @@ Foo class:
299299
return 2
300300
301301
def write_portable(self, writer):
302-
writer.write_utf("foo", self.foo)
303-
writer.write_utf("foo2", self.foo2)
302+
writer.write_string("foo", self.foo)
303+
writer.write_string("foo2", self.foo2)
304304
305305
def read_portable(self, reader):
306-
self.foo = reader.read_utf("foo")
307-
self.foo2 = reader.read_utf("foo2")
306+
self.foo = reader.read_string("foo")
307+
self.foo2 = reader.read_string("foo2")
308308
309309
You should consider the following when you perform versioning:
310310

@@ -377,10 +377,10 @@ Let’s say your custom ``MusicianSerializer`` will serialize
377377
pass
378378
379379
def write(self, output, obj):
380-
output.write_utf(obj.name)
380+
output.write_string(obj.name)
381381
382382
def read(self, input):
383-
name = input.read_utf()
383+
name = input.read_string()
384384
return Musician(name)
385385
386386
Note that the serializer ``id`` must be unique as Hazelcast will use it
@@ -487,10 +487,10 @@ is shown below.
487487
pass
488488
489489
def write(self, output, obj):
490-
output.write_utf(some_third_party_serializer.serialize(obj))
490+
output.write_string(some_third_party_serializer.serialize(obj))
491491
492492
def read(self, input):
493-
return some_third_party_serializer.deserialize(input.read_utf())
493+
return some_third_party_serializer.deserialize(input.read_string())
494494
495495
You should register the global serializer to the client.
496496

docs/using_python_client_with_hazelcast_imdg.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,10 +1150,10 @@ The following is an example for ``EntryProcessor`` which is an
11501150
self.value = value
11511151
11521152
def read_data(self, object_data_input):
1153-
self.value = object_data_input.read_utf()
1153+
self.value = object_data_input.read_string()
11541154
11551155
def write_data(self, object_data_output):
1156-
object_data_output.write_utf(self.value)
1156+
object_data_output.write_string(self.value)
11571157
11581158
def get_factory_id(self):
11591159
return 5
@@ -1364,13 +1364,13 @@ Assume that you have an ``employee`` map containing the instances of
13641364
return 1000
13651365
13661366
def read_portable(self, reader):
1367-
self.name = reader.read_utf("name")
1367+
self.name = reader.read_string("name")
13681368
self.age = reader.read_int("age")
13691369
self.active = reader.read_boolean("active")
13701370
self.salary = reader.read_double("salary")
13711371
13721372
def write_portable(self, writer):
1373-
writer.write_utf("name", self.name)
1373+
writer.write_string("name", self.name)
13741374
writer.write_int("age", self.age)
13751375
writer.write_boolean("active", self.active)
13761376
writer.write_double("salary", self.salary)

examples/map/map_portable_query_example.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ def __init__(self, name=None, age=None):
1414
self.age = age
1515

1616
def write_portable(self, writer):
17-
writer.write_utf("name", self.name)
17+
writer.write_string("name", self.name)
1818
writer.write_int("age", self.age)
1919

2020
def read_portable(self, reader):
21-
self.name = reader.read_utf("name")
21+
self.name = reader.read_string("name")
2222
self.age = reader.read_int("age")
2323

2424
def get_factory_id(self):

examples/map/map_portable_versioning_example.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ def __init__(self, name=None, age=None):
2020
self.age = age
2121

2222
def write_portable(self, writer):
23-
writer.write_utf("name", self.name)
23+
writer.write_string("name", self.name)
2424
writer.write_int("age", self.age)
2525

2626
def read_portable(self, reader):
27-
self.name = reader.read_utf("name")
27+
self.name = reader.read_string("name")
2828
self.age = reader.read_int("age")
2929

3030
def get_factory_id(self):
@@ -57,14 +57,14 @@ def __init__(self, name=None, age=None, manager=None):
5757
self.manager = manager
5858

5959
def write_portable(self, writer):
60-
writer.write_utf("name", self.name)
60+
writer.write_string("name", self.name)
6161
writer.write_int("age", self.age)
62-
writer.write_utf("manager", self.manager)
62+
writer.write_string("manager", self.manager)
6363

6464
def read_portable(self, reader):
65-
self.name = reader.read_utf("name")
65+
self.name = reader.read_string("name")
6666
self.age = reader.read_int("age")
67-
self.manager = reader.read_utf("manager")
67+
self.manager = reader.read_string("manager")
6868

6969
def get_factory_id(self):
7070
return self.FACTORY_ID
@@ -103,14 +103,14 @@ def __init__(self, name=None, age=None, manager=None):
103103
self.manager = manager
104104

105105
def write_portable(self, writer):
106-
writer.write_utf("name", self.name)
107-
writer.write_utf("age", self.age)
108-
writer.write_utf("manager", self.manager)
106+
writer.write_string("name", self.name)
107+
writer.write_string("age", self.age)
108+
writer.write_string("manager", self.manager)
109109

110110
def read_portable(self, reader):
111-
self.name = reader.read_utf("name")
112-
self.age = reader.read_utf("age")
113-
self.manager = reader.read_utf("manager")
111+
self.name = reader.read_string("name")
112+
self.age = reader.read_string("age")
113+
self.manager = reader.read_string("manager")
114114

115115
def get_factory_id(self):
116116
return self.FACTORY_ID

examples/org-website/custom_serializer_sample.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ def __init__(self, value=None):
1010

1111
class CustomSerializer(StreamSerializer):
1212
def write(self, out, obj):
13-
out.write_utf(obj.value)
13+
out.write_string(obj.value)
1414

1515
def read(self, inp):
16-
return CustomSerializableType(inp.read_utf())
16+
return CustomSerializableType(inp.read_string())
1717

1818
def get_type_id(self):
1919
return 10

examples/org-website/executor_service_sample.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ def __init__(self, message=None):
1111
self.message = message
1212

1313
def write_portable(self, writer):
14-
writer.write_utf("message", self.message)
14+
writer.write_string("message", self.message)
1515

1616
def read_portable(self, reader):
17-
self.message = reader.read_utf("message")
17+
self.message = reader.read_string("message")
1818

1919
def get_factory_id(self):
2020
return self.FACTORY_ID

examples/org-website/identified_data_serializable_sample.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ def __init__(self, id=None, name=None):
1313

1414
def read_data(self, object_data_input):
1515
self.id = object_data_input.read_int()
16-
self.name = object_data_input.read_utf()
16+
self.name = object_data_input.read_string()
1717

1818
def write_data(self, object_data_output):
1919
object_data_output.write_int(self.id)
20-
object_data_output.write_utf(self.name)
20+
object_data_output.write_string(self.name)
2121

2222
def get_factory_id(self):
2323
return self.FACTORY_ID

examples/org-website/portable_serializable_sample.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ def __init__(self, id=None, name=None, last_order=None):
1212
self.name = name
1313
self.last_order = last_order
1414

15-
def read_portable(self, object_data_input):
16-
self.id = object_data_input.read_int("id")
17-
self.name = object_data_input.read_utf("name")
18-
self.last_order = object_data_input.read_long("last_order")
19-
20-
def write_portable(self, object_data_output):
21-
object_data_output.write_int("id", self.id)
22-
object_data_output.write_utf("name", self.name)
23-
object_data_output.write_long("last_order", self.last_order)
15+
def read_portable(self, reader):
16+
self.id = reader.read_int("id")
17+
self.name = reader.read_string("name")
18+
self.last_order = reader.read_long("last_order")
19+
20+
def write_portable(self, writer):
21+
writer.write_int("id", self.id)
22+
writer.write_string("name", self.name)
23+
writer.write_long("last_order", self.last_order)
2424

2525
def get_factory_id(self):
2626
return self.FACTORY_ID

examples/org-website/query_sample.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ def __init__(self, username=None, age=None, active=None):
1414
self.active = active
1515

1616
def write_portable(self, writer):
17-
writer.write_utf("username", self.username)
17+
writer.write_string("username", self.username)
1818
writer.write_int("age", self.age)
1919
writer.write_boolean("active", self.active)
2020

2121
def read_portable(self, reader):
22-
self.username = reader.read_utf("username")
22+
self.username = reader.read_string("username")
2323
self.age = reader.read_int("age")
2424
self.active = reader.read_boolean("active")
2525

examples/serialization/global_serialization_example.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ def __init__(self):
2323
super(GlobalSerializer, self).__init__()
2424

2525
def read(self, inp):
26-
utf = inp.read_utf()
27-
obj = cPickle.loads(utf.encode())
26+
string = inp.read_string()
27+
obj = cPickle.loads(string.encode())
2828
return obj
2929

3030
def write(self, out, obj):
31-
out.write_utf(cPickle.dumps(obj, 0).decode("utf-8"))
31+
out.write_string(cPickle.dumps(obj, 0).decode("utf-8"))
3232

3333
def get_type_id(self):
3434
return self.GLOBAL_SERIALIZER_ID

0 commit comments

Comments
 (0)