Skip to content
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

Jump to bottom

Make class version logic more robust #66

Merged
merged 1 commit into from
Nov 10, 2022
Merged

Make class version logic more robust #66

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
15 changes: 13 additions & 2 deletions src/main/java/io/jenkins/lib/versionnumber/JavaSpecificationVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,29 @@ public int toReleaseVersion() {
*
* @param classVersion The class version; e.g., 52, 55, or 61.
* @return The {@link JavaSpecificationVersion}; e.g., 1.8, 11, or 17.
* @throws IllegalArgumentException If the Java specification version for the given class version is unknown.
*/
public static JavaSpecificationVersion fromClassVersion(int classVersion) {
return fromReleaseVersion(CLASS_TO_RELEASE.get(classVersion));
Integer releaseVersion = CLASS_TO_RELEASE.get(classVersion);
if (releaseVersion == null) {
throw new IllegalArgumentException("Unknown Java specification version for class version: " + classVersion);
}
return fromReleaseVersion(releaseVersion);
}

/**
* Get the corresponding class file version.
*
* @return The class file version; e.g., 52, 55, or 61.
* @throws IllegalArgumentException If the class version for the given Java Specification Version is unknown.
*/
public int toClassVersion() {
return RELEASE_TO_CLASS.get(toReleaseVersion());
int releaseVersion = toReleaseVersion();
Integer classVersion = RELEASE_TO_CLASS.get(releaseVersion);
if (classVersion == null) {
throw new IllegalArgumentException("Unknown class version for release version: " + releaseVersion);
}
return classVersion;
}

@NonNull
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/io/jenkins/lib/versionnumber/JavaSpecificationVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,14 @@ public void classVersion() {
assertEquals(new JavaSpecificationVersion("1.8"), JavaSpecificationVersion.fromClassVersion(52));
assertEquals(new JavaSpecificationVersion("11"), JavaSpecificationVersion.fromClassVersion(55));
assertEquals(new JavaSpecificationVersion("17"), JavaSpecificationVersion.fromClassVersion(61));
IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> JavaSpecificationVersion.fromClassVersion(1000));
assertEquals("Unknown Java specification version for class version: 1000", e.getMessage());

assertEquals(52, new JavaSpecificationVersion("1.8").toClassVersion());
assertEquals(55, new JavaSpecificationVersion("11").toClassVersion());
assertEquals(61, new JavaSpecificationVersion("17").toClassVersion());
e = assertThrows(IllegalArgumentException.class, () -> new JavaSpecificationVersion("1000").toClassVersion());
assertEquals("Unknown class version for release version: 1000", e.getMessage());
}

public void assertSpecEquals(JavaSpecificationVersion version, String value) {
Expand Down