Skip to content

Migrate MapBuilder to Kotlin #51626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cortinico wants to merge 1 commit into from
Closed

Migrate MapBuilder to Kotlin #51626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1664,23 +1664,23 @@ public final class com/facebook/react/common/LifecycleState : java/lang/Enum {
public static fun values ()[Lcom/facebook/react/common/LifecycleState;
}

public class com/facebook/react/common/MapBuilder {
public fun <init> ()V
public static fun builder ()Lcom/facebook/react/common/MapBuilder$Builder;
public static fun newHashMap ()Ljava/util/HashMap;
public static fun of ()Ljava/util/Map;
public static fun of (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public final class com/facebook/react/common/MapBuilder {
public static final field INSTANCE Lcom/facebook/react/common/MapBuilder;
public static final fun builder ()Lcom/facebook/react/common/MapBuilder$Builder;
public static final fun newHashMap ()Ljava/util/HashMap;
public static final fun of ()Ljava/util/Map;
public static final fun of (Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static final fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static final fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static final fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static final fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static final fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
public static final fun of (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
}

public final class com/facebook/react/common/MapBuilder$Builder {
public fun build ()Ljava/util/Map;
public fun put (Ljava/lang/Object;Ljava/lang/Object;)Lcom/facebook/react/common/MapBuilder$Builder;
public final fun build ()Ljava/util/Map;
public final fun put (Ljava/lang/Object;Ljava/lang/Object;)Lcom/facebook/react/common/MapBuilder$Builder;
}

public final class com/facebook/react/common/ReactConstants {
Expand Down
136 changes: 0 additions & 136 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.java
View file
Open in desktop

This file was deleted.

107 changes: 107 additions & 0 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/common/MapBuilder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

package com.facebook.react.common

/** Utility class for creating maps */
@Deprecated("Use Kotlin's built-in collections extensions")
public object MapBuilder {
/** Creates an instance of `HashMap` */
@JvmStatic public fun <K, V> newHashMap(): HashMap<K, V> = hashMapOf()

/** Returns the empty map. */
@JvmStatic public fun <K, V> of(): MutableMap<K, V> = newHashMap()

/** Returns map containing a single entry. */
@JvmStatic public fun <K, V> of(k1: K, v1: V): MutableMap<K, V> = hashMapOf(k1 to v1)

/** Returns map containing the given entries. */
@JvmStatic
public fun <K, V> of(k1: K, v1: V, k2: K, v2: V): MutableMap<K, V> = hashMapOf(k1 to v1, k2 to v2)

/** Returns map containing the given entries. */
@JvmStatic
public fun <K, V> of(k1: K, v1: V, k2: K, v2: V, k3: K, v3: V): MutableMap<K, V> =
hashMapOf(k1 to v1, k2 to v2, k3 to v3)

/** Returns map containing the given entries. */
@JvmStatic
public fun <K, V> of(k1: K, v1: V, k2: K, v2: V, k3: K, v3: V, k4: K, v4: V): MutableMap<K, V> =
hashMapOf(k1 to v1, k2 to v2, k3 to v3, k4 to v4)

/** Returns map containing the given entries. */
@JvmStatic
public fun <K, V> of(
k1: K,
v1: V,
k2: K,
v2: V,
k3: K,
v3: V,
k4: K,
v4: V,
k5: K,
v5: V
): MutableMap<K, V> = hashMapOf(k1 to v1, k2 to v2, k3 to v3, k4 to v4, k5 to v5)

/** Returns map containing the given entries. */
@JvmStatic
public fun <K, V> of(
k1: K,
v1: V,
k2: K,
v2: V,
k3: K,
v3: V,
k4: K,
v4: V,
k5: K,
v5: V,
k6: K,
v6: V
): MutableMap<K, V> = hashMapOf(k1 to v1, k2 to v2, k3 to v3, k4 to v4, k5 to v5, k6 to v6)

/** Returns map containing the given entries. */
@JvmStatic
public fun <K, V> of(
k1: K,
v1: V,
k2: K,
v2: V,
k3: K,
v3: V,
k4: K,
v4: V,
k5: K,
v5: V,
k6: K,
v6: V,
k7: K,
v7: V
): MutableMap<K, V> =
hashMapOf(k1 to v1, k2 to v2, k3 to v3, k4 to v4, k5 to v5, k6 to v6, k7 to v7)

/** Returns map containing the given entries. */
@JvmStatic public fun <K, V> builder(): Builder<K, V> = Builder()

public class Builder<K, V> internal constructor() {
private val map: MutableMap<K, V> = newHashMap()
private var underConstruction = true

public fun put(k: K, v: V): Builder<K, V> {
check(underConstruction) { "Underlying map has already been built" }
map[k] = v
return this
}

public fun build(): Map<K, V> {
check(underConstruction) { "Underlying map has already been built" }
underConstruction = false
return map
}
}
}
Loading