Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove Namespace.FLOATING_ID
[controller.git]
/
third-party
/
atomix
/
storage
/
src
/
main
/
java
/
io
/
atomix
/
utils
/
serializer
/
Namespace.java
diff --git
a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
index 3cab13d997fa7096a3233310966a97dad89df45d..9dcbded38bb6b4f19a6a56d5e7a4ad20ba2c052d 100644
(file)
--- a/
third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
+++ b/
third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
@@
-54,11
+54,6
@@
public final class Namespace implements JournalSerdes, KryoFactory, KryoPool {
*/
private static final int DEFAULT_BUFFER_SIZE = 4096;
*/
private static final int DEFAULT_BUFFER_SIZE = 4096;
- /**
- * ID to use if this KryoNamespace does not define registration id.
- */
- private static final int FLOATING_ID = -1;
-
/**
* Smallest ID free to use for user defined registrations.
*/
/**
* Smallest ID free to use for user defined registrations.
*/
@@
-83,13
+78,13
@@
public final class Namespace implements JournalSerdes, KryoFactory, KryoPool {
*/
private static final class Builder implements JournalSerdes.Builder {
private final int blockHeadId = INITIAL_ID;
*/
private static final class Builder implements JournalSerdes.Builder {
private final int blockHeadId = INITIAL_ID;
- private final List<Entry<Class<?>[], Serializer<?>>> types = new ArrayList<>();
+ private final List<Entry<Class<?>[],
Entry
Serializer<?>>> types = new ArrayList<>();
private final List<RegistrationBlock> blocks = new ArrayList<>();
private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
@Override
private final List<RegistrationBlock> blocks = new ArrayList<>();
private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
@Override
- public Builder register(final
Serializer<?> serializer
, final Class<?>... classes) {
- types.add(Map.entry(classes,
serializer
));
+ public Builder register(final
EntrySerdes<?> serdes
, final Class<?>... classes) {
+ types.add(Map.entry(classes,
new EntrySerializer<>(serdes)
));
return this;
}
return this;
}
@@
-245,10
+240,7
@@
public final class Namespace implements JournalSerdes, KryoFactory, KryoPool {
for (RegistrationBlock block : registeredBlocks) {
int id = block.begin();
for (RegistrationBlock block : registeredBlocks) {
int id = block.begin();
- if (id == FLOATING_ID) {
- id = kryo.getNextRegistrationId();
- }
- for (Entry<Class<?>[], Serializer<?>> entry : block.types()) {
+ for (Entry<Class<?>[], EntrySerializer<?>> entry : block.types()) {
register(kryo, entry.getKey(), entry.getValue(), id++);
}
}
register(kryo, entry.getKey(), entry.getValue(), id++);
}
}
@@
-335,9
+327,9
@@
public final class Namespace implements JournalSerdes, KryoFactory, KryoPool {
static final class RegistrationBlock {
private final int begin;
static final class RegistrationBlock {
private final int begin;
- private final ImmutableList<Entry<Class<?>[], Serializer<?>>> types;
+ private final ImmutableList<Entry<Class<?>[],
Entry
Serializer<?>>> types;
- RegistrationBlock(final int begin, final List<Entry<Class<?>[], Serializer<?>>> types) {
+ RegistrationBlock(final int begin, final List<Entry<Class<?>[],
Entry
Serializer<?>>> types) {
this.begin = begin;
this.types = ImmutableList.copyOf(types);
}
this.begin = begin;
this.types = ImmutableList.copyOf(types);
}
@@
-346,7
+338,7
@@
public final class Namespace implements JournalSerdes, KryoFactory, KryoPool {
return begin;
}
return begin;
}
- public ImmutableList<Entry<Class<?>[], Serializer<?>>> types() {
+ public ImmutableList<Entry<Class<?>[],
Entry
Serializer<?>>> types() {
return types;
}
return types;
}