Skip to content

Commit 2668ff0

Browse files
authored
Use start.v.c/helloworld for downloading starters (#41)
1 parent a8f4a2a commit 2668ff0

File tree

3 files changed

+11
-49
lines changed

3 files changed

+11
-49
lines changed

src/main/kotlin/com/vaadin/plugin/starter/StarterModel.kt

+3-21
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,14 @@ package com.vaadin.plugin.starter
33
import com.intellij.openapi.project.Project
44

55
class StarterModel(
6-
var framework: String, // vaadin version / hilla-lit / hilla-react
7-
var language: String, // 17 / kotlin
6+
var framework: String, // flow / hilla-react
7+
var language: String, // java / kotlin
88
var buildTool: String, // maven / gradle
99
var architecture: String // springboot / servlet / ...
1010
) : DownloadableModel {
1111

1212
override fun getDownloadLink(project: Project): String {
13-
var key: String
14-
if (framework.contains("hilla")) {
15-
key = framework
16-
if (buildTool == "gradle") {
17-
key += "-gradle"
18-
}
19-
return StarterSupport.downloadLinks[key]!!
20-
}
21-
22-
if (language == "kotlin") {
23-
key = "kotlin"
24-
} else if (buildTool == "gradle") {
25-
key = "gradle-$architecture"
26-
} else {
27-
key = architecture
28-
}
29-
30-
val link = StarterSupport.downloadLinks[key] ?: "#"
31-
return link.replace("<version>", framework)
13+
return "https://start.vaadin.com/helloworld?framework=$framework&language=$language&buildtool=$buildTool&stack=$architecture"
3214
}
3315

3416
override fun getProjectType(): String {

src/main/kotlin/com/vaadin/plugin/starter/StarterSupport.kt

+7-26
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ class StarterSupport {
55
companion object {
66

77
val frameworks = linkedMapOf(
8-
"24" to "Flow / Java",
8+
"flow" to "Flow / Java",
99
"hilla-react" to "Hilla / React"
1010
)
1111

1212
val languages = linkedMapOf(
13-
"17" to "Java",
13+
"java" to "Java",
1414
"kotlin" to "Kotlin"
1515
)
1616

@@ -26,44 +26,25 @@ class StarterSupport {
2626
"gradle" to "Gradle"
2727
)
2828

29-
val downloadLinks = mapOf(
30-
"hilla-react" to "https://github.com/vaadin/skeleton-starter-hilla-react/archive/master.zip",
31-
"hilla-react-gradle" to "https://github.com/vaadin/skeleton-starter-hilla-react-gradle/archive/master.zip",
32-
"kotlin" to "https://github.com/vaadin/skeleton-starter-kotlin-spring/archive/master.zip",
33-
"gradle-servlet" to "https://github.com/vaadin/base-starter-gradle/archive/v<version>.zip",
34-
"gradle-springboot" to "https://github.com/vaadin/base-starter-spring-gradle/archive/v<version>.zip",
35-
"springboot" to "https://github.com/vaadin/skeleton-starter-flow-spring/archive/v<version>.zip",
36-
"quarkus" to "https://github.com/vaadin/base-starter-flow-quarkus/archive/v<version>.zip",
37-
"jakartaee" to "https://github.com/vaadin/skeleton-starter-flow-cdi/archive/v<version>.zip",
38-
"servlet" to "https://github.com/vaadin/skeleton-starter-flow/archive/v<version>.zip",
39-
)
40-
4129
private val supportMatrix = arrayOf(
4230
StarterSupportMatrixElement(
43-
"24",
31+
"flow",
4432
languages.keys,
4533
setOf("springboot", "quarkus", "jakartaee", "servlet"),
46-
buildTools.keys,
47-
17
34+
buildTools.keys
4835
),
4936
StarterSupportMatrixElement(
5037
"hilla-react",
51-
setOf("17"),
38+
setOf("java"),
5239
setOf("springboot"),
53-
buildTools.keys,
54-
17
40+
buildTools.keys
5541
),
5642
)
5743

5844

5945
fun isSupportedFramework(model: StarterModel, framework: String): Boolean {
6046
val foundSupport = getSupport(framework) ?: return false
61-
return try {
62-
(Integer.parseInt(model.language) >= foundSupport.javaMinVersion
63-
&& foundSupport.architectures.contains(model.architecture))
64-
} catch (e: NumberFormatException) {
65-
true // kotlin
66-
}
47+
return foundSupport.architectures.contains(model.architecture)
6748
}
6849

6950
fun isSupportedLanguage(model: StarterModel, language: String): Boolean {

src/main/kotlin/com/vaadin/plugin/starter/StarterSupportMatrixElement.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ data class StarterSupportMatrixElement(
44
val framework: String,
55
val languages: Collection<String>,
66
val architectures: Collection<String>,
7-
val buildTools: Collection<String>,
8-
val javaMinVersion: Int
7+
val buildTools: Collection<String>
98
)

0 commit comments

Comments
 (0)