Skip to content

Commit

Permalink
revert: adding internal package
Browse files Browse the repository at this point in the history 
This change was making PR review more difficult, better to do in a separate PR
  • Loading branch information
@wzieba
wzieba committed Apr 5, 2024
1 parent 2273370 commit 306635d
Show file tree
Hide file tree
Showing 31 changed files with 28 additions and 59 deletions.
2 changes: 1 addition & 1 deletion example/src/main/java/com/example/InternalDebugOnlyData.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example;

import com.parsely.parselyandroid.internal.ParselyTrackerInternal;
import com.parsely.parselyandroid.ParselyTrackerInternal;

import org.jetbrains.annotations.Nullable;

Expand Down
2 changes: 1 addition & 1 deletion example/src/main/java/com/example/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import com.parsely.parselyandroid.ParselyTracker;
import com.parsely.parselyandroid.SiteIdSource;
import com.parsely.parselyandroid.internal.ParselyTrackerInternal;
import com.parsely.parselyandroid.ParselyTrackerInternal;
import com.parsely.parselyandroid.ParselyVideoMetadata;

import java.util.ArrayList;
Expand Down
2 changes: 0 additions & 2 deletions parsely/src/androidTest/java/com/parsely/parselyandroid/FunctionalTests.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.core.type.TypeReference
import com.fasterxml.jackson.databind.ObjectMapper
import com.parsely.parselyandroid.internal.ParselyTrackerInternal
import java.io.File
import java.io.FileInputStream
import java.io.ObjectInputStream
Expand All @@ -21,7 +20,6 @@ import kotlin.io.path.Path
import kotlin.time.Duration
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.parse
import kotlin.time.Duration.Companion.seconds
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withTimeoutOrNull
Expand Down
4 changes: 2 additions & 2 deletions ...droid/internal/AdvertisementIdProvider.kt → ...parselyandroid/AdvertisementIdProvider.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import android.content.Context
import android.provider.Settings
import com.google.android.gms.ads.identifier.AdvertisingIdClient
import com.parsely.parselyandroid.internal.Logging.log
import com.parsely.parselyandroid.Logging.log
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch

Expand Down
2 changes: 1 addition & 1 deletion .../parsely/parselyandroid/internal/Clock.kt → .../java/com/parsely/parselyandroid/Clock.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import java.util.Calendar
import java.util.TimeZone
Expand Down
2 changes: 1 addition & 1 deletion ...id/internal/ConnectivityStatusProvider.kt → ...selyandroid/ConnectivityStatusProvider.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import android.content.Context
import android.net.ConnectivityManager
Expand Down
4 changes: 2 additions & 2 deletions ...yandroid/internal/DeviceInfoRepository.kt → ...ly/parselyandroid/DeviceInfoRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import android.os.Build
import com.parsely.parselyandroid.internal.Logging.log
import com.parsely.parselyandroid.Logging.log

