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.

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

don't add annotations to inner classes. #26345

Merged
merged 1 commit into from
Jun 3, 2024
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
22 changes: 22 additions & 0 deletions generators/java/support/add-java-annotation.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,28 @@ import com.mycompany.myapp.Foo;
@Foo(bar="baz")
public class MyTest {}`);
});

it('should not add the annotation to inner class', () => {
expect(
addJavaAnnotation(
`package com.mycompany.myapp;

public class MyTest {
public static class Inner {

}
}`,
{ annotation: 'Foo' },
),
).toBe(`package com.mycompany.myapp;

@Foo
public class MyTest {
public static class Inner {

}
}`);
});
});
});
});
2 changes: 1 addition & 1 deletion generators/java/support/add-java-annotation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const addJavaAnnotationToContent = (content: string, annotationDef: JavaAnnotati
throw new Error(`Annotation already exists: ${annotation} replace is not implemented yet.`);
}
// add the annotation before class or interface
content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/g, `\n@${annotationToAdd}\n$1`);
content = content.replace(/\n([a-w ]*(class|@?interface|enum) )/, `\n@${annotationToAdd}\n$1`);
}
return content;
};
Expand Down
Loading