fix: lint issues and one test case

rudderlabs · Sep 18, 2023 · 0b2b1ee · 0b2b1ee
1 parent 5012775
commit 0b2b1ee
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 91 deletions.
diff --git a/gsonrudderadapter/project.json b/gsonrudderadapter/project.json
@@ -8,9 +8,7 @@
       "dependsOn": [
         {
           "projects":[
-            "rudderjsonadapter",
-            "models"
-          ],
+            "rudderjsonadapter"],
           "target":"build"
         }
       ],
@@ -34,7 +32,7 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "master",
+        "baseBranch": "master-v2",
         "preset": "conventional",
         "tagPrefix": "${projectName}@"
       }
@@ -48,7 +46,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "gsonrudderadapter@0.1.0",
+        "tag": "gsonrudderadapter@1.0.0",
         "notesFile": "./gsonrudderadapter/CHANGELOG_LATEST.md"
       }
     },

diff --git a/jacksonrudderadapter/project.json b/jacksonrudderadapter/project.json
@@ -8,8 +8,7 @@
       "dependsOn": [
         {
           "projects":[
-            "rudderjsonadapter",
-            "models"
+            "rudderjsonadapter"
           ],
           "target":"build"
         }
@@ -34,7 +33,7 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "master",
+        "baseBranch": "master-v2",
         "preset": "conventional",
         "tagPrefix": "${projectName}@"
       }
@@ -48,7 +47,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "jacksonrudderadapter@0.1.0",
+        "tag": "jacksonrudderadapter@1.0.0",
         "notesFile": "./jacksonrudderadapter/CHANGELOG_LATEST.md"
       }
     },

diff --git a/moshirudderadapter/project.json b/moshirudderadapter/project.json
@@ -4,16 +4,15 @@
   "projectType": "library",
   "sourceRoot": "./moshirudderadapter/src",
   "targets": {
-    "dependsOn": [
-      {
-        "projects":[
-          "rudderjsonadapter",
-          "models"
-        ],
-        "target":"build"
-      }
-    ],
     "build": {
+      "dependsOn": [
+        {
+          "projects":[
+            "rudderjsonadapter"
+          ],
+          "target":"build"
+        }
+      ],
       "executor": "@jnxplus/nx-gradle:build",
       "outputs": ["./moshirudderadapter/build"]
     },
@@ -32,7 +31,7 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "master",
+        "baseBranch": "master-v2",
         "preset": "conventional",
         "tagPrefix": "${projectName}@"
       }
@@ -46,7 +45,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "moshirudderadapter@0.1.0",
+        "tag": "moshirudderadapter@1.0.0",
         "notesFile": "./moshirudderadapter/CHANGELOG_LATEST.md"
       }
     },

diff --git a/package.json b/package.json
@@ -26,8 +26,8 @@
     "test": "nx affected --base=origin/master-v2 --target='test' --parallel=1 --exclude=app,core,android --skipCommitTypes=docs,ci,chore",
     "release": "nx affected --base=origin/master-v2 --target=version --parallel=1 --exclude=app,core,android --skipCommitTypes=docs,ci,chore && npm run sync-version-gradle",
     "release:github": "nx affected --target=github --parallel=1 --exclude=app,core,android --skipCommitTypes=docs,ci,chore",
-    "release:sonatype": "nx affected --target=release-sonatype --parallel=1 --exclude=app,core,android",
-    "release-snapshot:sonatype": "nx affected --target=snapshot-release --parallel=4 --exclude=app,core,android"
+    "release:sonatype": "nx affected --base=origin/master-v2 --target=release-sonatype --parallel=1 --exclude=app,core,android",
+    "release-snapshot:sonatype": "nx affected --base=origin/master-v2 --target=snapshot-release --parallel=1 --exclude=app,core,android"
   },
   "private": true,
   "devDependencies": {

diff --git a/repository/build.gradle b/repository/build.gradle
@@ -58,25 +58,13 @@ dependencies {
 
     testImplementation deps.androidXTestExtJunitKtx
     testImplementation deps.androidXTestRules
-//    implementation 'androidx.appcompat:appcompat:1.3.1'
-//    implementation 'com.google.android.material:material:1.4.0'
-//    implementation(project(":rudderjsonadapter"))
 
     testImplementation deps.junit
-//    testImplementation(project(':moshirudderadapter'))
-//    testImplementation(project(':gsonrudderadapter'))
-//    testImplementation(project(':jacksonrudderadapter'))
-//    testImplementation deps.moshi.kotlin
-//    testImplementation deps.moshi.core
-//    testImplementation deps.gson
-//    testImplementation deps.jackson
     testImplementation deps.androidXTest
     testImplementation deps.hamcrest
     testImplementation deps.mockito
     testImplementation deps.awaitility
     testImplementation deps.robolectric
-//    androidTestImplementation deps.androidXTestExtJunitKtx
-//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 apply from: rootProject.file('gradle/artifacts-aar.gradle')
 apply from: rootProject.file('gradle/mvn-publish.gradle')

diff --git a/repository/project.json b/repository/project.json
@@ -25,7 +25,7 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "master",
+        "baseBranch": "master-v2",
         "preset": "conventional",
         "tagPrefix": "${projectName}@"
       }
@@ -39,7 +39,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "repository@0.1.0",
+        "tag": "repository@1.0.0",
         "notesFile": "./repository/CHANGELOG_LATEST.md"
       }
     },

