Skip to content

Commit 797786f

Browse files
authored
Rename functions that cause shadow members (#1054)
* Rename functions that cause shadow members * Rename prefix from coroutine to suspend
1 parent 8771da9 commit 797786f

9 files changed

+26
-35
lines changed

Diff for: coroutines/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ Now we can call a parse query using a synchronous style, this is possible when w
1818

1919
```kotlin
2020
launch { // Coroutine builder
21-
val cat = ParseQuery.getQuery(...).find()
21+
val cat = ParseQuery.getQuery(...).coroutineFind()
2222
// get cats without callback
2323
}
2424
```
25-
We use a coroutine builder because `find()` is a suspend function.
25+
We use a coroutine builder because `coroutineFind()` is a suspend function.
2626

2727
We can also, use a function like a coroutine builder, it will be provider us a flexibility call our query without any extensions function.
2828

@@ -56,7 +56,7 @@ launch { // Coroutine builder
5656
setPassword("my pass")
5757
setEmail("[email protected]")
5858
}.also {
59-
signUp()
59+
coroutineSignUp()
6060
}
6161
}
6262
```

Diff for: coroutines/src/main/java/com/parse/coroutines/cloudfunction/ParseCloudCoroutinesExtensions.kt renamed to coroutines/src/main/java/com/parse/coroutines/ParseCloudCoroutinesExtensions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:JvmName("ParseCloudCoroutinesExtensions")
22

3-
package com.parse.coroutines.cloudfunction
3+
package com.parse.coroutines
44

55
import com.parse.ParseCloud
66
import kotlin.coroutines.resume
@@ -14,4 +14,4 @@ suspend fun <T> callCloudFunction(functionName: String, params: Map<String, Any>
1414
else continuation.resumeWithException(e)
1515
}
1616
}
17-
}
17+
}

Diff for: coroutines/src/main/java/com/parse/coroutines/read/parse_object/ParseObjectCoroutinesExtensions.kt renamed to coroutines/src/main/java/com/parse/coroutines/ParseObjectCoroutinesExtensions.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
@file:JvmName("ParseObjectCoroutinesExtensions")
2-
@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
32

4-
package com.parse.coroutines.read.parse_object
3+
package com.parse.coroutines
54

65
import com.parse.ParseObject
76
import kotlin.coroutines.resume
87
import kotlin.coroutines.resumeWithException
98
import kotlin.coroutines.suspendCoroutine
109

11-
suspend fun <T : ParseObject> ParseObject.fetch(): T {
10+
suspend fun <T : ParseObject> ParseObject.suspendFetch(): T {
1211
return suspendCoroutine { continuation ->
1312

1413
fetchInBackground<T> { obj, e ->
@@ -18,7 +17,7 @@ suspend fun <T : ParseObject> ParseObject.fetch(): T {
1817
}
1918
}
2019

21-
suspend fun <T : ParseObject> ParseObject.fetchIfNeeded(): T {
20+
suspend fun <T : ParseObject> ParseObject.suspendFetchIfNeeded(): T {
2221
return suspendCoroutine { continuation ->
2322

2423
fetchIfNeededInBackground<T> { obj, e ->
@@ -36,4 +35,4 @@ suspend fun <T : ParseObject> ParseObject.fetchFromLocal(): T {
3635
else continuation.resumeWithException(e)
3736
}
3837
}
39-
}
38+
}
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
@file:JvmName("ParseObjectCoroutinesWriteExtensions")
2-
@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
32

4-
package com.parse.coroutines.write.parse_object
3+
package com.parse.coroutines
54

65
import com.parse.ParseObject
76
import kotlin.coroutines.resume
87
import kotlin.coroutines.resumeWithException
98
import kotlin.coroutines.suspendCoroutine
109

11-
suspend fun ParseObject.save() {
10+
suspend fun ParseObject.suspendSave() {
1211
return suspendCoroutine { continuation ->
1312
saveInBackground {
1413
if (it == null) continuation.resume(Unit)
@@ -17,11 +16,11 @@ suspend fun ParseObject.save() {
1716
}
1817
}
1918

20-
suspend fun ParseObject.pin() {
19+
suspend fun ParseObject.suspendPin() {
2120
return suspendCoroutine { continuation ->
2221
pinInBackground {
2322
if (it == null) continuation.resume(Unit)
2423
else continuation.resumeWithException(it)
2524
}
2625
}
27-
}
26+
}

Diff for: coroutines/src/main/java/com/parse/coroutines/read/query/ParseQueryCoroutinesBuilder.kt renamed to coroutines/src/main/java/com/parse/coroutines/ParseQueryCoroutinesBuilder.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
@file:JvmName("ParseQueryCoroutinesBuilder")
2-
@file:Suppress("EXTENSION_SHADOWED_BY_MEMBER")
32

4-
package com.parse.coroutines.read.query
3+
package com.parse.coroutines
54

65
import com.parse.ParseObject
76
import com.parse.ParseQuery
8-
import com.parse.coroutines.read.ParseQueryOperation
9-
import com.parse.coroutines.read.ParseQueryOperationImpl
107
import kotlinx.coroutines.CoroutineScope
118
import kotlinx.coroutines.Job
129
import kotlinx.coroutines.launch
@@ -21,4 +18,4 @@ fun <T : ParseObject> CoroutineScope.launchQuery(
2118
return launch(context) {
2219
block.invoke(ParseQueryOperationImpl(query))
2320
}
24-
}
21+
}

Diff for: coroutines/src/main/java/com/parse/coroutines/read/query/ParseQueryCoroutinesExtensions.kt renamed to coroutines/src/main/java/com/parse/coroutines/ParseQueryCoroutinesExtensions.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
@file:JvmName("ParseQueryCoroutinesExtensions")
22

3-
package com.parse.coroutines.read.query
3+
package com.parse.coroutines
44

55
import com.parse.ParseObject
66
import com.parse.ParseQuery
77
import kotlinx.coroutines.suspendCancellableCoroutine
88
import kotlin.coroutines.resume
99
import kotlin.coroutines.resumeWithException
1010

11-
suspend fun <T : ParseObject> ParseQuery<T>.find(): List<T> {
11+
suspend fun <T : ParseObject> ParseQuery<T>.suspendFind(): List<T> {
1212
return findInternal()
1313
}
1414

@@ -25,7 +25,7 @@ internal suspend fun <T : ParseObject> ParseQuery<T>.findInternal(): List<T> {
2525
}
2626
}
2727

28-
suspend fun <T : ParseObject> ParseQuery<T>.get(id: String): T {
28+
suspend fun <T : ParseObject> ParseQuery<T>.getById(id: String): T {
2929
return getInternal(id)
3030
}
3131

@@ -59,7 +59,7 @@ internal suspend fun <T : ParseObject> ParseQuery<T>.firstInternal(): T {
5959
}
6060
}
6161

62-
suspend fun <T : ParseObject> ParseQuery<T>.count(): Int {
62+
suspend fun <T : ParseObject> ParseQuery<T>.suspendCount(): Int {
6363
return countInternal()
6464
}
6565

@@ -74,4 +74,4 @@ internal suspend fun <T : ParseObject> ParseQuery<T>.countInternal(): Int {
7474
else continuation.resumeWithException(e)
7575
}
7676
}
77-
}
77+
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.parse.coroutines.read
1+
package com.parse.coroutines
22

33
interface ParseQueryOperation<out T> {
44
suspend fun find(): List<T>
55
suspend fun get(id: String): T
66
suspend fun first(): T
77
suspend fun count(): Int
8-
}
8+
}
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
package com.parse.coroutines.read
1+
package com.parse.coroutines
22

33
import com.parse.ParseObject
44
import com.parse.ParseQuery
5-
import com.parse.coroutines.read.query.countInternal
6-
import com.parse.coroutines.read.query.findInternal
7-
import com.parse.coroutines.read.query.firstInternal
8-
import com.parse.coroutines.read.query.getInternal
95

106
class ParseQueryOperationImpl<T : ParseObject>(private val query: ParseQuery<T>) : ParseQueryOperation<T> {
117

@@ -16,4 +12,4 @@ class ParseQueryOperationImpl<T : ParseObject>(private val query: ParseQuery<T>)
1612
override suspend fun first(): T = query.firstInternal()
1713

1814
override suspend fun count(): Int = query.countInternal()
19-
}
15+
}

Diff for: coroutines/src/main/java/com/parse/coroutines/user/ParseUserCoroutinesExtensions.kt renamed to coroutines/src/main/java/com/parse/coroutines/ParseUserCoroutinesExtensions.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@file:JvmName("ParseUserCoroutinesExtensions")
22

3-
package com.parse.coroutines.user
3+
package com.parse.coroutines
44

55
import com.parse.ParseUser
66
import kotlin.coroutines.resume
77
import kotlin.coroutines.resumeWithException
88
import kotlin.coroutines.suspendCoroutine
99

10-
suspend fun ParseUser.signUp(): ParseUser {
10+
suspend fun ParseUser.suspendSignUp(): ParseUser {
1111
return suspendCoroutine { continuation ->
1212
signUpInBackground { e ->
1313
if (e == null) continuation.resume(this)

0 commit comments

Comments
 (0)