Skip to content

TEDEFO-4933 Simplify SdkVersion prefix handling and normalizeVersion #46

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

Merged
bertrand-lorentz merged 1 commit into from
Feb 26, 2026
+11 −14
Merged

TEDEFO-4933 Simplify SdkVersion prefix handling and normalizeVersion #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/main/java/eu/europa/ted/eforms/sdk/SdkVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ public class SdkVersion implements Comparable<SdkVersion> {

private final Semver version;

private static final String SDK_PREFIX = "eforms-sdk-";

public SdkVersion(final String version) {
Validate.notBlank(version, "Undefined version");

String normalized = version.startsWith(SDK_PREFIX) ? version.substring(SDK_PREFIX.length()) : version;

// LOOSE because we need to accept MAJOR.MINOR
this.version = new Semver(version, SemverType.LOOSE);
this.version = new Semver(normalized, SemverType.LOOSE);

// Check that we did get a MINOR part
Validate.notNull(this.version.getMinor());
Expand Down
19 changes: 6 additions & 13 deletions src/main/java/eu/europa/ted/eforms/sdk/component/SdkComponentFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
import eu.europa.ted.eforms.sdk.SdkVersion;
import org.reflections.Reflections;
import org.reflections.util.ClasspathHelper;
import org.reflections.util.ConfigurationBuilder;
Expand Down Expand Up @@ -174,19 +175,11 @@ protected <T> T getComponentImpl(String sdkVersion, final SdkComponentType compo
}

private static String normalizeVersion(final String sdkVersion) {
String normalizedVersion = sdkVersion;

if (normalizedVersion.startsWith("eforms-sdk-")) {
normalizedVersion = normalizedVersion.substring(11);
SdkVersion version = new SdkVersion(sdkVersion);
int major = Integer.parseInt(version.getMajor());
if (major > 0) {
return version.getMajor();
}

String[] numbers = normalizedVersion.split("\\.", -2);

if (numbers.length < 1) {
throw new IllegalArgumentException("Invalid SDK version: " + sdkVersion);
}

return numbers[0]
+ ((numbers.length > 1 && Integer.parseInt(numbers[0]) > 0) ? "" : "." + numbers[1]);
return version.getMajor() + "." + version.getMinor();
}
}