Skip to content

Commit d1aabb8

Browse files
muzahidul-optimuzahidul-opti
authored
[FSSDK-10587] chore: rollback to 4.0.0 (#491)
* Rollback to 4.0.0
1 parent 049ec0a commit d1aabb8

File tree

4 files changed

+51
-242
lines changed

4 files changed

+51
-242
lines changed

‎odp/src/androidTest/java/com/optimizely/ab/android/odp/ODPSegmentClientTest.kt

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package com.optimizely.ab.android.odp
1616

1717
import androidx.test.ext.junit.runners.AndroidJUnit4
18-
import com.optimizely.ab.android.shared.ClientForODPOnly
18+
import com.optimizely.ab.android.shared.Client
1919
import java.io.OutputStream
2020
import java.net.HttpURLConnection
2121
import org.junit.Assert.assertNull
@@ -34,9 +34,9 @@ import org.slf4j.Logger
3434
@RunWith(AndroidJUnit4::class)
3535
class ODPSegmentClientTest {
3636
private val logger = mock(Logger::class.java)
37-
private val client = mock(ClientForODPOnly::class.java)
37+
private val client = mock(Client::class.java)
3838
private val urlConnection = mock(HttpURLConnection::class.java)
39-
private val captor = ArgumentCaptor.forClass(ClientForODPOnly.Request::class.java)
39+
private val captor = ArgumentCaptor.forClass(Client.Request::class.java)
4040
private lateinit var segmentClient: ODPSegmentClient
4141

4242
private val apiKey = "valid-key"
@@ -68,45 +68,45 @@ class ODPSegmentClientTest {
6868
verify(urlConnection).disconnect()
6969
}
7070

71-
// @Test
72-
// fun fetchQualifiedSegments_400() {
73-
// `when`(urlConnection.responseCode).thenReturn(400)
74-
//
75-
// segmentClient.fetchQualifiedSegments(apiKey, apiEndpoint, payload)
76-
//
77-
// verify(client).execute(captor.capture(), eq(0), eq(0))
78-
// val received = captor.value.execute()
79-
//
80-
// assertNull(received)
81-
// verify(logger).error("Unexpected response from ODP segment endpoint, status: 400")
82-
// verify(urlConnection).disconnect()
83-
// }
84-
85-
// @Test
86-
// fun fetchQualifiedSegments_500() {
87-
// `when`(urlConnection.responseCode).thenReturn(500)
88-
//
89-
// segmentClient.fetchQualifiedSegments(apiKey, apiEndpoint, payload)
90-
//
91-
// verify(client).execute(captor.capture(), eq(0), eq(0))
92-
// val received = captor.value.execute()
93-
//
94-
// assertNull(received)
95-
// verify(logger).error("Unexpected response from ODP segment endpoint, status: 500")
96-
// verify(urlConnection).disconnect()
97-
// }
98-
99-
// @Test
100-
// fun fetchQualifiedSegments_connectionFailed() {
101-
// `when`(urlConnection.responseCode).thenReturn(200)
102-
//
103-
// apiEndpoint = "invalid-url"
104-
// segmentClient.fetchQualifiedSegments(apiKey, apiEndpoint, payload)
105-
//
106-
// verify(client).execute(captor.capture(), eq(0), eq(0))
107-
// val received = captor.value.execute()
108-
//
109-
// assertNull(received)
110-
// verify(logger).error(contains("Error making ODP segment request"), any())
111-
// }
71+
@Test
72+
fun fetchQualifiedSegments_400() {
73+
`when`(urlConnection.responseCode).thenReturn(400)
74+
75+
segmentClient.fetchQualifiedSegments(apiKey, apiEndpoint, payload)
76+
77+
verify(client).execute(captor.capture(), eq(0), eq(0))
78+
val received = captor.value.execute()
79+
80+
assertNull(received)
81+
verify(logger).error("Unexpected response from ODP segment endpoint, status: 400")
82+
verify(urlConnection).disconnect()
83+
}
84+
85+
@Test
86+
fun fetchQualifiedSegments_500() {
87+
`when`(urlConnection.responseCode).thenReturn(500)
88+
89+
segmentClient.fetchQualifiedSegments(apiKey, apiEndpoint, payload)
90+
91+
verify(client).execute(captor.capture(), eq(0), eq(0))
92+
val received = captor.value.execute()
93+
94+
assertNull(received)
95+
verify(logger).error("Unexpected response from ODP segment endpoint, status: 500")
96+
verify(urlConnection).disconnect()
97+
}
98+
99+
@Test
100+
fun fetchQualifiedSegments_connectionFailed() {
101+
`when`(urlConnection.responseCode).thenReturn(200)
102+
103+
apiEndpoint = "invalid-url"
104+
segmentClient.fetchQualifiedSegments(apiKey, apiEndpoint, payload)
105+
106+
verify(client).execute(captor.capture(), eq(0), eq(0))
107+
val received = captor.value.execute()
108+
109+
assertNull(received)
110+
verify(logger).error(contains("Error making ODP segment request"), any())
111+
}
112112
}

‎odp/src/main/java/com/optimizely/ab/android/odp/DefaultODPApiManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package com.optimizely.ab.android.odp
1616

1717
import android.content.Context
1818
import androidx.annotation.VisibleForTesting
19-
import com.optimizely.ab.android.shared.ClientForODPOnly
19+
import com.optimizely.ab.android.shared.Client
2020
import com.optimizely.ab.android.shared.OptlyStorage
2121
import com.optimizely.ab.android.shared.WorkerScheduler
2222
import com.optimizely.ab.odp.ODPApiManager
@@ -33,7 +33,7 @@ open class DefaultODPApiManager(private val context: Context, timeoutForSegmentF
3333

3434
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
3535
var segmentClient = ODPSegmentClient(
36-
ClientForODPOnly(OptlyStorage(context), LoggerFactory.getLogger(ClientForODPOnly::class.java)),
36+
Client(OptlyStorage(context), LoggerFactory.getLogger(Client::class.java)),
3737
LoggerFactory.getLogger(ODPSegmentClient::class.java)
3838
)
3939
private val logger = LoggerFactory.getLogger(DefaultODPApiManager::class.java)

‎odp/src/main/java/com/optimizely/ab/android/odp/ODPSegmentClient.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
package com.optimizely.ab.android.odp
1616

1717
import androidx.annotation.VisibleForTesting
18-
import com.optimizely.ab.android.shared.ClientForODPOnly
18+
import com.optimizely.ab.android.shared.Client
1919
import com.optimizely.ab.odp.parser.ResponseJsonParser
2020
import com.optimizely.ab.odp.parser.ResponseJsonParserFactory
2121
import org.slf4j.Logger
2222
import java.net.HttpURLConnection
2323
import java.net.URL
2424

2525
@VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
26-
open class ODPSegmentClient(private val client: ClientForODPOnly, private val logger: Logger) {
26+
open class ODPSegmentClient(private val client: Client, private val logger: Logger) {
2727

2828
@VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
2929
open fun fetchQualifiedSegments(
@@ -32,7 +32,7 @@ open class ODPSegmentClient(private val client: ClientForODPOnly, private val lo
3232
payload: String
3333
): List<String>? {
3434

35-
val request: ClientForODPOnly.Request<String> = ClientForODPOnly.Request {
35+
val request: Client.Request<String> = Client.Request {
3636
var urlConnection: HttpURLConnection? = null
3737
try {
3838
val url = URL(apiEndpoint)
@@ -62,13 +62,11 @@ open class ODPSegmentClient(private val client: ClientForODPOnly, private val lo
6262
} else {
6363
var errMsg = "Unexpected response from ODP segment endpoint, status: $status"
6464
logger.error(errMsg)
65-
// return@Request null
66-
throw Exception(errMsg)
65+
return@Request null
6766
}
6867
} catch (e: Exception) {
6968
logger.error("Error making ODP segment request", e)
70-
// return@Request null
71-
throw e
69+
return@Request null
7270
} finally {
7371
if (urlConnection != null) {
7472
try {

‎shared/src/main/java/com/optimizely/ab/android/shared/ClientForODPOnly.java

Lines changed: 0 additions & 189 deletions
This file was deleted.

0 commit comments

Comments
 (0)