From d662f5c37c993513e7f3a6286ec2b8b0058bae38 Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 10 Jan 2019 20:52:21 +0100 Subject: [PATCH] Reverted EditableDefaultClassResolver --- src/dorkbox/network/connection/KryoExtra.java | 4 +-- .../EditableDefaultClassResolver.java | 36 ------------------- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 src/dorkbox/network/serialization/EditableDefaultClassResolver.java diff --git a/src/dorkbox/network/connection/KryoExtra.java b/src/dorkbox/network/connection/KryoExtra.java index f274122b..00efc1af 100644 --- a/src/dorkbox/network/connection/KryoExtra.java +++ b/src/dorkbox/network/connection/KryoExtra.java @@ -22,13 +22,13 @@ import org.bouncycastle.crypto.modes.GCMBlockCipher; import org.bouncycastle.crypto.params.ParametersWithIV; import com.esotericsoftware.kryo.Kryo; +import com.esotericsoftware.kryo.util.DefaultClassResolver; import com.esotericsoftware.kryo.util.DefaultStreamFactory; import com.esotericsoftware.kryo.util.MapReferenceResolver; import dorkbox.network.pipeline.ByteBufInput; import dorkbox.network.pipeline.ByteBufOutput; import dorkbox.network.serialization.CryptoSerializationManager; -import dorkbox.network.serialization.EditableDefaultClassResolver; import dorkbox.util.bytes.BigEndian; import dorkbox.util.bytes.OptimizeUtilsByteArray; import dorkbox.util.bytes.OptimizeUtilsByteBuf; @@ -88,7 +88,7 @@ class KryoExtra extends Kryo { public KryoExtra(final CryptoSerializationManager serializationManager) { - super(new EditableDefaultClassResolver(), new MapReferenceResolver(), new DefaultStreamFactory()); + super(new DefaultClassResolver(), new MapReferenceResolver(), new DefaultStreamFactory()); this.serializationManager = serializationManager; } diff --git a/src/dorkbox/network/serialization/EditableDefaultClassResolver.java b/src/dorkbox/network/serialization/EditableDefaultClassResolver.java deleted file mode 100644 index 5da48053..00000000 --- a/src/dorkbox/network/serialization/EditableDefaultClassResolver.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2018 dorkbox, llc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package dorkbox.network.serialization; - -import com.esotericsoftware.kryo.util.DefaultClassResolver; -import com.esotericsoftware.kryo.util.Util; - -public -class EditableDefaultClassResolver extends DefaultClassResolver { - public - EditableDefaultClassResolver() { - } - - public - void deleteRegistrationType(Class type) { - if (type.isPrimitive()) { - classToRegistration.remove(Util.getWrapperClass(type)); - } - else { - classToRegistration.remove(type); - } - } -}