Skip to content

Commit 5f8c449

Browse files
authored
Merge pull request #463 from NetoDevel/main
Fixs some code smells
2 parents 4ffa7f1 + 1f1d3e0 commit 5f8c449

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

src/main/kotlin/io/quarkus/code/rest/CodeQuarkusResource.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class CodeQuarkusResource {
102102
@Produces(APPLICATION_JSON)
103103
@Operation(summary = "Prepare a Quarkus application project to be downloaded")
104104
fun project(@Valid projectDefinition: ProjectDefinition?): CreatedProject {
105-
val params = ArrayList<NameValuePair>();
105+
val params = ArrayList<NameValuePair>()
106106
if (projectDefinition != null) {
107107
if(projectDefinition.groupId != ProjectDefinition.DEFAULT_GROUPID) {
108108
params.add(BasicNameValuePair("g", projectDefinition.groupId))
@@ -119,7 +119,7 @@ class CodeQuarkusResource {
119119
if(projectDefinition.noExamples != ProjectDefinition.DEFAULT_NO_EXAMPLES) {
120120
params.add(BasicNameValuePair("ne", projectDefinition.noExamples.toString()))
121121
}
122-
if(!projectDefinition.extensions.isEmpty()) {
122+
if(projectDefinition.extensions.isNotEmpty()) {
123123
projectDefinition.extensions.forEach { params.add(BasicNameValuePair("e", it)) }
124124
}
125125
}

src/main/kotlin/io/quarkus/code/service/QuarkusExtensionCatalogService.kt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ class QuarkusExtensionCatalogService {
2626
private val LOG = Logger.getLogger(QuarkusExtensionCatalogService::class.java.name)
2727

2828
@JvmStatic
29-
internal val platformGroupId = ConfigProviderResolver.instance().getConfig().getOptionalValue("io.quarkus.code.quarkus-platform.group-id", String::class.java).orElse("io.quarkus")
29+
internal val platformGroupId = ConfigProviderResolver.instance().config.getOptionalValue("io.quarkus.code.quarkus-platform.group-id", String::class.java).orElse("io.quarkus")
3030

3131
@JvmStatic
32-
internal val platformArtifactId = ConfigProviderResolver.instance().getConfig().getOptionalValue("io.quarkus.code.quarkus-platform.artifact-id", String::class.java).orElse("quarkus-universe-bom")
32+
internal val platformArtifactId = ConfigProviderResolver.instance().config.getOptionalValue("io.quarkus.code.quarkus-platform.artifact-id", String::class.java).orElse("quarkus-universe-bom")
3333

3434
@JvmStatic
35-
internal val platformVersion = ConfigProviderResolver.instance().getConfig().getValue("io.quarkus.code.quarkus-platform.version", String::class.java)
35+
internal val platformVersion = ConfigProviderResolver.instance().config.getValue("io.quarkus.code.quarkus-platform.version", String::class.java)
3636

3737
@JvmStatic
38-
internal val bundledQuarkusVersion = ConfigProviderResolver.instance().getConfig().getValue("io.quarkus.code.quarkus-version", String::class.java)
38+
internal val bundledQuarkusVersion = ConfigProviderResolver.instance().config.getValue("io.quarkus.code.quarkus-version", String::class.java)
3939

4040
@JvmStatic
4141
internal val catalog = ToolsUtils.resolvePlatformDescriptorDirectly(platformGroupId, platformArtifactId, platformVersion, QuarkusProjectHelper.artifactResolver(), QuarkusProjectHelper.messageWriter())
@@ -49,9 +49,6 @@ class QuarkusExtensionCatalogService {
4949
@Inject
5050
lateinit var config: CodeQuarkusConfig
5151

52-
@Inject
53-
lateinit var platformConfig: QuarkusPlatformConfig
54-
5552
@Inject
5653
lateinit var extensionProcessorConfig: ExtensionProcessorConfig
5754

@@ -75,7 +72,7 @@ class QuarkusExtensionCatalogService {
7572
fun checkAndMergeExtensions(extensionsIds: Set<String>?, rawShortExtensions: String?): Set<String> {
7673
val fromId = (extensionsIds ?: setOf())
7774
.stream()
78-
.filter { !it.isBlank() }
75+
.filter { it.isNotBlank() }
7976
.map { findById(it) }
8077
.collect(Collectors.toSet())
8178
val fromShortId = parseShortExtensions(rawShortExtensions).stream()
@@ -100,7 +97,7 @@ class QuarkusExtensionCatalogService {
10097
return if (shortExtension.isNullOrBlank()) {
10198
setOf()
10299
} else {
103-
shortExtension.split(".").filter { !it.isBlank() }.toSet()
100+
shortExtension.split(".").filter { it.isNotBlank() }.toSet()
104101
}
105102
}
106103

0 commit comments

Comments
 (0)