Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions lib/codegen/fromcto/java/javavisitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,20 @@ class JavaVisitor {
this.plugin.addEnumAnnotations(enumDeclaration, parameters);
parameters.fileWriter.writeLine(0, 'public enum ' + enumDeclaration.getName() + ' {' );

enumDeclaration.getOwnProperties().forEach((property) => {
property.accept(this, parameters);
});
const properties = enumDeclaration.getOwnProperties();
if (properties.length === 0) {
parameters.fileWriter.writeLine(1, ';');
} else {
properties.forEach((property, index) => {
const suffix = index < properties.length - 1 ? ',' : ';';
parameters.fileWriter.writeLine(1, property.getName() + suffix);
});
}

parameters.fileWriter.writeLine(1, '@Override');
parameters.fileWriter.writeLine(1, 'public String toString() {');
parameters.fileWriter.writeLine(2, 'return name();');
parameters.fileWriter.writeLine(1, '}');

parameters.fileWriter.writeLine(0, '}' );

Expand Down
29 changes: 25 additions & 4 deletions test/codegen/__snapshots__/codegen.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -1568,7 +1568,11 @@ public enum State {
CO,
WA,
IL,
CA,
CA;
@Override
public String toString() {
return name();
}
}
",
}
Expand All @@ -1585,7 +1589,11 @@ import com.fasterxml.jackson.annotation.*;
public enum TShirtSizeType {
SMALL,
MEDIUM,
LARGE,
LARGE;
@Override
public String toString() {
return name();
}
}
",
}
Expand Down Expand Up @@ -1655,6 +1663,11 @@ package org.acme.hr.base;
import com.fasterxml.jackson.annotation.*;
@JsonIgnoreProperties({"$class"})
public enum Level {
;
@Override
public String toString() {
return name();
}
}
",
}
Expand Down Expand Up @@ -1833,7 +1846,11 @@ public enum Department {
Finance,
HR,
Engineering,
Design,
Design;
@Override
public String toString() {
return name();
}
}
",
}
Expand Down Expand Up @@ -1892,7 +1909,11 @@ import com.fasterxml.jackson.annotation.*;
@JsonIgnoreProperties({"$class"})
public enum LaptopMake {
Apple,
Microsoft,
Microsoft;
@Override
public String toString() {
return name();
}
}
",
}
Expand Down
23 changes: 13 additions & 10 deletions test/codegen/fromcto/java/javavisitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,33 +221,36 @@ describe('JavaVisitor', function () {

describe('visitEnumDeclaration', () => {
it('should write an enum declaration and call accept on each property', () => {
let acceptSpy = sinon.spy();

let param = {
fileWriter: mockFileWriter
};

let mockEnumDeclaration = sinon.createStubInstance(EnumDeclaration);
mockEnumDeclaration.isEnum.returns(true);
mockEnumDeclaration.getName.returns('Bob');
mockEnumDeclaration.getOwnProperties.returns([{
accept: acceptSpy
},
{
accept: acceptSpy
}]);
mockEnumDeclaration.getOwnProperties.returns([
{ getName: () => 'VALUE_A' },
{ getName: () => 'VALUE_B' },
]);

let mockStartClassFile = sinon.stub(javaVisit, 'startClassFile');
let mockEndClassFile = sinon.stub(javaVisit, 'endClassFile');

javaVisit.visitEnumDeclaration(mockEnumDeclaration, param);

mockStartClassFile.withArgs(mockEnumDeclaration, param).calledOnce.should.be.ok;
param.fileWriter.writeLine.callCount.should.deep.equal(4);
param.fileWriter.writeLine.callCount.should.deep.equal(10);

param.fileWriter.writeLine.getCall(0).args.should.deep.equal([0, 'import com.fasterxml.jackson.annotation.*;']);
param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '@JsonIgnoreProperties({"$class"})']);
param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, 'public enum Bob {']);
param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '}']);
param.fileWriter.writeLine.getCall(3).args.should.deep.equal([1, 'VALUE_A,']);
param.fileWriter.writeLine.getCall(4).args.should.deep.equal([1, 'VALUE_B;']);
param.fileWriter.writeLine.getCall(5).args.should.deep.equal([1, '@Override']);
param.fileWriter.writeLine.getCall(6).args.should.deep.equal([1, 'public String toString() {']);
param.fileWriter.writeLine.getCall(7).args.should.deep.equal([2, 'return name();']);
param.fileWriter.writeLine.getCall(8).args.should.deep.equal([1, '}']);
param.fileWriter.writeLine.getCall(9).args.should.deep.equal([0, '}']);
mockEndClassFile.withArgs(mockEnumDeclaration, param).calledOnce.should.be.ok;
});
});
Expand Down
Loading