Skip to content

Complete UI validation logic decomposition into smaller units #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
geziefer wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Complete UI validation logic decomposition into smaller units #364

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bcf75a
change build runner to ubuntu-latest for ui
geziefer Apr 23, 2025
42c185d
Merge branch 'master' of https://github.com/geziefer/starter
geziefer Jul 11, 2025
5c742b4
Complete implementation at TODO: move large block to smaller validati…
geziefer Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
238 changes: 112 additions & 126 deletions ui/src/main/java/org/eclipse/starter/ui/Project.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,51 +193,128 @@ public void onJakartaVersionChange() {
runtime});

clearForm(false);
updateAllValidationStates();
}

// TODO Gradually move to this simplified validation logic.
private void updateAllValidationStates() {
updateDockerEnabledState();
updateGlassFishEnabledState();
updateProfilesForJakartaVersion();
updateJavaVersionsForJakartaVersion();
updateRuntimesForJakartaVersion();
}

private void updateProfilesForJakartaVersion() {
// Reset all profiles to enabled first
profiles.get("full").setDisabled(false);
profiles.get("web").setDisabled(false);
profiles.get("core").setDisabled(true);
profiles.get("core").setDisabled(false);

if (jakartaVersion == 11) {
// Jakarta EE 11: Only Core Profile is available
profiles.get("full").setDisabled(true);
profiles.get("web").setDisabled(true);
} else if (jakartaVersion == 10) {
// Jakarta EE 10: Core Profile availability depends on runtime
if (runtime.equals("glassfish") || runtime.equals("tomee")) {
profiles.get("core").setDisabled(true);
}
} else {
// Jakarta EE 8, 9, 9.1: Core Profile disabled by default
profiles.get("core").setDisabled(true);
}

// Java version constraints for profiles
if (javaVersion == 8) {
profiles.get("core").setDisabled(true);
}

// Runtime-specific profile constraints
switch (runtime) {
case "glassfish":
profiles.get("core").setDisabled(true);
break;
case "tomee":
profiles.get("core").setDisabled(true);
profiles.get("full").setDisabled(true);
break;
}
}

javaVersions.get("8").setDisabled(true);
private void updateJavaVersionsForJakartaVersion() {
// Reset all Java versions to enabled first
javaVersions.get("8").setDisabled(false);
javaVersions.get("11").setDisabled(false);
javaVersions.get("17").setDisabled(false);
javaVersions.get("21").setDisabled(false);

if (jakartaVersion == 11) {
// Jakarta EE 11: Java 8 and 11 not supported
javaVersions.get("8").setDisabled(true);
javaVersions.get("11").setDisabled(true);
} else if (jakartaVersion == 10) {
// Jakarta EE 10: Java 8 disabled
javaVersions.get("8").setDisabled(true);
} else if (jakartaVersion >= 9) {
// Jakarta EE 9+: Java 8 disabled unless specific conditions met
javaVersions.get("8").setDisabled(true);
if (jakartaVersion == 8 ||
runtime.equals("none") ||
runtime.equals("glassfish") ||
runtime.equals("open-liberty")) {
javaVersions.get("8").setDisabled(false);
}
}

// Runtime-specific profile constraints
switch (runtime) {
case "glassfish":
if (jakartaVersion == 8) {
javaVersions.get("11").setDisabled(true);
javaVersions.get("17").setDisabled(true);
javaVersions.get("21").setDisabled(true);
}
break;
case "tomee":
if (jakartaVersion != 8) {
javaVersions.get("8").setDisabled(true);
}
break;
}
}