internal interface DeviceInfoRepository{
fun collectDeviceInfo(): Map<String, String>
Expand Down
5 changes: 2 additions & 3 deletions ...selyandroid/internal/EngagementManager.kt → ...rsely/parselyandroid/EngagementManager.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.Logging.log
import com.parsely.parselyandroid.ParselyVideoMetadata
import com.parsely.parselyandroid.Logging.log
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
Expand Down
2 changes: 1 addition & 1 deletion ...ly/parselyandroid/internal/EventQueuer.kt → ...com/parsely/parselyandroid/EventQueuer.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

internal interface EventQueuer {
fun enqueueEvent(event: Map<String, Any>)
Expand Down
6 changes: 2 additions & 4 deletions .../parselyandroid/internal/EventsBuilder.kt → ...m/parsely/parselyandroid/EventsBuilder.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.Logging.log
import com.parsely.parselyandroid.ParselyMetadata
import com.parsely.parselyandroid.SiteIdSource
import com.parsely.parselyandroid.Logging.log

internal class EventsBuilder(
private val deviceInfoRepository: DeviceInfoRepository,
Expand Down
2 changes: 1 addition & 1 deletion ...y/parselyandroid/internal/FlushManager.kt → ...om/parsely/parselyandroid/FlushManager.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
Expand Down
6 changes: 3 additions & 3 deletions ...ely/parselyandroid/internal/FlushQueue.kt → .../com/parsely/parselyandroid/FlushQueue.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.JsonSerializer.toParselyEventsPayload
import com.parsely.parselyandroid.internal.Logging.log
import com.parsely.parselyandroid.JsonSerializer.toParselyEventsPayload
import com.parsely.parselyandroid.Logging.log
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
Expand Down
2 changes: 1 addition & 1 deletion ...d/internal/HeartbeatIntervalCalculator.kt → ...elyandroid/HeartbeatIntervalCalculator.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import kotlin.time.Duration
import kotlin.time.Duration.Companion.minutes
Expand Down
4 changes: 2 additions & 2 deletions ...parselyandroid/internal/InMemoryBuffer.kt → .../parsely/parselyandroid/InMemoryBuffer.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.Logging.log
import com.parsely.parselyandroid.Logging.log
import kotlin.time.Duration.Companion.seconds
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.delay
Expand Down
2 changes: 1 addition & 1 deletion ...parselyandroid/internal/JsonSerializer.kt → .../parsely/parselyandroid/JsonSerializer.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import com.fasterxml.jackson.databind.ObjectMapper
import java.io.IOException
Expand Down
4 changes: 2 additions & 2 deletions ...ndroid/internal/LocalStorageRepository.kt → .../parselyandroid/LocalStorageRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import android.content.Context
import com.parsely.parselyandroid.internal.Logging.log
import com.parsely.parselyandroid.Logging.log
import java.io.EOFException
import java.io.FileNotFoundException
import java.io.ObjectInputStream
Expand Down
2 changes: 1 addition & 1 deletion ...arsely/parselyandroid/internal/Logging.kt → ...ava/com/parsely/parselyandroid/Logging.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import java.util.Formatter

Expand Down
2 changes: 1 addition & 1 deletion ...yandroid/internal/ParselyAPIConnection.kt → ...ly/parselyandroid/ParselyAPIConnection.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import java.net.HttpURLConnection
import java.net.URL
Expand Down
2 changes: 1 addition & 1 deletion ...android/internal/ParselyCoroutineScope.kt → ...y/parselyandroid/ParselyCoroutineScope.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import kotlinx.coroutines.CoroutineName
import kotlinx.coroutines.CoroutineScope
Expand Down
1 change: 0 additions & 1 deletion parsely/src/main/java/com/parsely/parselyandroid/ParselyTracker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package com.parsely.parselyandroid

import android.content.Context
import com.parsely.parselyandroid.internal.ParselyTrackerInternal
import org.jetbrains.annotations.TestOnly

/**
Expand Down
6 changes: 1 addition & 5 deletions ...ndroid/internal/ParselyTrackerInternal.kt → .../parselyandroid/ParselyTrackerInternal.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
package com.parsely.parselyandroid.internal
package com.parsely.parselyandroid

import android.content.Context
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.ProcessLifecycleOwner
import com.parsely.parselyandroid.ParselyMetadata
import com.parsely.parselyandroid.ParselyTracker
import com.parsely.parselyandroid.ParselyVideoMetadata
import com.parsely.parselyandroid.SiteIdSource
import java.util.UUID

internal class ParselyTrackerInternal internal constructor(
Expand Down
1 change: 0 additions & 1 deletion parsely/src/test/java/com/parsely/parselyandroid/AndroidDeviceInfoRepositoryTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.AndroidDeviceInfoRepository
import org.assertj.core.api.Assertions.assertThat
import org.junit.Before
import org.junit.Test
Expand Down
1 change: 0 additions & 1 deletion parsely/src/test/java/com/parsely/parselyandroid/AndroidIdProviderTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.parsely.parselyandroid
import android.app.Application
import android.provider.Settings
import androidx.test.core.app.ApplicationProvider
import com.parsely.parselyandroid.internal.AndroidIdProvider
import org.assertj.core.api.Assertions.assertThat
import org.junit.Before
import org.junit.Test
Expand Down
4 changes: 0 additions & 4 deletions parsely/src/test/java/com/parsely/parselyandroid/EngagementManagerTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.Clock
import com.parsely.parselyandroid.internal.EngagementManager
import com.parsely.parselyandroid.internal.EventQueuer
import com.parsely.parselyandroid.internal.HeartbeatIntervalCalculator
import kotlin.time.Duration
import kotlin.time.Duration.Companion.milliseconds
import kotlin.time.Duration.Companion.seconds
Expand Down
3 changes: 0 additions & 3 deletions parsely/src/test/java/com/parsely/parselyandroid/EventsBuilderTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.Clock
import com.parsely.parselyandroid.internal.DeviceInfoRepository
import com.parsely.parselyandroid.internal.EventsBuilder
import kotlin.time.Duration
import kotlin.time.Duration.Companion.hours
import org.assertj.core.api.Assertions.assertThat
Expand Down
1 change: 0 additions & 1 deletion parsely/src/test/java/com/parsely/parselyandroid/FlushManagerTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.ParselyFlushManager
import kotlin.time.Duration.Companion.seconds
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.advanceTimeBy
Expand Down
5 changes: 0 additions & 5 deletions parsely/src/test/java/com/parsely/parselyandroid/FlushQueueTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.ConnectivityStatusProvider
import com.parsely.parselyandroid.internal.FlushManager
import com.parsely.parselyandroid.internal.FlushQueue
import com.parsely.parselyandroid.internal.QueueRepository
import com.parsely.parselyandroid.internal.RestClient
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runCurrent
import kotlinx.coroutines.test.runTest
Expand Down
4 changes: 1 addition & 3 deletions parsely/src/test/java/com/parsely/parselyandroid/HeartbeatIntervalCalculatorTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.HeartbeatIntervalCalculator.Companion.MAX_TIME_BETWEEN_HEARTBEATS
import com.parsely.parselyandroid.internal.Clock
import com.parsely.parselyandroid.internal.HeartbeatIntervalCalculator
import com.parsely.parselyandroid.HeartbeatIntervalCalculator.Companion.MAX_TIME_BETWEEN_HEARTBEATS
import kotlin.time.Duration
import kotlin.time.Duration.Companion.seconds
import org.assertj.core.api.Assertions.assertThat
Expand Down
2 changes: 0 additions & 2 deletions parsely/src/test/java/com/parsely/parselyandroid/InMemoryBufferTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.InMemoryBuffer
import com.parsely.parselyandroid.internal.QueueRepository
import kotlin.time.Duration.Companion.seconds
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.cancel
Expand Down
1 change: 0 additions & 1 deletion parsely/src/test/java/com/parsely/parselyandroid/LocalStorageRepositoryTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.parsely.parselyandroid

import android.content.Context
import androidx.test.core.app.ApplicationProvider
import com.parsely.parselyandroid.internal.LocalStorageRepository
import java.io.File
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runCurrent
Expand Down
1 change: 0 additions & 1 deletion parsely/src/test/java/com/parsely/parselyandroid/ParselyAPIConnectionTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.parsely.parselyandroid

import com.parsely.parselyandroid.internal.ParselyAPIConnection
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runCurrent
import kotlinx.coroutines.test.runTest
Expand Down

0 comments on commit 306635d

Please sign in to comment.