refactor: fix deprecated code

Author: paul58914080

github-crawler-core/src/main/kotlin/com/societegenerale/githubcrawler/FileToParse.kt

@@ -2,27 +2,26 @@ package com.societegenerale.githubcrawler
 
 import org.springframework.core.convert.ConversionService
 import org.springframework.core.convert.TypeDescriptor
-import org.springframework.lang.Nullable
 
 
 data class FileToParse(val name: String,
                        val redirectTo: String?)
 
 class FileToParseConversionService : ConversionService {
 
-    override fun canConvert(@Nullable aClass: Class<*>?, aClass1: Class<*>): Boolean {
+    override fun canConvert(aClass: Class<*>?, aClass1: Class<*>): Boolean {
         return false
     }
 
-    override fun canConvert(@Nullable sourcetype: TypeDescriptor?, targetType: TypeDescriptor): Boolean {
+    override fun canConvert(sourcetype: TypeDescriptor?, targetType: TypeDescriptor): Boolean {
         return targetType.name == FileToParse::class.java.name
     }
 
     override fun <T : Any> convert(source: Any?, targetType: Class<T>): T? {
         return null
     }
 
-    override fun convert(@Nullable value: Any?, @Nullable sourceType: TypeDescriptor?, targetType: TypeDescriptor): Any? {
+    override fun convert(value: Any?, sourceType: TypeDescriptor?, targetType: TypeDescriptor): Any? {
 
         return if (targetType.name == FileToParse::class.java.name) {
             FileToParse(value as String, null)

github-crawler-core/src/main/kotlin/com/societegenerale/githubcrawler/remote/RemoteAzureDevopsImpl.kt

@@ -146,7 +146,7 @@ class RemoteAzureDevopsImpl @JvmOverloads constructor(private val azureDevopsUrl
 
         val responseBody= httpClient.newCall(request).execute().body
 
-        val repoSearchResult = objectMapper.readValue(responseBody?.string(), CodeSearchResult::class.java)
+        val repoSearchResult = objectMapper.readValue(responseBody.string(), CodeSearchResult::class.java)
 
         return repoSearchResult.toStandardSearchResult()
 
@@ -164,7 +164,7 @@ class RemoteAzureDevopsImpl @JvmOverloads constructor(private val azureDevopsUrl
         val response=httpClient.newCall(request).execute()
 
         if(response.isSuccessful){
-            return response.body?.string() ?: ""
+            return response.body.string()
         }
         else{
             throw NoFileFoundException("can't find $fileToFetch in repo $repositoryFullName, in branch $branchName")
@@ -245,7 +245,7 @@ internal class AzureDevopsResponseDecoder {
         }
 
         val writer = StringWriter()
-        IOUtils.copy(response.body?.byteStream(), writer, "UTF-8")
+        IOUtils.copy(response.body.byteStream(), writer, "UTF-8")
         val responseAsString = writer.toString()
 
         return parseRepositoryConfigResponse(responseAsString, response)

github-crawler-core/src/main/kotlin/com/societegenerale/githubcrawler/remote/RemoteBitBucketImpl.kt

@@ -45,7 +45,7 @@ class RemoteBitBucketImpl @JvmOverloads constructor(
         .client(ApacheHttpClient())
         .encoder(GsonEncoder())
         .decoder(BitBucketResponseDecoder())
-        .decode404()
+        .dismiss404()
         .requestInterceptor(BitBucketOauthTokenSetter(apiKey))
         .logger(Slf4jLogger(RemoteBitBucketImpl::class.java))
         .logLevel(Logger.Level.FULL)

github-crawler-core/src/main/kotlin/com/societegenerale/githubcrawler/remote/RemoteGitHubImpl.kt

@@ -56,7 +56,7 @@ class RemoteGitHubImpl @JvmOverloads constructor(
         .encoder(GsonEncoder())
         .decoder(GitHubResponseDecoder())
         .errorDecoder(GiHubErrorDecoder())
-        .decode404()
+        .dismiss404()
         .requestInterceptor(GitHubOauthTokenSetter(apiKey))
         .logger(Slf4jLogger(RemoteGitHubImpl::class.java))
         .logLevel(Logger.Level.FULL)
@@ -170,15 +170,7 @@ class RemoteGitHubImpl @JvmOverloads constructor(
     private fun extractRepositories(response: Response): Set<Repository> {
 
         try {
-
-            val body = response.body
-
-            if (body != null) {
-                return objectMapper.readValue(body.string())
-            } else {
-                log.warn("response is null : {}", response)
-                return emptySet()
-            }
+            return objectMapper.readValue(response.body.string())
         } catch (e: JacksonException) {
             throw NoReachableRepositories("not able to parse response", e)
         }
@@ -233,7 +225,7 @@ class RemoteGitHubImpl @JvmOverloads constructor(
 
         val response = httpClient.newCall(request).execute()
 
-        val responseAsString=response.body?.string()
+        val responseAsString=response.body.string()
         log.info("response : "+responseAsString)
 
         return try {
@@ -271,7 +263,7 @@ class RemoteGitHubImpl @JvmOverloads constructor(
         val response = httpClient.newCall(request).execute()
 
 
-        return response.body?.string() ?: ""
+        return response.body.string()
 
     }
 
@@ -393,7 +385,7 @@ internal class GitHubResponseDecoder : Decoder {
     fun decodeRepoConfig(response: Response): RepositoryConfig {
 
         val writer = StringWriter()
-        IOUtils.copy(response.body?.byteStream(), writer, "UTF-8")
+        IOUtils.copy(response.body.byteStream(), writer, "UTF-8")
         val responseAsString = writer.toString()
 
         return parseRepositoryConfigResponse(responseAsString, response)

github-crawler-core/src/main/kotlin/com/societegenerale/githubcrawler/remote/RemoteGitLabImpl.kt

@@ -53,7 +53,7 @@ class RemoteGitLabImpl constructor(
         .encoder(GsonEncoder())
         .decoder(GitLabResponseDecoder())
         .errorDecoder(GiLabErrorDecoder())
-        .decode404()
+        .dismiss404()
         .requestInterceptor(GitLabPrivateTokenSetter(privateToken))
         .logger(Slf4jLogger(RemoteGitLabImpl::class.java))
         .logLevel(Logger.Level.FULL)
@@ -102,7 +102,7 @@ class RemoteGitLabImpl constructor(
 
         val httpResponse=httpClient.newCall(request).execute()
 
-        val gitlabSearchResult : List<GitLabSearchResultItem> = objectMapper.readValue(httpResponse.body!!.string())
+        val gitlabSearchResult : List<GitLabSearchResultItem> = objectMapper.readValue(httpResponse.body.string())
 
         return SearchResult(gitlabSearchResult.size,gitlabSearchResult.map{ it -> it.toSearchResultItem()})
 
@@ -181,7 +181,7 @@ class RemoteGitLabImpl constructor(
             throw NoReachableRepositories("GET call to ${fetchFileUrl} wasn't successful. Code : ${response.code}, Message : ${response.message}")
         }
 
-        return response.body!!.string()
+        return response.body.string()
     }
 
     @Throws(NoReachableRepositories::class)

github-crawler-core/src/test/java/com/societegenerale/githubcrawler/output/HttpOutputTest.kt

@@ -37,6 +37,7 @@ class HttpOutputTest {
   inline fun <reified T : Any> argumentCaptor() = ArgumentCaptor.forClass(T::class.java)
 
   @Test
+  @Suppress("UNCHECKED_CAST")
   fun shouldLogResponseBodyWhenErrorDuringPost() {
     //Mock logging infra
     val root = LoggerFactory.getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME) as ch.qos.logback.classic.Logger

github-crawler-core/src/test/java/com/societegenerale/githubcrawler/repoTaskToPerform/PathsForHitsOnRepoSearchTest.kt

@@ -49,6 +49,7 @@ class PathsForHitsOnRepoSearchTest {
 
 
     @Test
+    @Suppress("UNCHECKED_CAST")
     fun shouldYield_NotFound_WhenNoMatch() {
 
         `when`(mockRemoteGithub.fetchCodeSearchResult(repoToSearch.fullName, "someSearch"))