Skip to content

Fix full SEMVER support #42

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
goneall merged 1 commit into from
Aug 8, 2026
+1,669 −1,917
Merged

Fix full SEMVER support #42

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
2 changes: 1 addition & 1 deletion resources/javaTemplates/ModelInfoTemplate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.spdx.storage.IModelStore;
* GENERATED
*
*/
public class SpdxModelInfo{{{versionSuffix}}} implements ISpdxModelInfo {
public class SpdxModelInfo{{{classSuffix}}} implements ISpdxModelInfo {

@Override
public Map<String, Enum<?>> getUriToEnumMap() {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/spdx/tools/model2java/ShaclToJava.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,11 +521,13 @@ private void generateSpdxModelInfo(File dir) throws IOException {
Path path = dir.toPath().resolve("src").resolve("main").resolve("java").resolve("org")
.resolve("spdx").resolve("library").resolve("model").resolve(versionSuffix);
Files.createDirectories(path);
File file = path.resolve(String.format("SpdxModelInfo%s.java", versionSuffix)).toFile();
String classSuffix = "3.0.1".equals(versionSemVer) ? "V3_0" : "V3";// for backwards compatibility
File file = path.resolve(String.format("SpdxModelInfo%s.java", classSuffix)).toFile();
file.createNewFile();
Map<String, Object> mustacheMap = new HashMap<>();
mustacheMap.put("versionSuffix", versionSuffix);
mustacheMap.put("versionSemVer", versionSemVer);
mustacheMap.put("classSuffix", classSuffix);
writeMustacheFile(ShaclToJavaConstants.MODEL_INFO_TEMPLATE, file, mustacheMap);
}

Expand Down Expand Up @@ -1210,7 +1212,6 @@ private String fillMustachMapsForClass(String classUri, String name,
requiredImports.add("import org.spdx.library.model."+versionSuffix+".core.Agent.AgentBuilder;");
requiredImports.add("import java.util.Arrays;");
requiredImports.add("import org.spdx.core.ModelRegistry;");
requiredImports.add("import org.spdx.library.model."+versionSuffix+".SpdxModelInfo"+versionSuffix+";");
requiredImports.add("import org.spdx.library.model."+versionSuffix+".TestValuesGenerator;");
imports = buildImports(new ArrayList<String>(requiredImports));
unitTestMap.put("imports", imports.toArray(new String[imports.size()]));
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/spdx/tools/model2java/ShaclToJavaCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@ private static String getSpecVersion(OntModel model) {
//TODO: end of hack
String versionSemVer = spdxUri.substring("https://spdx.org/rdf/".length());
versionSemVer = versionSemVer.substring(0, versionSemVer.indexOf('/'));
String[] versionParts = versionSemVer.split("\\.");
if (versionParts.length == 1) {
versionSemVer = versionSemVer + ".0.0";
} else if (versionParts.length == 2) {
versionSemVer = versionSemVer + ".0";
}
return versionSemVer;
}

Expand Down
Loading
Loading