Addressing code review comments

Author: LokeshDogga13

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcherTest.kt

@@ -6,7 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts
 import io.mockk.every
 import io.mockk.spyk
 import io.mockk.verify
-import org.junit.jupiter.api.Assertions.assertEquals
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import software.aws.toolkits.jetbrains.services.amazonq.project.manifest.ManifestManager
@@ -29,7 +29,7 @@ class ManifestFetcherTest {
         every { fetchLocalManifestMock["fetchManifestFromLocal"]() } returns null
         every { fetchLocalManifestMock["fetchManifestFromRemote"]() } returns null
 
-        assertEquals(fetchLocalManifestMock.fetch(), null)
+        assertThat(fetchLocalManifestMock.fetch()).isNull()
         verify { fetchLocalManifestMock["fetchManifestFromLocal"]() }
         verify { fetchLocalManifestMock["fetchManifestFromRemote"]() }
     }
@@ -41,7 +41,7 @@ class ManifestFetcherTest {
         every { fetchLocalManifestMock["fetchManifestFromLocal"]() } returns manifest
         every { fetchLocalManifestMock["fetchManifestFromRemote"]() } returns null
 
-        assertEquals(fetchLocalManifestMock.fetch(), manifest)
+        assertThat(fetchLocalManifestMock.fetch()).isNotNull().isEqualTo(manifest)
         verify { fetchLocalManifestMock["fetchManifestFromLocal"]() }
     }
 
@@ -52,7 +52,7 @@ class ManifestFetcherTest {
         every { fetchLocalManifestMock["fetchManifestFromLocal"]() } returns null
         every { fetchLocalManifestMock["fetchManifestFromRemote"]() } returns manifest
 
-        assertEquals(fetchLocalManifestMock.fetch(), manifest)
+        assertThat(fetchLocalManifestMock.fetch()).isNotNull().isEqualTo(manifest)
         verify { fetchLocalManifestMock["fetchManifestFromLocal"]() }
         verify { fetchLocalManifestMock["fetchManifestFromRemote"]() }
     }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/LspUtils.kt

@@ -7,9 +7,9 @@ import com.intellij.openapi.util.SystemInfo
 import java.nio.file.Path
 import java.nio.file.Paths
 
-fun getToolkitsCommonCachePath(): Path = when {
+fun getToolkitsCommonCacheRoot(): Path = when {
     SystemInfo.isWindows -> {
-        Paths.get(System.getenv("APPDATA"))
+        Paths.get(System.getenv("LOCALAPPDATA"))
     }
     SystemInfo.isMac -> {
         Paths.get(System.getProperty("user.home"), "Library", "Caches")

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt

@@ -18,7 +18,7 @@ class ManifestFetcher {
 
     private val lspManifestUrl = "https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json"
     private val manifestManager = ManifestManager()
-    private val lspManifestFilePath: Path = getToolkitsCommonCachePath().resolve("aws").resolve("toolkits").resolve("language-servers")
+    private val lspManifestFilePath: Path = getToolkitsCommonCacheRoot().resolve("aws").resolve("toolkits").resolve("language-servers")
         .resolve("lsp-manifest.json")
 
     companion object {
@@ -33,8 +33,7 @@ class ManifestFetcher {
         if (localManifest != null) {
             return localManifest
         }
-        val remoteManifest = fetchManifestFromRemote() ?: return null
-        return remoteManifest
+        return fetchManifestFromRemote()
     }
 
     private fun fetchManifestFromRemote(): ManifestManager.Manifest? {