diff --git a/repository/src/test/java/com/rudderstack/android/repository/RudderDatabaseTest.kt b/repository/src/test/java/com/rudderstack/android/repository/RudderDatabaseTest.kt
@@ -30,8 +30,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -40,13 +38,16 @@ import java.util.concurrent.atomic.AtomicBoolean
 @Config(sdk = [29])
 class RudderDatabaseTest {
     //    private lateinit var
+//    private val delayedExecutor = Executors.newSingleThreadExecutor()
     @Before
     fun initialize() {
-//        RudderDatabase.init(
-//            ApplicationProvider.getApplicationContext(),
-////            RuntimeEnvironment.application,
-//            "testDb", TestEntityFactory, executorService = TestExecutor()
-//        )
+        RudderDatabase.init(
+            ApplicationProvider.getApplicationContext(),
+            "testDb",
+            TestEntityFactory,
+            false,
+            executorService = TestExecutor()
+        )
 
     }
 
@@ -56,19 +57,18 @@ class RudderDatabaseTest {
     }
 
     @Test
-    fun `test race condition in dao list initialisation`(){
-        val delayedExecutor = Executors.newSingleThreadExecutor()
-        RudderDatabase.init(
-            ApplicationProvider.getApplicationContext(), "testDb", TestEntityFactory,false,
-            executorService = delayedExecutor)
+    fun `test race condition in dao list initialisation`() {
+
         val sampleDao = RudderDatabase.createNewDao(SampleEntity::class.java, TestExecutor())
-        val sampleAutoGenDao = RudderDatabase.createNewDao(SampleAutoGenEntity::class.java,
-            TestExecutor())
+        val sampleAutoGenDao = RudderDatabase.createNewDao(
+            SampleAutoGenEntity::class.java, TestExecutor()
+        )
         val sampleDaoCheck = RudderDatabase.getDao(SampleEntity::class.java)
         MatcherAssert.assertThat(sampleDao, Matchers.equalTo(sampleDaoCheck))
         MatcherAssert.assertThat(sampleAutoGenDao, Matchers.equalTo(sampleAutoGenDao))
         Thread.sleep(5000)
     }
+
     @Test
     fun multipleDaoCallsToReturnSameDaoObject() {
         val sampleDaoCheck = RudderDatabase.getDao(SampleEntity::class.java)
@@ -98,8 +98,7 @@ class RudderDatabaseTest {
 
         MatcherAssert.assertThat(
             savedData, allOf(
-                Matchers.iterableWithSize(2),
-                contains(*sampleEntitiesToSave.toTypedArray())
+                Matchers.iterableWithSize(2), contains(*sampleEntitiesToSave.toTypedArray())
             )
         )
 
@@ -128,8 +127,7 @@ class RudderDatabaseTest {
             getAll() {
                 assertThat(
                     it, allOf(
-                        Matchers.iterableWithSize(2),
-                        contains(*sampleEntitiesToSave.toTypedArray())
+                        Matchers.iterableWithSize(2), contains(*sampleEntitiesToSave.toTypedArray())
                     )
                 )
                 isGetComplete.set(true)
@@ -161,8 +159,7 @@ class RudderDatabaseTest {
                 val items = getAllSync()
                 assertThat(
                     items, allOf(
-                        iterableWithSize(1),
-                        contains(sampleEntitiesToSave[2])
+                        iterableWithSize(1), contains(sampleEntitiesToSave[2])
                     )
                 )
                 isCompleted.set(true)
@@ -171,12 +168,11 @@ class RudderDatabaseTest {
         Awaitility.await().atMost(5, TimeUnit.SECONDS).untilTrue(isCompleted)
 
     }
+
     @Test
     fun testAutoGenEntities() {
         val entitiesToSave = listOf(
-            SampleAutoGenEntity("abc"),
-            SampleAutoGenEntity("fgh"),
-            SampleAutoGenEntity("def")
+            SampleAutoGenEntity("abc"), SampleAutoGenEntity("fgh"), SampleAutoGenEntity("def")
         )
         val sampleDao = RudderDatabase.getDao(SampleAutoGenEntity::class.java)
         //save data
@@ -196,8 +192,7 @@ class RudderDatabaseTest {
                 val items = getAllSync()
                 assertThat(
                     items, allOf(
-                        iterableWithSize(1),
-                        contains(savedEntities[2])
+                        iterableWithSize(1), contains(savedEntities[2])
                     )
                 )
                 isCompleted.set(true)

diff --git a/rudderjsonadapter/project.json b/rudderjsonadapter/project.json
@@ -25,7 +25,7 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "master",
+        "baseBranch": "master-v2",
         "preset": "conventional",
         "tagPrefix": "${projectName}@"
       }
@@ -39,7 +39,7 @@
     "github": {
       "executor": "@jscutlery/semver:github",
       "options": {
-        "tag": "rudderjsonadapter@0.1.0",
+        "tag": "rudderjsonadapter@1.0.0",
         "notesFile": "./rudderjsonadapter/CHANGELOG_LATEST.md"
       }
     },

diff --git a/rudderreporter/project.json b/rudderreporter/project.json
@@ -5,18 +5,36 @@
   "sourceRoot": "./rudderreporter/src",
   "targets": {
     "build": {
+      "dependsOn": [
+        {
+          "projects": [
+            "gsonrudderadapter",
+            "jacksonrudderadapter",
+            "moshirudderadapter",
+            "repository",
+            "web"
+          ],
+          "target": "build"
+        }
+      ],
       "executor": "@jnxplus/nx-gradle:build",
-      "outputs": ["./rudderreporter/build"]
+      "outputs": [
+        "./rudderreporter/build"
+      ]
     },
     "lint": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:lint",
       "options": {
         "linter": "ktlint"
       }
     },
     "test": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "@jnxplus/nx-gradle:test"
     },
     "ktformat": {
@@ -25,7 +43,7 @@
     "version": {
       "executor": "@jscutlery/semver:version",
       "options": {
-        "baseBranch": "master",
+        "baseBranch": "master-v2",
         "preset": "conventional",
         "tagPrefix": "${projectName}@"
       }
@@ -44,14 +62,18 @@
       }
     },
     "release-sonatype": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'rudderreporter-release' && ./gradlew publishToSonatype -p rudderreporter -Prelease && ./gradlew closeAndReleaseSonatypeStagingRepository"
       }
     },
     "snapshot-release": {
-      "dependsOn": ["build"],
+      "dependsOn": [
+        "build"
+      ],
       "executor": "nx:run-commands",
       "options": {
         "command": "echo 'rudder-reporter-snapshot'  && sh ./gradlew generatePomFileForReleasePublication -p rudderreporter && ./gradlew publishToSonatype -p rudderreporter"

diff --git a/...c/main/java/com/rudderstack/android/ruddermetricsreporterandroid/DefaultRudderReporter.kt b/...c/main/java/com/rudderstack/android/ruddermetricsreporterandroid/DefaultRudderReporter.kt
@@ -31,7 +31,6 @@ import com.rudderstack.android.ruddermetricsreporterandroid.internal.di.ContextM
 import com.rudderstack.android.ruddermetricsreporterandroid.internal.di.SystemServiceModule
 import com.rudderstack.android.ruddermetricsreporterandroid.internal.error.MemoryTrimState
 import com.rudderstack.android.ruddermetricsreporterandroid.internal.metrics.DefaultAggregatorHandler
-import com.rudderstack.moshirudderadapter.MoshiAdapter
 import com.rudderstack.rudderjsonadapter.JsonAdapter
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -171,7 +170,7 @@ class DefaultRudderReporter(
         isMetricsEnabled: Boolean = true,
         isErrorEnabled: Boolean = true,
         backgroundTaskService: BackgroundTaskService? = null
-    ):this(contextModule, reservoir, configuration, configModule, syncer, jsonAdapter.manipulate(),
+    ):this(contextModule, reservoir, configuration, configModule, syncer, jsonAdapter,
         memoryTrimState,
         ConnectivityCompat(contextModule.ctx, RudderReporterNetworkChangeCallback(syncer)),
         isMetricsEnabled, isErrorEnabled, backgroundTaskService)
@@ -238,14 +237,14 @@ class DefaultRudderReporter(
         }
     }
 
-    companion object{
-        internal fun JsonAdapter.manipulate(): JsonAdapter {
-            if(this is MoshiAdapter){
-                add(CustomDateAdapterMoshi())
-            }
-            return this
-        }
-    }
+//    companion object{
+//        internal fun JsonAdapter.manipulate(): JsonAdapter {
+//            if(this is MoshiAdapter){
+//                add(CustomDateAdapterMoshi())
+//            }
+//            return this
+//        }
+//    }
 }