Skip to content

fix(java): java codegen versioned namespace #204

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

Closed
ospreyboi wants to merge 3 commits into from
+259 −235
Closed

fix(java): java codegen versioned namespace #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5db83b
fix: include version in Java codegen package and import names
ospreyboi Mar 8, 2026
27fa1e5
test: update Java codegen snapshots for versioned namespace
ospreyboi Mar 8, 2026
12b9fcf
chore: merge main into feature branch, update snapshots
mttrbrts Aug 4, 2026
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
14 changes: 8 additions & 6 deletions lib/codegen/fromcto/java/javavisitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ class JavaVisitor {
* @private
*/
startClassFile(clazz, parameters) {
const { name: namespace } = ModelUtil.parseNamespace(clazz.getNamespace());
const { name, version } = ModelUtil.parseNamespace(clazz.getNamespace());
const namespace = version ? `${name}@${version}` : name;
parameters.fileWriter.openFile( namespace.replace(/\./g, '/') + '/' + clazz.getName() + '.java');
parameters.fileWriter.writeLine(0, '// this code is generated and should not be modified');
parameters.fileWriter.writeLine(0, 'package ' + namespace + ';');
Expand Down Expand Up @@ -176,10 +177,10 @@ class JavaVisitor {

const importedTypes = new Set();
const writeImport = (namespace, typeName) => {
const { name: javaNamespace } = ModelUtil.parseNamespace(namespace);
const { name: classNamespace } = ModelUtil.parseNamespace(classDeclaration.getNamespace());
const imported = `${javaNamespace}.${typeName}`;
if (!importedTypes.has(imported) && javaNamespace !== classNamespace) {
const { name: javaBaseNamespace } = ModelUtil.parseNamespace(namespace);
const { name: classBaseNamespace } = ModelUtil.parseNamespace(classDeclaration.getNamespace());
const imported = `${namespace}.${typeName}`;
if (!importedTypes.has(imported) && javaBaseNamespace !== classBaseNamespace) {
parameters.fileWriter.writeLine(0, `import ${imported};` );
importedTypes.add(imported);
}
Expand All @@ -189,7 +190,8 @@ class JavaVisitor {
if (!this.shouldImportType(classDeclaration.getModelFile(), imported)) {
return;
}
const { name: namespace } = ModelUtil.parseNamespace(ModelUtil.getNamespace(imported));
const { name, version } = ModelUtil.parseNamespace(ModelUtil.getNamespace(imported));
const namespace = version ? `${name}@${version}` : name;
const typeName = ModelUtil.getShortName(imported);
writeImport(namespace, typeName);
});
Expand Down
Loading
Loading