Merge pull request #463 from NetoDevel/main

Fixs some code smells
quarkusio · May 5, 2021 · 5f8c449 · 5f8c449
2 parents 4ffa7f1 + 1f1d3e0
commit 5f8c449
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/main/kotlin/io/quarkus/code/rest/CodeQuarkusResource.kt b/src/main/kotlin/io/quarkus/code/rest/CodeQuarkusResource.kt
@@ -102,7 +102,7 @@ class CodeQuarkusResource {
     @Produces(APPLICATION_JSON)
     @Operation(summary = "Prepare a Quarkus application project to be downloaded")
     fun project(@Valid projectDefinition: ProjectDefinition?): CreatedProject {
-        val params = ArrayList<NameValuePair>();
+        val params = ArrayList<NameValuePair>()
         if (projectDefinition != null) {
             if(projectDefinition.groupId != ProjectDefinition.DEFAULT_GROUPID) {
                 params.add(BasicNameValuePair("g", projectDefinition.groupId))
@@ -119,7 +119,7 @@ class CodeQuarkusResource {
             if(projectDefinition.noExamples != ProjectDefinition.DEFAULT_NO_EXAMPLES) {
                 params.add(BasicNameValuePair("ne", projectDefinition.noExamples.toString()))
             }
-            if(!projectDefinition.extensions.isEmpty()) {
+            if(projectDefinition.extensions.isNotEmpty()) {
                 projectDefinition.extensions.forEach { params.add(BasicNameValuePair("e", it)) }
             }
         }

diff --git a/src/main/kotlin/io/quarkus/code/service/QuarkusExtensionCatalogService.kt b/src/main/kotlin/io/quarkus/code/service/QuarkusExtensionCatalogService.kt
@@ -26,16 +26,16 @@ class QuarkusExtensionCatalogService {
         private val LOG = Logger.getLogger(QuarkusExtensionCatalogService::class.java.name)
 
         @JvmStatic
-        internal val platformGroupId = ConfigProviderResolver.instance().getConfig().getOptionalValue("io.quarkus.code.quarkus-platform.group-id", String::class.java).orElse("io.quarkus")
+        internal val platformGroupId = ConfigProviderResolver.instance().config.getOptionalValue("io.quarkus.code.quarkus-platform.group-id", String::class.java).orElse("io.quarkus")
 
         @JvmStatic
-        internal val platformArtifactId = ConfigProviderResolver.instance().getConfig().getOptionalValue("io.quarkus.code.quarkus-platform.artifact-id", String::class.java).orElse("quarkus-universe-bom")
+        internal val platformArtifactId = ConfigProviderResolver.instance().config.getOptionalValue("io.quarkus.code.quarkus-platform.artifact-id", String::class.java).orElse("quarkus-universe-bom")
 
         @JvmStatic
-        internal val platformVersion = ConfigProviderResolver.instance().getConfig().getValue("io.quarkus.code.quarkus-platform.version", String::class.java)
+        internal val platformVersion = ConfigProviderResolver.instance().config.getValue("io.quarkus.code.quarkus-platform.version", String::class.java)
 
         @JvmStatic
-        internal val bundledQuarkusVersion = ConfigProviderResolver.instance().getConfig().getValue("io.quarkus.code.quarkus-version", String::class.java)
+        internal val bundledQuarkusVersion = ConfigProviderResolver.instance().config.getValue("io.quarkus.code.quarkus-version", String::class.java)
 
         @JvmStatic
         internal val catalog = ToolsUtils.resolvePlatformDescriptorDirectly(platformGroupId, platformArtifactId, platformVersion, QuarkusProjectHelper.artifactResolver(), QuarkusProjectHelper.messageWriter())
@@ -49,9 +49,6 @@ class QuarkusExtensionCatalogService {
     @Inject
     lateinit var config: CodeQuarkusConfig
 
-    @Inject
-    lateinit var platformConfig: QuarkusPlatformConfig
-
     @Inject
     lateinit var extensionProcessorConfig: ExtensionProcessorConfig
 
@@ -75,7 +72,7 @@ class QuarkusExtensionCatalogService {
     fun checkAndMergeExtensions(extensionsIds: Set<String>?, rawShortExtensions: String?): Set<String> {
         val fromId = (extensionsIds ?: setOf())
                 .stream()
-                .filter { !it.isBlank() }
+                .filter { it.isNotBlank() }
                 .map { findById(it) }
                 .collect(Collectors.toSet())
         val fromShortId = parseShortExtensions(rawShortExtensions).stream()
@@ -100,7 +97,7 @@ class QuarkusExtensionCatalogService {
         return if (shortExtension.isNullOrBlank()) {
             setOf()
         } else {
-            shortExtension.split(".").filter { !it.isBlank() }.toSet()
+            shortExtension.split(".").filter { it.isNotBlank() }.toSet()
         }
     }