Skip to content

Commit ea51e76

Browse files
k163377k163377
committed
add visibilities
1 parent 0186242 commit ea51e76

File tree

7 files changed

+81
-81
lines changed

7 files changed

+81
-81
lines changed

‎src/main/kotlin/com/fasterxml/jackson/module/kotlin/Exceptions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import kotlin.reflect.KParameter
99
* Specialized [JsonMappingException] sub-class used to indicate that a mandatory Kotlin constructor
1010
* parameter was missing or null.
1111
*/
12-
class MissingKotlinParameterException(
13-
val parameter: KParameter,
12+
public class MissingKotlinParameterException internal constructor(
13+
public val parameter: KParameter,
1414
processor: JsonParser? = null,
1515
msg: String
1616
) : MismatchedInputException(processor, msg)

‎src/main/kotlin/com/fasterxml/jackson/module/kotlin/Extensions.kt

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -21,76 +21,76 @@ import java.math.BigInteger
2121
import java.net.URL
2222
import kotlin.reflect.KClass
2323

24-
fun kotlinModule(initializer: KotlinModule.Builder.() -> Unit = {}): KotlinModule {
24+
public fun kotlinModule(initializer: KotlinModule.Builder.() -> Unit = {}): KotlinModule {
2525
val builder = KotlinModule.Builder()
2626
builder.initializer()
2727
return builder.build()
2828
}
2929

30-
fun jsonMapper(initializer: JsonMapper.Builder.() -> Unit = {}): JsonMapper {
30+
public fun jsonMapper(initializer: JsonMapper.Builder.() -> Unit = {}): JsonMapper {
3131
val builder = JsonMapper.builder()
3232
builder.initializer()
3333
return builder.build()
3434
}
3535

36-
fun jacksonObjectMapper(): ObjectMapper = jsonMapper { addModule(kotlinModule()) }
37-
fun jacksonMapperBuilder(): JsonMapper.Builder = JsonMapper.builder().addModule(kotlinModule())
36+
public fun jacksonObjectMapper(): ObjectMapper = jsonMapper { addModule(kotlinModule()) }
37+
public fun jacksonMapperBuilder(): JsonMapper.Builder = JsonMapper.builder().addModule(kotlinModule())
3838

39-
fun ObjectMapper.registerKotlinModule(): ObjectMapper = this.registerModule(kotlinModule())
39+
public fun ObjectMapper.registerKotlinModule(): ObjectMapper = this.registerModule(kotlinModule())
4040

41-
inline fun <reified T> jacksonTypeRef(): TypeReference<T> = object: TypeReference<T>() {}
41+
public inline fun <reified T> jacksonTypeRef(): TypeReference<T> = object: TypeReference<T>() {}
4242

43-
inline fun <reified T> ObjectMapper.readValue(jp: JsonParser): T = readValue(jp, jacksonTypeRef<T>())
44-
inline fun <reified T> ObjectMapper.readValues(jp: JsonParser): MappingIterator<T> = readValues(jp, jacksonTypeRef<T>())
43+
public inline fun <reified T> ObjectMapper.readValue(jp: JsonParser): T = readValue(jp, jacksonTypeRef<T>())
44+
public inline fun <reified T> ObjectMapper.readValues(jp: JsonParser): MappingIterator<T> = readValues(jp, jacksonTypeRef<T>())
4545

46-
inline fun <reified T> ObjectMapper.readValue(src: File): T = readValue(src, jacksonTypeRef<T>())
47-
inline fun <reified T> ObjectMapper.readValue(src: URL): T = readValue(src, jacksonTypeRef<T>())
48-
inline fun <reified T> ObjectMapper.readValue(content: String): T = readValue(content, jacksonTypeRef<T>())
49-
inline fun <reified T> ObjectMapper.readValue(src: Reader): T = readValue(src, jacksonTypeRef<T>())
50-
inline fun <reified T> ObjectMapper.readValue(src: InputStream): T = readValue(src, jacksonTypeRef<T>())
51-
inline fun <reified T> ObjectMapper.readValue(src: ByteArray): T = readValue(src, jacksonTypeRef<T>())
46+
public inline fun <reified T> ObjectMapper.readValue(src: File): T = readValue(src, jacksonTypeRef<T>())
47+
public inline fun <reified T> ObjectMapper.readValue(src: URL): T = readValue(src, jacksonTypeRef<T>())
48+
public inline fun <reified T> ObjectMapper.readValue(content: String): T = readValue(content, jacksonTypeRef<T>())
49+
public inline fun <reified T> ObjectMapper.readValue(src: Reader): T = readValue(src, jacksonTypeRef<T>())
50+
public inline fun <reified T> ObjectMapper.readValue(src: InputStream): T = readValue(src, jacksonTypeRef<T>())
51+
public inline fun <reified T> ObjectMapper.readValue(src: ByteArray): T = readValue(src, jacksonTypeRef<T>())
5252

53-
inline fun <reified T> ObjectMapper.treeToValue(n: TreeNode): T = readValue(this.treeAsTokens(n), jacksonTypeRef<T>())
54-
inline fun <reified T> ObjectMapper.convertValue(from: Any): T = convertValue(from, jacksonTypeRef<T>())
53+
public inline fun <reified T> ObjectMapper.treeToValue(n: TreeNode): T = readValue(this.treeAsTokens(n), jacksonTypeRef<T>())
54+
public inline fun <reified T> ObjectMapper.convertValue(from: Any): T = convertValue(from, jacksonTypeRef<T>())
5555

56-
inline fun <reified T> ObjectReader.readValueTyped(jp: JsonParser): T = readValue(jp, jacksonTypeRef<T>())
57-
inline fun <reified T> ObjectReader.readValuesTyped(jp: JsonParser): Iterator<T> = readValues(jp, jacksonTypeRef<T>())
58-
inline fun <reified T> ObjectReader.treeToValue(n: TreeNode): T? = readValue(this.treeAsTokens(n), jacksonTypeRef<T>())
56+
public inline fun <reified T> ObjectReader.readValueTyped(jp: JsonParser): T = readValue(jp, jacksonTypeRef<T>())
57+
public inline fun <reified T> ObjectReader.readValuesTyped(jp: JsonParser): Iterator<T> = readValues(jp, jacksonTypeRef<T>())
58+
public inline fun <reified T> ObjectReader.treeToValue(n: TreeNode): T? = readValue(this.treeAsTokens(n), jacksonTypeRef<T>())
5959

60-
operator fun ArrayNode.plus(element: Boolean) { add(element) }
61-
operator fun ArrayNode.plus(element: Short) { add(element) }
62-
operator fun ArrayNode.plus(element: Int) { add(element) }
63-
operator fun ArrayNode.plus(element: Long) { add(element) }
64-
operator fun ArrayNode.plus(element: Float) { add(element) }
65-
operator fun ArrayNode.plus(element: Double) { add(element) }
66-
operator fun ArrayNode.plus(element: BigDecimal) { add(element) }
67-
operator fun ArrayNode.plus(element: BigInteger) { add(element) }
68-
operator fun ArrayNode.plus(element: String) { add(element) }
69-
operator fun ArrayNode.plus(element: ByteArray) { add(element) }
70-
operator fun ArrayNode.plus(element: JsonNode) { add(element) }
71-
operator fun ArrayNode.plus(elements: ArrayNode) { addAll(elements) }
72-
operator fun ArrayNode.plusAssign(element: Boolean) { add(element) }
73-
operator fun ArrayNode.plusAssign(element: Short) { add(element) }
74-
operator fun ArrayNode.plusAssign(element: Int) { add(element) }
75-
operator fun ArrayNode.plusAssign(element: Long) { add(element) }
76-
operator fun ArrayNode.plusAssign(element: Float) { add(element) }
77-
operator fun ArrayNode.plusAssign(element: Double) { add(element) }
78-
operator fun ArrayNode.plusAssign(element: BigDecimal) { add(element) }
79-
operator fun ArrayNode.plusAssign(element: BigInteger) { add(element) }
80-
operator fun ArrayNode.plusAssign(element: String) { add(element) }
81-
operator fun ArrayNode.plusAssign(element: ByteArray) { add(element) }
82-
operator fun ArrayNode.plusAssign(element: JsonNode) { add(element) }
83-
operator fun ArrayNode.plusAssign(elements: ArrayNode) { addAll(elements) }
84-
operator fun ArrayNode.minus(index: Int) { remove(index) }
85-
operator fun ArrayNode.minusAssign(index: Int) { remove(index) }
60+
public operator fun ArrayNode.plus(element: Boolean) { add(element) }
61+
public operator fun ArrayNode.plus(element: Short) { add(element) }
62+
public operator fun ArrayNode.plus(element: Int) { add(element) }
63+
public operator fun ArrayNode.plus(element: Long) { add(element) }
64+
public operator fun ArrayNode.plus(element: Float) { add(element) }
65+
public operator fun ArrayNode.plus(element: Double) { add(element) }
66+
public operator fun ArrayNode.plus(element: BigDecimal) { add(element) }
67+
public operator fun ArrayNode.plus(element: BigInteger) { add(element) }
68+
public operator fun ArrayNode.plus(element: String) { add(element) }
69+
public operator fun ArrayNode.plus(element: ByteArray) { add(element) }
70+
public operator fun ArrayNode.plus(element: JsonNode) { add(element) }
71+
public operator fun ArrayNode.plus(elements: ArrayNode) { addAll(elements) }
72+
public operator fun ArrayNode.plusAssign(element: Boolean) { add(element) }
73+
public operator fun ArrayNode.plusAssign(element: Short) { add(element) }
74+
public operator fun ArrayNode.plusAssign(element: Int) { add(element) }
75+
public operator fun ArrayNode.plusAssign(element: Long) { add(element) }
76+
public operator fun ArrayNode.plusAssign(element: Float) { add(element) }
77+
public operator fun ArrayNode.plusAssign(element: Double) { add(element) }
78+
public operator fun ArrayNode.plusAssign(element: BigDecimal) { add(element) }
79+
public operator fun ArrayNode.plusAssign(element: BigInteger) { add(element) }
80+
public operator fun ArrayNode.plusAssign(element: String) { add(element) }
81+
public operator fun ArrayNode.plusAssign(element: ByteArray) { add(element) }
82+
public operator fun ArrayNode.plusAssign(element: JsonNode) { add(element) }
83+
public operator fun ArrayNode.plusAssign(elements: ArrayNode) { addAll(elements) }
84+
public operator fun ArrayNode.minus(index: Int) { remove(index) }
85+
public operator fun ArrayNode.minusAssign(index: Int) { remove(index) }
8686

87-
operator fun ObjectNode.minus(field: String) { remove(field) }
88-
operator fun ObjectNode.minus(fields: Collection<String>) { remove(fields) }
89-
operator fun ObjectNode.minusAssign(field: String) { remove(field) }
90-
operator fun ObjectNode.minusAssign(fields: Collection<String>) { remove(fields) }
87+
public operator fun ObjectNode.minus(field: String) { remove(field) }
88+
public operator fun ObjectNode.minus(fields: Collection<String>) { remove(fields) }
89+
public operator fun ObjectNode.minusAssign(field: String) { remove(field) }
90+
public operator fun ObjectNode.minusAssign(fields: Collection<String>) { remove(fields) }
9191

92-
operator fun JsonNode.contains(field: String) = has(field)
93-
operator fun JsonNode.contains(index: Int) = has(index)
92+
public operator fun JsonNode.contains(field: String): Boolean = has(field)
93+
public operator fun JsonNode.contains(index: Int): Boolean = has(index)
9494

9595
public fun <T : Any> SimpleModule.addSerializer(
9696
kClass: KClass<T>, serializer: JsonSerializer<T>

‎src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinFeature.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.util.BitSet
55
/**
66
* @see KotlinModule.Builder
77
*/
8-
enum class KotlinFeature(private val enabledByDefault: Boolean) {
8+
public enum class KotlinFeature(private val enabledByDefault: Boolean) {
99
/**
1010
* This feature represents whether to deserialize `null` values for collection properties as empty collections.
1111
*/
@@ -45,7 +45,7 @@ enum class KotlinFeature(private val enabledByDefault: Boolean) {
4545

4646
internal val bitSet: BitSet = (1 shl ordinal).toBitSet()
4747

48-
companion object {
48+
public companion object {
4949
internal val defaults
5050
get() = values().fold(BitSet(Int.SIZE_BITS)) { acc, cur ->
5151
acc.apply { if (cur.enabledByDefault) this.or(cur.bitSet) }

‎src/main/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModule.kt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ import kotlin.reflect.KClass
3232
* (e.g. List<String>) may contain null values after deserialization. Enabling it
3333
* protects against this but has significant performance impact.
3434
*/
35-
class KotlinModule private constructor(
36-
val reflectionCacheSize: Int = 512,
37-
val nullToEmptyCollection: Boolean = false,
38-
val nullToEmptyMap: Boolean = false,
39-
val nullIsSameAsDefault: Boolean = false,
40-
val singletonSupport: SingletonSupport = DISABLED,
41-
val strictNullChecks: Boolean = false
35+
public class KotlinModule private constructor(
36+
public val reflectionCacheSize: Int = 512,
37+
public val nullToEmptyCollection: Boolean = false,
38+
public val nullToEmptyMap: Boolean = false,
39+
public val nullIsSameAsDefault: Boolean = false,
40+
public val singletonSupport: SingletonSupport = DISABLED,
41+
public val strictNullChecks: Boolean = false
4242
) : SimpleModule(KotlinModule::class.java.name /* TODO: add Version parameter */) {
4343
private constructor(builder: Builder) : this(
4444
builder.reflectionCacheSize,
@@ -52,8 +52,8 @@ class KotlinModule private constructor(
5252
builder.isEnabled(StrictNullChecks)
5353
)
5454

55-
companion object {
56-
const val serialVersionUID = 1L
55+
public companion object {
56+
private const val serialVersionUID = 1L
5757
}
5858

5959
private val ignoredClassesForImplyingJsonCreator = emptySet<KClass<*>>()
@@ -88,34 +88,34 @@ class KotlinModule private constructor(
8888
context.setMixInAnnotations(ClosedRange::class.java, ClosedRangeMixin::class.java)
8989
}
9090

91-
class Builder {
92-
var reflectionCacheSize: Int = 512
91+
public class Builder {
92+
public var reflectionCacheSize: Int = 512
9393
private set
9494

9595
private val bitSet: BitSet = KotlinFeature.defaults
9696

97-
fun withReflectionCacheSize(reflectionCacheSize: Int): Builder = apply {
97+
public fun withReflectionCacheSize(reflectionCacheSize: Int): Builder = apply {
9898
this.reflectionCacheSize = reflectionCacheSize
9999
}
100100

101-
fun enable(feature: KotlinFeature): Builder = apply {
101+
public fun enable(feature: KotlinFeature): Builder = apply {
102102
bitSet.or(feature.bitSet)
103103
}
104104

105-
fun disable(feature: KotlinFeature): Builder = apply {
105+
public fun disable(feature: KotlinFeature): Builder = apply {
106106
bitSet.andNot(feature.bitSet)
107107
}
108108

109-
fun configure(feature: KotlinFeature, enabled: Boolean): Builder =
109+
public fun configure(feature: KotlinFeature, enabled: Boolean): Builder =
110110
when {
111111
enabled -> enable(feature)
112112
else -> disable(feature)
113113
}
114114

115-
fun isEnabled(feature: KotlinFeature): Boolean =
115+
public fun isEnabled(feature: KotlinFeature): Boolean =
116116
bitSet.intersects(feature.bitSet)
117117

118-
fun build(): KotlinModule =
118+
public fun build(): KotlinModule =
119119
KotlinModule(this)
120120
}
121121
}

‎src/main/kotlin/com/fasterxml/jackson/module/kotlin/SingletonSupport.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.fasterxml.jackson.module.kotlin
33
/**
44
* Special handling for singletons.
55
*/
6-
enum class SingletonSupport {
6+
public enum class SingletonSupport {
77
// No special handling of singletons (pre-2.10 behavior)
88
// Each time a Singleton object is deserialized a new instance is created.
99
DISABLED,

‎src/main/kotlin/com/fasterxml/jackson/module/kotlin/deser/deserializers/KotlinDeserializers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import com.fasterxml.jackson.databind.JsonDeserializer
99
import com.fasterxml.jackson.databind.deser.Deserializers
1010
import com.fasterxml.jackson.databind.deser.std.StdDeserializer
1111

12-
object SequenceDeserializer : StdDeserializer<Sequence<*>>(Sequence::class.java) {
12+
internal object SequenceDeserializer : StdDeserializer<Sequence<*>>(Sequence::class.java) {
1313
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Sequence<*> {
1414
return ctxt.readValue(p, List::class.java).asSequence()
1515
}
1616
}
1717

18-
object RegexDeserializer : StdDeserializer<Regex>(Regex::class.java) {
18+
internal object RegexDeserializer : StdDeserializer<Regex>(Regex::class.java) {
1919
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Regex {
2020
val node = ctxt.readTree(p)
2121

‎src/main/kotlin/com/fasterxml/jackson/module/kotlin/ser/serializers/KotlinSerializers.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@ import java.lang.reflect.Method
1414
import java.lang.reflect.Modifier
1515
import java.math.BigInteger
1616

17-
object SequenceSerializer : StdSerializer<Sequence<*>>(Sequence::class.java) {
17+
internal object SequenceSerializer : StdSerializer<Sequence<*>>(Sequence::class.java) {
1818
override fun serialize(value: Sequence<*>, gen: JsonGenerator, provider: SerializerProvider) {
1919
val materializedList = value.toList()
2020
provider.defaultSerializeValue(materializedList, gen)
2121
}
2222
}
2323

24-
object UByteSerializer : StdSerializer<UByte>(UByte::class.java) {
24+
internal object UByteSerializer : StdSerializer<UByte>(UByte::class.java) {
2525
override fun serialize(value: UByte, gen: JsonGenerator, provider: SerializerProvider) =
2626
gen.writeNumber(value.toShort())
2727
}
2828

29-
object UShortSerializer : StdSerializer<UShort>(UShort::class.java) {
29+
internal object UShortSerializer : StdSerializer<UShort>(UShort::class.java) {
3030
override fun serialize(value: UShort, gen: JsonGenerator, provider: SerializerProvider) =
3131
gen.writeNumber(value.toInt())
3232
}
3333

34-
object UIntSerializer : StdSerializer<UInt>(UInt::class.java) {
34+
internal object UIntSerializer : StdSerializer<UInt>(UInt::class.java) {
3535
override fun serialize(value: UInt, gen: JsonGenerator, provider: SerializerProvider) =
3636
gen.writeNumber(value.toLong())
3737
}
3838

39-
object ULongSerializer : StdSerializer<ULong>(ULong::class.java) {
39+
internal object ULongSerializer : StdSerializer<ULong>(ULong::class.java) {
4040
override fun serialize(value: ULong, gen: JsonGenerator, provider: SerializerProvider) {
4141
val longValue = value.toLong()
4242
when {
@@ -50,7 +50,7 @@ object ULongSerializer : StdSerializer<ULong>(ULong::class.java) {
5050
private fun Class<*>.getStaticJsonValueGetter(): Method? = this.declaredMethods
5151
.find { method -> Modifier.isStatic(method.modifiers) && method.annotations.any { it is JsonValue } }
5252

53-
object ValueClassUnboxSerializer : StdSerializer<Any>(Any::class.java) {
53+
internal object ValueClassUnboxSerializer : StdSerializer<Any>(Any::class.java) {
5454
override fun serialize(value: Any, gen: JsonGenerator, provider: SerializerProvider) {
5555
val unboxed = value::class.java.getMethod("unbox-impl").invoke(value)
5656

0 commit comments

Comments
 (0)