Unify naming of generated functions.

MiSikora · Oct 8, 2020 · 62e8919 · 62e8919
1 parent 6fab079
commit 62e8919
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -229,7 +229,7 @@ enum class PowerPlant(override val isFallbackValue: Boolean = false) : Feature<P
 
 // Generated by 'generateSourcedFeatureStorage'
 
-internal fun FeatureStorage.Companion.generatedSourced(
+internal fun FeatureStorage.Companion.sourcedGenerated(
   localSource: FeatureStorage,
   firebaseSource: FeatureStorage,
   awsSource: FeatureStorage

diff --git a/...y/generator/src/main/java/io/mehow/laboratory/generator/SourcedFeatureStorageGenerator.kt b/...y/generator/src/main/java/io/mehow/laboratory/generator/SourcedFeatureStorageGenerator.kt
@@ -25,7 +25,7 @@ internal class SourcedFeatureStorageGenerator(
 
   private val infixTo = MemberName("kotlin", "to")
 
-  private val storageExtension = FunSpec.builder("generatedSourced")
+  private val storageExtension = FunSpec.builder("sourcedGenerated")
     .addModifiers(storage.visibility.modifier)
     .receiver(FeatureStorage.Companion::class)
     .returns(FeatureStorage::class)

diff --git a/library/generator/src/main/java/io/mehow/laboratory/generator/SourcedFeatureStorageModel.kt b/library/generator/src/main/java/io/mehow/laboratory/generator/SourcedFeatureStorageModel.kt
@@ -24,7 +24,7 @@ class SourcedFeatureStorageModel private constructor(
     internal val packageName: String,
     internal val sourceNames: List<String>,
   ) {
-    internal val name = "GeneratedSourcedFeatureStorage"
+    internal val name = "sourcedGeneratedFeatureStorage"
     internal val fqcn = if (packageName.isEmpty()) name else "$packageName.$name"
 
     fun build(): Either<GenerationFailure, SourcedFeatureStorageModel> {

diff --git a/library/generator/src/test/java/io/mehow/laboratory/generator/SourcedFeatureStorageSpec.kt b/library/generator/src/test/java/io/mehow/laboratory/generator/SourcedFeatureStorageSpec.kt
@@ -74,7 +74,7 @@ class SourcedFeatureStorageSpec : DescribeSpec({
             |import kotlin.collections.mapOf
             |import kotlin.to
             |
-            |internal fun FeatureStorage.Companion.generatedSourced(
+            |internal fun FeatureStorage.Companion.sourcedGenerated(
             |  localSource: FeatureStorage,
             |  firebaseSource: FeatureStorage,
             |  s3Source: FeatureStorage
@@ -106,7 +106,7 @@ class SourcedFeatureStorageSpec : DescribeSpec({
             |import kotlin.collections.mapOf
             |import kotlin.to
             |
-            |fun FeatureStorage.Companion.generatedSourced(
+            |fun FeatureStorage.Companion.sourcedGenerated(
             |  localSource: FeatureStorage,
             |  firebaseSource: FeatureStorage,
             |  s3Source: FeatureStorage
@@ -138,7 +138,7 @@ class SourcedFeatureStorageSpec : DescribeSpec({
             |import kotlin.collections.mapOf
             |import kotlin.to
             |
-            |fun FeatureStorage.Companion.generatedSourced(
+            |fun FeatureStorage.Companion.sourcedGenerated(
             |  localSource: FeatureStorage,
             |  fooSource: FeatureStorage,
             |  barSource: FeatureStorage,
@@ -181,7 +181,7 @@ class SourcedFeatureStorageSpec : DescribeSpec({
             |import kotlin.collections.mapOf
             |import kotlin.to
             |
-            |fun FeatureStorage.Companion.generatedSourced(localSource: FeatureStorage,
+            |fun FeatureStorage.Companion.sourcedGenerated(localSource: FeatureStorage,
             |    fooSource: FeatureStorage): FeatureStorage = sourced(
             |  localSource,
             |  mapOf(
@@ -208,7 +208,7 @@ class SourcedFeatureStorageSpec : DescribeSpec({
             |import io.mehow.laboratory.FeatureStorage.Companion.sourced
             |import kotlin.collections.emptyMap
             |
-            |fun FeatureStorage.Companion.generatedSourced(localSource: FeatureStorage): FeatureStorage =
+            |fun FeatureStorage.Companion.sourcedGenerated(localSource: FeatureStorage): FeatureStorage =
             |    sourced(
             |  localSource,
             |  emptyMap()

diff --git a/.../gradle-plugin/src/test/java/io/mehow/laboratory/gradle/GenerateSourcedStorageTaskSpec.kt b/.../gradle-plugin/src/test/java/io/mehow/laboratory/gradle/GenerateSourcedStorageTaskSpec.kt
@@ -38,11 +38,11 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe SUCCESS
 
-    val factory = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain """
-      |fun FeatureStorage.Companion.generatedSourced(localSource: FeatureStorage): FeatureStorage
+      |fun FeatureStorage.Companion.sourcedGenerated(localSource: FeatureStorage): FeatureStorage
       |    = sourced(
       |  localSource,
       |  emptyMap()
@@ -57,11 +57,11 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe SUCCESS
 
-    val factory = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain """
-      |fun FeatureStorage.Companion.generatedSourced(
+      |fun FeatureStorage.Companion.sourcedGenerated(
       |  localSource: FeatureStorage,
       |  remoteASource: FeatureStorage,
       |  remoteBSource: FeatureStorage
@@ -80,7 +80,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     gradleRunner.withProjectDir(fixture).build()
 
-    val factory = fixture.sourcedStorageFile("io.mehow.implicit.GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("io.mehow.implicit.sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain "package io.mehow.implicit"
@@ -91,7 +91,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     gradleRunner.withProjectDir(fixture).build()
 
-    val factory = fixture.sourcedStorageFile("io.mehow.explicit.GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("io.mehow.explicit.sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain "package io.mehow.explicit"
@@ -102,7 +102,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     gradleRunner.withProjectDir(fixture).build()
 
-    val factory = fixture.sourcedStorageFile("io.mehow.explicit.GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("io.mehow.explicit.sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain "package io.mehow.explicit"
@@ -113,25 +113,25 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     gradleRunner.withProjectDir(fixture).build()
 
-    val factory = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
-    factory.readText() shouldContain "internal fun FeatureStorage.Companion.generatedSourced(localSource: FeatureStorage)"
+    factory.readText() shouldContain "internal fun FeatureStorage.Companion.sourcedGenerated(localSource: FeatureStorage)"
   }
 
   "generates public storage" {
     val fixture = "sourced-storage-generate-public".toFixture()
 
     gradleRunner.withProjectDir(fixture).build()
 
-    val factory = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     // Ensure public by checking a new line before enum declaration.
     // Change after https://github.com/square/kotlinpoet/pull/933
     factory.readText() shouldContain """
       |
-      |fun FeatureStorage.Companion.generatedSourced(localSource: FeatureStorage)
+      |fun FeatureStorage.Companion.sourcedGenerated(localSource: FeatureStorage)
     """.trimMargin("|")
   }
 
@@ -141,9 +141,9 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
     val result = gradleRunner.withProjectDir(fixture).buildAndFail()
 
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe FAILED
-    result.output shouldContain InvalidPackageName("!!!.GeneratedSourcedFeatureStorage").message
+    result.output shouldContain InvalidPackageName("!!!.sourcedGeneratedFeatureStorage").message
 
-    val feature = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val feature = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     feature.shouldNotExist()
   }
 
@@ -155,7 +155,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe FAILED
     result.output shouldContain NoFeatureValues("Feature").message
 
-    val feature = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val feature = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     feature.shouldNotExist()
   }
 
@@ -167,7 +167,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe FAILED
     result.output shouldContain FeatureValuesCollision("First".nel(), "Feature").message
 
-    val feature = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val feature = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     feature.shouldNotExist()
   }
 
@@ -179,7 +179,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe FAILED
     result.output shouldContain InvalidFeatureValues(NonEmptyList("!!!, ???"), "Feature").message
 
-    val feature = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val feature = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     feature.shouldNotExist()
   }
 
@@ -191,7 +191,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe FAILED
     result.output shouldContain InvalidFeatureName("!!!", "!!!").message
 
-    val feature = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val feature = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     feature.shouldNotExist()
   }
 
@@ -203,7 +203,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe FAILED
     result.output shouldContain InvalidPackageName("!!!.Feature").message
 
-    val feature = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val feature = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     feature.shouldNotExist()
   }
 
@@ -215,7 +215,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe FAILED
     result.output shouldContain FeaturesCollision("io.mehow.Feature".nel()).message
 
-    val feature = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val feature = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     feature.shouldNotExist()
   }
 
@@ -226,11 +226,11 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe SUCCESS
 
-    val factory = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain """
-      |fun FeatureStorage.Companion.generatedSourced(
+      |fun FeatureStorage.Companion.sourcedGenerated(
       |  localSource: FeatureStorage,
       |  remoteSource: FeatureStorage,
       |  remoteASource: FeatureStorage,
@@ -253,11 +253,11 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe SUCCESS
 
-    val factory = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain """
-      |fun FeatureStorage.Companion.generatedSourced(
+      |fun FeatureStorage.Companion.sourcedGenerated(
       |  localSource: FeatureStorage,
       |  remoteSource: FeatureStorage,
       |  remoteBSource: FeatureStorage
@@ -279,7 +279,7 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe FAILED
     result.output shouldContain FeaturesCollision("Feature".nel()).message
 
-    val feature = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val feature = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     feature.shouldNotExist()
   }
 
@@ -290,11 +290,11 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe SUCCESS
 
-    val factory = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain """
-      |fun FeatureStorage.Companion.generatedSourced(localSource: FeatureStorage): FeatureStorage
+      |fun FeatureStorage.Companion.sourcedGenerated(localSource: FeatureStorage): FeatureStorage
       |    = sourced(
       |  localSource,
       |  emptyMap()
@@ -309,11 +309,11 @@ class GenerateSourcedStorageTaskSpec : StringSpec({
 
     result.task(":generateSourcedFeatureStorage")!!.outcome shouldBe SUCCESS
 
-    val factory = fixture.sourcedStorageFile("GeneratedSourcedFeatureStorage")
+    val factory = fixture.sourcedStorageFile("sourcedGeneratedFeatureStorage")
     factory.shouldExist()
 
     factory.readText() shouldContain """
-      |fun FeatureStorage.Companion.generatedSourced(localSource: FeatureStorage): FeatureStorage
+      |fun FeatureStorage.Companion.sourcedGenerated(localSource: FeatureStorage): FeatureStorage
       |    = sourced(
       |  localSource,
       |  emptyMap()

diff --git a/sample/src/main/java/io/mehow/laboratory/sample/SampleApplication.kt b/sample/src/main/java/io/mehow/laboratory/sample/SampleApplication.kt
@@ -23,7 +23,7 @@ class SampleApplication : Application() {
     val awsStorage = SharedPreferencesFeatureStorage(
       getSharedPreferences("awsFeatures", MODE_PRIVATE)
     )
-    val sourcedStorage = FeatureStorage.generatedSourced(
+    val sourcedStorage = FeatureStorage.sourcedGenerated(
       localSource = localStorage,
       firebaseSource = firebaseStorage,
       awsSource = awsStorage,