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
4 changes: 2 additions & 2 deletions pyjavapoet/code_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def add_javadoc(javadoc: Optional["CodeBlock"], format_string: str, *args) -> "C
return CodeBlock.join_to_code([javadoc, CodeBlock.of(format_string, *args)])
else:
return CodeBlock.of(format_string, *args)

@staticmethod
def add_javadoc_line(javadoc: Optional["CodeBlock"], format_string: str, *args) -> "CodeBlock":
if javadoc:
Expand Down Expand Up @@ -271,7 +271,7 @@ def add_statement(self, format_string: str, *args, **kwargs) -> "CodeBlock.Build
self.add(format_string, *args, **kwargs)
self.add(";\n")
return self

def add_line(self, format_string: str, *args, **kwargs) -> "CodeBlock.Builder":
self.add(format_string, *args, **kwargs)
self.add("\n")
Expand Down
2 changes: 1 addition & 1 deletion pyjavapoet/field_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def add_annotation(self, annotation_spec: "AnnotationSpec") -> "FieldSpec.Builde
def add_javadoc(self, format_string: str, *args) -> "FieldSpec.Builder":
self.__javadoc = CodeBlock.add_javadoc(self.__javadoc, format_string, *args)
return self

def add_javadoc_line(self, format_string: str = EMPTY_STRING, *args) -> "FieldSpec.Builder":
self.__javadoc = CodeBlock.add_javadoc_line(self.__javadoc, format_string, *args)
return self
Expand Down
2 changes: 1 addition & 1 deletion pyjavapoet/java_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def __init__(
def add_file_comment(self, format_string: str = EMPTY_STRING, *args) -> "JavaFile.Builder":
self.__file_comment = CodeBlock.add_javadoc(self.__file_comment, format_string, *args)
return self

def add_file_comment_line(self, format_string: str = EMPTY_STRING, *args) -> "JavaFile.Builder":
self.__file_comment = CodeBlock.add_javadoc_line(self.__file_comment, format_string, *args)
return self
Expand Down
2 changes: 1 addition & 1 deletion pyjavapoet/method_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def add_exception(self, exception: Union["TypeName", str, type]) -> "MethodSpec.
def add_type_variable(self, type_variable: "TypeVariableName") -> "MethodSpec.Builder":
self.__type_variables.append(type_variable)
return self

def add_javadoc(self, format_string: str, *args) -> "MethodSpec.Builder":
self.__javadoc = CodeBlock.add_javadoc(self.__javadoc, format_string, *args)
return self
Expand Down
2 changes: 1 addition & 1 deletion pyjavapoet/type_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def get(type_mirror_or_name: Union[str, type, "TypeName", None]) -> "TypeName":
list: TypeName.LIST,
dict: TypeName.MAP,
set: TypeName.SET,
tuple: TypeName.LIST
tuple: TypeName.LIST,
}

if type_mirror_or_name in type_mapping:
Expand Down
2 changes: 1 addition & 1 deletion pyjavapoet/type_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ def add_permitted_subclass(self, subclass: Union["TypeName", str, type]) -> "Typ

self.__permitted_subclasses.append(subclass)
return self

def add_javadoc(self, format_string: str, *args) -> "TypeSpec.Builder":
self.__javadoc = CodeBlock.add_javadoc(self.__javadoc, format_string, *args)
return self
Expand Down
1 change: 1 addition & 0 deletions tests/test_code_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,5 +344,6 @@ def test_add_raw_line(self):
block = CodeBlock.builder().add_line("System.out.println($S);", "Hello, World!").build()
self.assertEqual(str(block), 'System.out.println("Hello, World!");\n')


if __name__ == "__main__":
unittest.main()
4 changes: 2 additions & 2 deletions tests/test_code_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ def test_emit_with_nested_newlines_handling(self):
result = str(writer)
# The expected result:
# // line1
# //
# //
# //
# //
# // line2
# // line3
expected = "// line1\n// \n// \n// line2\n// line3"
Expand Down
3 changes: 1 addition & 2 deletions tests/test_type_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ def test_get_with_type_or_none(self):
self.assertEqual(TypeName.get(tuple), TypeName.LIST)
self.assertEqual(TypeName.get(None), TypeName.VOID)


def test_is_primitive(self):
"""Test primitive type detection."""
self.assertTrue(TypeName.get("boolean").is_primitive())
Expand Down Expand Up @@ -219,7 +218,7 @@ def test_parameterized_type_with_primitives(self):
new_type = list_type.with_type_arguments(t)
self.assertIn(c.simple_name, str(new_type))
self.assertNotIn(t.simple_name, str(new_type))

def test_nested_parameterized_types(self):
"""Test deeply nested parameterized types."""
map_type = ClassName.get("java.util", "Map").with_type_arguments(
Expand Down
Loading