X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=third-party%2Fatomix%2Futils%2Fsrc%2Fmain%2Fjava%2Fio%2Fatomix%2Futils%2Fserializer%2FNamespace.java;fp=third-party%2Fatomix%2Futils%2Fsrc%2Fmain%2Fjava%2Fio%2Fatomix%2Futils%2Fserializer%2FNamespace.java;h=6ebd044c9d98ed808e2987ec01d73349ce961652;hb=c59863765f533b216f777411ea55db0d343cc163;hp=46e016c9066ed3f23d69fbc64d77e43bf7d2f01a;hpb=9c2ce7a584f613b7ade4b15657e94de3d8c34ed5;p=controller.git diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Namespace.java b/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Namespace.java index 46e016c906..6ebd044c9d 100644 --- a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Namespace.java +++ b/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Namespace.java @@ -26,7 +26,6 @@ import com.esotericsoftware.kryo.pool.KryoPool; import com.esotericsoftware.kryo.serializers.CompatibleFieldSerializer; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import io.atomix.utils.config.ConfigurationException; import org.apache.commons.lang3.tuple.Pair; import org.objenesis.strategy.StdInstantiatorStrategy; import org.slf4j.Logger; @@ -37,7 +36,6 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Objects; @@ -263,30 +261,6 @@ public final class Namespace implements KryoFactory, KryoPool { return new Builder(); } - @SuppressWarnings("unchecked") - private static List buildRegistrationBlocks(NamespaceConfig config) { - List[], Serializer>> types = new ArrayList<>(); - List blocks = new ArrayList<>(); - blocks.addAll(Namespaces.BASIC.registeredBlocks); - for (NamespaceTypeConfig type : config.getTypes()) { - try { - if (type.getId() == null) { - types.add(Pair.of(new Class[]{type.getType()}, type.getSerializer() != null ? type.getSerializer().newInstance() : null)); - } else { - blocks.add(new RegistrationBlock(type.getId(), Collections.singletonList(Pair.of(new Class[]{type.getType()}, type.getSerializer().newInstance())))); - } - } catch (InstantiationException | IllegalAccessException e) { - throw new ConfigurationException("Failed to instantiate serializer from configuration", e); - } - } - blocks.add(new RegistrationBlock(FLOATING_ID, types)); - return blocks; - } - - public Namespace(NamespaceConfig config) { - this(buildRegistrationBlocks(config), Thread.currentThread().getContextClassLoader(), config.isRegistrationRequired(), config.isCompatible(), config.getName()); - } - /** * Creates a Kryo instance pool. *