diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt index 80cb3a6d..a4f76c81 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt @@ -447,7 +447,5 @@ object Starbound { } } } - - items.values.forEach { println(it) } } } diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt index b2b6f326..e3b6cbdc 100644 --- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt +++ b/src/main/kotlin/ru/dbotthepony/kstarbound/io/KConcreteTypeAdapter.kt @@ -18,7 +18,6 @@ import ru.dbotthepony.kstarbound.getValue import ru.dbotthepony.kstarbound.setValue import java.lang.reflect.Constructor import kotlin.jvm.internal.DefaultConstructorMarker -import kotlin.properties.Delegates import kotlin.reflect.* import kotlin.reflect.full.isSuperclassOf import kotlin.reflect.full.isSupertypeOf @@ -113,7 +112,7 @@ private class MapAdapter(private val boundKey: Class, private val bound } } -private class StringMapAdapter(private val bound: Class, private val stringAdapter: TypeAdapter, private val interner: () -> Interner) : TypeAdapter?>() { +private class StringMapAdapter(private val bound: Class, private val stringAdapter: TypeAdapter, private val interner: Interner) : TypeAdapter?>() { private val resolvedBound by lazy { resolveBound(bound, stringAdapter) } override fun write(out: JsonWriter, value: Map?) { @@ -139,7 +138,7 @@ private class StringMapAdapter(private val bound: Class, private val strin val resolvedBound = resolvedBound while (reader.peek() != JsonToken.END_OBJECT) { - builder.put(interner.invoke().intern(reader.nextName()), resolvedBound.read(reader)) + builder.put(interner.intern(reader.nextName()), resolvedBound.read(reader)) } reader.endObject() @@ -174,10 +173,10 @@ private data class PackedProperty( class KConcreteTypeAdapter private constructor( val bound: KClass, private val types: ImmutableList>, - private val asJsonArray: Boolean = false + private val asJsonArray: Boolean = false, + private val stringInterner: Interner ) : TypeAdapter() { private val mapped = Object2IntArrayMap() - private val internedStrings = Interners.newWeakInterner() private val loggedMisses = ObjectArraySet() var currentSymbolicName by ThreadLocal() @@ -347,13 +346,6 @@ class KConcreteTypeAdapter private constructor( } } - // intern'им строки для более быстрой работы сравнения последних - for (i in readValues.indices) { - if (readValues[i] is String) { - readValues[i] = internedStrings.intern(readValues[i] as String) - } - } - if (asJsonArray) { reader.endArray() } else { @@ -442,7 +434,7 @@ class KConcreteTypeAdapter private constructor( */ class Builder(val clazz: KClass) { private val types = ArrayList>() - private var interner by Delegates.notNull>() + private val stringInterner = Interners.newWeakInterner() private val internedStringAdapter: TypeAdapter = object : TypeAdapter() { override fun write(out: JsonWriter, value: String) { @@ -450,7 +442,7 @@ class KConcreteTypeAdapter private constructor( } override fun read(`in`: JsonReader): String { - return interner.intern(TypeAdapters.STRING.read(`in`)) + return stringInterner.intern(TypeAdapters.STRING.read(`in`)) } } @@ -559,7 +551,7 @@ class KConcreteTypeAdapter private constructor( * Таблица неизменяема (создаётся объект [ImmutableMap]) */ fun map(field: KProperty1?>, valueType: Class): Builder { - types.add(PackedProperty(field, StringMapAdapter(valueType, internedStringAdapter, ::interner))) + types.add(PackedProperty(field, StringMapAdapter(valueType, internedStringAdapter, stringInterner))) return this } @@ -569,14 +561,17 @@ class KConcreteTypeAdapter private constructor( * Таблица неизменяема (создаётся объект [ImmutableMap]) */ fun map(field: KProperty1?>, valueType: KClass): Builder { - types.add(PackedProperty(field, StringMapAdapter(valueType.java, internedStringAdapter, ::interner))) + types.add(PackedProperty(field, StringMapAdapter(valueType.java, internedStringAdapter, stringInterner))) return this } fun build(asList: Boolean = false): KConcreteTypeAdapter { - return KConcreteTypeAdapter(clazz, ImmutableList.copyOf(types), asJsonArray = asList).also { - interner = it.internedStrings - } + return KConcreteTypeAdapter( + bound = clazz, + types = ImmutableList.copyOf(types), + asJsonArray = asList, + stringInterner = stringInterner + ) } }