Release: v1.0.0

#Every mock can be disable #fix HttpStatus code null exception
enciyo · Jun 24, 2021 · aca1703 · aca1703
1 parent 5dcc342
commit aca1703
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
 Added HTTP Methods, Status Code
 
+## v1.0.0
+Every mock can be disable
+fix HttpStatus code null exception
+
 ## v0.0.9
diff --git a/flipmock/build.gradle b/flipmock/build.gradle
@@ -14,7 +14,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
-        versionName "0.0.9"
+        versionName "1.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

diff --git a/flipmock/src/main/java/com/enciyo/flippermocknetworkplugin/Mapper.kt b/flipmock/src/main/java/com/enciyo/flippermocknetworkplugin/Mapper.kt
@@ -39,8 +39,9 @@ internal fun FlipperObject.mapMock() = Mock(
     dummyJsonData = map("dummyJsonData"),
     uniqueId = map("uniqueId"),
     queryParams = map("queryParams"),
-    httpCode = (map<String>("statusCode").toInt()),
-    requestType = MockRequestMethods.safeValueOf(map("httpMethod"))
+    httpCode = map("statusCode"),
+    requestType = MockRequestMethods.safeValueOf(map("httpMethod")),
+    isMockEnable = map("isMockEnable")
 )
 
 internal fun FlipperObject.mapConfig() = Config(
@@ -55,9 +56,14 @@ internal fun FlipperArray.mapMock(): List<Mock> {
 }
 
 inline fun <reified T> FlipperObject.map(param:String) : T{
-    val result = this[param]
+    val result = when(T::class.simpleName){
+        String::class.simpleName -> this.getString(param)
+        Int::class.simpleName -> this.getInt(param)
+        Boolean::class.simpleName -> this.getBoolean(param)
+        else-> throw NotSerializableException("$param expected ${T::class.simpleName} but return ${this[param]} ${this[param]::class.simpleName}")
+    }
     if (result as? T == null){
-        throw NotSerializableException("$param expected ${T::class.simpleName} but return $result")
+        throw NotSerializableException("$param expected ${T::class.simpleName} but return $result ${result::class.simpleName}")
     }
     return result
 }

diff --git a/flipmock/src/main/java/com/enciyo/flippermocknetworkplugin/interceptor/MockInterceptor.kt b/flipmock/src/main/java/com/enciyo/flippermocknetworkplugin/interceptor/MockInterceptor.kt
@@ -21,7 +21,7 @@ internal class MockInterceptor(private val management: MockManagement) : FlipMoc
         val isLoggable = management.config.isLoggable
         if (isMockEnable) {
             val existMock = management.findFirstOrNullMock(request.mapMock())
-            if (existMock != null) {
+            if (existMock != null && existMock.isMockEnable) {
                 if (isLoggable) log(existMock)
                 return existMock.mapResponseBody(request)
             }

diff --git a/flipmock/src/main/java/com/enciyo/flippermocknetworkplugin/model/Mock.kt b/flipmock/src/main/java/com/enciyo/flippermocknetworkplugin/model/Mock.kt
@@ -17,6 +17,7 @@ internal data class Mock @JvmOverloads constructor(
     val httpCode: Int = HttpURLConnection.HTTP_OK, // Feature
     val requestType: MockRequestMethods? = null, // Feature
     val contentTypes: MockContentTypes = MockContentTypes.JSON, // Feature
+    val isMockEnable: Boolean = true
 )
 
 internal fun Mock.isSameEndpoint(outMock: Mock) =
@@ -27,7 +28,6 @@ internal fun Mock.isSameMock(outMock: Mock) =
             (if (queryParams.isEmpty()) true else queryParams == outMock.queryParams) && isSameRequestType(outMock)
 
 
-
 internal fun Mock.isSameRequestType(outMock: Mock) =
     requestType == null ||
             outMock.requestType == requestType