Skip to content

Commit 8502627

Browse files
committed
Make ITEMS_SUFFIX_DEFAULT const val naming consistent
1 parent 5f8ef12 commit 8502627

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

reactive/api/api/datasourcex-reactive-api.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public final class com/caplin/integration/datasourcex/reactive/api/ActiveConfig$
2121

2222
public abstract class com/caplin/integration/datasourcex/reactive/api/ActiveContainerConfig {
2323
public static final field Companion Lcom/caplin/integration/datasourcex/reactive/api/ActiveContainerConfig$Companion;
24-
public static final field DEFAULT_ITEMS_SUFFIX Ljava/lang/String;
24+
public static final field ITEMS_SUFFIX_DEFAULT Ljava/lang/String;
2525
public static final field ROW_REQUEST_TIMEOUT_DEFAULT J
2626
public static final field STRUCTURE_DEBOUNCE_DEFAULT J
2727
public final fun getInsertAt ()Lcom/caplin/integration/datasourcex/reactive/api/InsertAt;

reactive/api/src/main/kotlin/com/caplin/integration/datasourcex/reactive/api/ActiveContainerConfig.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ sealed class ActiveContainerConfig {
77
companion object {
88
const val STRUCTURE_DEBOUNCE_DEFAULT: Long = 100L
99
const val ROW_REQUEST_TIMEOUT_DEFAULT: Long = 10000L
10-
11-
const val DEFAULT_ITEMS_SUFFIX = "-items"
10+
const val ITEMS_SUFFIX_DEFAULT = "-items"
1211
}
1312

1413
/**
@@ -46,7 +45,7 @@ sealed class ActiveContainerConfig {
4645
* items with the paths `/container/a-items/{rowKey}` where `{rowKey}` is provided by
4746
* [ContainerEvent.RowEvent.key].
4847
*/
49-
var rowPathSuffix: String = DEFAULT_ITEMS_SUFFIX
48+
var rowPathSuffix: String = ITEMS_SUFFIX_DEFAULT
5049

5150
class Json : ActiveContainerConfig()
5251

reactive/kotlin/src/test/kotlin/com/caplin/integration/datasourcex/reactive/kotlin/BindTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class BindTest :
4646
FunSpec({
4747
isolationMode = IsolationMode.InstancePerTest
4848

49-
suspend fun <T : Any?> MutableSharedFlow<ValueOrCompletion<T>>.emitUpdate(event: T) {
49+
suspend fun <T> MutableSharedFlow<ValueOrCompletion<T>>.emitUpdate(event: T) {
5050
emit(Value(event))
5151
}
5252

spring/src/main/kotlin/com/caplin/integration/datasourcex/spring/internal/DataSourceServerBootstrap.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.caplin.integration.datasourcex.spring.internal
22

33
import com.caplin.datasource.DataSource
44
import com.caplin.datasource.Service
5-
import com.caplin.integration.datasourcex.reactive.api.ActiveContainerConfig.Companion.DEFAULT_ITEMS_SUFFIX
5+
import com.caplin.integration.datasourcex.reactive.api.ActiveContainerConfig.Companion.ITEMS_SUFFIX_DEFAULT
66
import com.caplin.integration.datasourcex.reactive.api.RecordType
77
import com.caplin.integration.datasourcex.reactive.kotlin.bind
88
import com.caplin.integration.datasourcex.spring.annotations.DataService
@@ -132,7 +132,7 @@ internal class DataSourceServerBootstrap(
132132
val namespaces = buildList {
133133
add(AntPatternNamespace(pattern))
134134
if (isContainer) {
135-
add(AntPatternNamespace("$pattern${DEFAULT_ITEMS_SUFFIX}/*"))
135+
add(AntPatternNamespace("$pattern${ITEMS_SUFFIX_DEFAULT}/*"))
136136
}
137137
}
138138

0 commit comments

Comments
 (0)