private void updateRuntimesForJakartaVersion() {
// Reset runtimes to default state
runtimes.get("payara").setDisabled(false);
runtimes.get("tomee").setDisabled(true);
runtimes.get("tomee").setDisabled(false);
runtimes.get("wildfly").setDisabled(false);

if (jakartaVersion == 11) {
profiles.get("full").setDisabled(true);
profiles.get("web").setDisabled(true);
profiles.get("core").setDisabled(false);

javaVersions.get("11").setDisabled(true);

// Jakarta EE 11: Most runtimes not supported
runtimes.get("payara").setDisabled(true);
runtimes.get("wildfly").setDisabled(true);
} else if (jakartaVersion == 10) {
if (!runtime.equals("glassfish") && !runtime.equals("tomee")) {
profiles.get("core").setDisabled(false);
runtimes.get("tomee").setDisabled(true);
} else if (jakartaVersion == 9 || jakartaVersion == 9.1) {
// Jakarta EE 9/9.1: Payara and WildFly not supported
runtimes.get("payara").setDisabled(true);
runtimes.get("wildfly").setDisabled(true);

// TomEE enabled for Web Profile under specific conditions
if (profile.equals("web") &&
(jakartaVersion == 8 ||
(jakartaVersion == 9.1 && javaVersion != 8))) {
runtimes.get("tomee").setDisabled(false);
} else {
runtimes.get("tomee").setDisabled(true);
}
} else {
if ((jakartaVersion == 8) || runtime.equals("none")
|| runtime.equals("glassfish")
|| runtime.equals("open-liberty")) {
javaVersions.get("8").setDisabled(false);
}

if ((jakartaVersion == 9) || (jakartaVersion == 9.1)) {
runtimes.get("payara").setDisabled(true);
runtimes.get("wildfly").setDisabled(true);
}

if (profile.equals("web") && ((jakartaVersion == 8)
|| ((jakartaVersion == 9.1) && (javaVersion != 8)))) {
// Jakarta EE 8 and 10: TomEE enabled for Web Profile under specific conditions
if (profile.equals("web") &&
(jakartaVersion == 8 ||
(jakartaVersion == 9.1 && javaVersion != 8))) {
runtimes.get("tomee").setDisabled(false);
} else {
runtimes.get("tomee").setDisabled(true);
}
}
}
Expand All @@ -248,20 +325,7 @@ public void onProfileChange() {
new Object[]{jakartaVersion, profile, javaVersion, docker,
runtime});

// TODO Gradually move to this simplified validation logic.
updateDockerEnabledState();
updateGlassFishEnabledState();

if ((jakartaVersion == 8)
|| ((jakartaVersion == 9.1) && (javaVersion != 8))) {
runtimes.get("tomee").setDisabled(false);
}

if (profile.equals("core")) {
runtimes.get("tomee").setDisabled(true);
} else if (profile.equals("full")) {
runtimes.get("tomee").setDisabled(true);
}
updateAllValidationStates();
}

public void onJavaVersionChange() {
Expand All @@ -270,39 +334,7 @@ public void onJavaVersionChange() {
new Object[]{jakartaVersion, profile, javaVersion, docker,
runtime});

// TODO Gradually move to this simplified validation logic.
updateDockerEnabledState();
updateGlassFishEnabledState();

if ((jakartaVersion > 9.1) && !runtime.equals("tomee")
&& !runtime.equals("glassfish")) {
profiles.get("core").setDisabled(false);
}

runtimes.get("tomee").setDisabled(true);

if ((jakartaVersion != 9) && (jakartaVersion != 9.1)
&& (jakartaVersion != 11)) {
runtimes.get("payara").setDisabled(false);
runtimes.get("wildfly").setDisabled(false);
}

if (javaVersion == 8) {
profiles.get("core").setDisabled(true);

if (profile.equals("web") && (jakartaVersion == 8)) {
runtimes.get("tomee").setDisabled(false);
}

if (jakartaVersion != 8) {
runtimes.get("payara").setDisabled(true);
runtimes.get("wildfly").setDisabled(true);
}
}
if (profile.equals("web")
&& ((jakartaVersion == 8) || (jakartaVersion == 9.1))) {
runtimes.get("tomee").setDisabled(false);
}
updateAllValidationStates();
}

public void onDockerChange() {
Expand All @@ -311,9 +343,11 @@ public void onDockerChange() {
new Object[]{jakartaVersion, profile, javaVersion, docker,
runtime});

// TODO Gradually move to this simplified validation logic.
updateGlassFishEnabledState();
updateAllValidationStates();
updateNoneRuntimeForDocker();
}

private void updateNoneRuntimeForDocker() {
if (docker) {
runtimes.get("none").setDisabled(true);
} else {
Expand All @@ -326,57 +360,9 @@ public void onRuntimeChange() {
"Validating form for Jakarta EE version: {0}, Jakarta EE profile: {1}, Java SE version: {2}, Docker: {3}, runtime: {4}",
new Object[]{jakartaVersion, profile, javaVersion, docker,
runtime});
// TODO Gradually move to this simplified validation logic.
updateDockerEnabledState();

if (jakartaVersion > 9.1) {
profiles.get("core").setDisabled(false);
}

if (jakartaVersion != 11) {
profiles.get("full").setDisabled(false);
}

if (jakartaVersion < 10) {
javaVersions.get("8").setDisabled(false);
}

if (jakartaVersion < 11) {
javaVersions.get("11").setDisabled(false);
}

javaVersions.get("17").setDisabled(false);
javaVersions.get("21").setDisabled(false);

switch (runtime) {
case "none":
break;
case "glassfish":
profiles.get("core").setDisabled(true);

if (jakartaVersion == 8) {
javaVersions.get("11").setDisabled(true);
javaVersions.get("17").setDisabled(true);
javaVersions.get("21").setDisabled(true);
}

break;
case "open-liberty":
break;
case "payara":
break;
case "tomee":
profiles.get("core").setDisabled(true);
profiles.get("full").setDisabled(true);

if (jakartaVersion != 8) {
javaVersions.get("8").setDisabled(true);
}

break;
case "wildfly":
break;
}

updateAllValidationStates();
updateNoneRuntimeForDocker();
}

private void updateDockerEnabledState() {
Expand Down