Skip to content

Fixing conflict resolution and improving logging #138

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
AndreasIgel merged 5 commits into from
Mar 15, 2026
Merged

Fixing conflict resolution and improving logging #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5aca9a8
Adapting tests and improving logging for conflict cases
AndreasIgel Mar 15, 2026
8b727fa
Improving logging and adapting tests
AndreasIgel Mar 15, 2026
315fadc
Adapting documentation for changed debug-logging
AndreasIgel Mar 15, 2026
8c535ea
Removing "Disabled" annotation
AndreasIgel Mar 15, 2026
bc49b9f
Changing ordering of methods and parameters to test conflict resolution
AndreasIgel Mar 15, 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
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ For complete documentation, see [DEBUG_LOGGING.md](DEBUG_LOGGING.md).
[DEBUG] ├─ Extracting builder definition from: test.Project
[DEBUG] │ ├─ Builder will be generated as: test.ProjectBuilder
[DEBUG] │ ├─ Analysing setters for finding fields
[DEBUG] │ │ ├─ Analyzing method: setName with 1 parameter(s)
[DEBUG] │ │ ├─ Analyzing method: setName(java.lang.String)
[DEBUG] │ │ │ └─ Adding field: name (type: java.lang.String)
[DEBUG] │ └─ Processed 1 possible setters: added 1 fields, skipped 0
[DEBUG] ├─ Code generation for builder: ProjectBuilder
Expand Down
4 changes: 2 additions & 2 deletions docs/DEBUG_LOGGING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ When debug logging is enabled, you'll see detailed output with visual separators
[INFO] [DEBUG] ├─ Extracting builder definition from: org.example.PersonDto
[INFO] [DEBUG] │ ├─ Builder will be generated as: org.example.PersonDtoBuilder
[INFO] [DEBUG] │ ├─ Analysing setters for finding fields
[INFO] [DEBUG] │ │ ├─ Analyzing method: setName with 1 parameter(s)
[INFO] [DEBUG] │ │ ├─ Analyzing method: setName(java.lang.String)
[INFO] [DEBUG] │ │ │ └─ Adding field: name (type: java.lang.String)
[INFO] [DEBUG] │ │ ├─ Analyzing method: setAge with 1 parameter(s)
[INFO] [DEBUG] │ │ ├─ Analyzing method: setAge(int)
[INFO] [DEBUG] │ │ │ └─ Adding field: age (type: int)
[INFO] [DEBUG] │ └─ Processed 2 possible setters: added 2 fields, skipped 0
[INFO] [DEBUG] ├─ Code generation for builder: PersonDtoBuilder
Expand Down
4 changes: 1 addition & 3 deletions ...n/java/org/javahelpers/simple/builders/processor/processing/BuilderDefinitionCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,7 @@ private static List<FieldDto> extractSetterFields(
result.getBuilderTypeName(), result.getGenerics());

for (ExecutableElement mth : methods) {
context.debugStartOperation(
"Analyzing method: %s with %d parameter(s)",
mth.getSimpleName(), mth.getParameters().size());
context.debugStartOperation("Analyzing method: %s", mth.toString());

if (isMethodRelevantForBuilder(mth, context)) {
// Extract the original field name from the setter method (before any renaming)
Expand Down
8 changes: 3 additions & 5 deletions processor/src/test/java/org/javahelpers/simple/builders/processor/BuilderProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import javax.tools.JavaFileObject;
import org.javahelpers.simple.builders.processor.testing.ProcessorAsserts;
import org.javahelpers.simple.builders.processor.testing.ProcessorTestUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/** Tests for the {@link BuilderProcessor} class. */
Expand Down Expand Up @@ -104,7 +103,7 @@ void shouldLogDebugMessagesWhenVerboseModeEnabled() {
"[DEBUG] ├─ Extracting builder definition from: test.VerboseTest",
"[DEBUG] │ ├─ Builder will be generated as: test.VerboseTestBuilder",
"[DEBUG] │ ├─ Analysing setters for finding fields",
"[DEBUG] │ │ ├─ Analyzing method: setName with 1 parameter(s)",
"[DEBUG] │ │ ├─ Analyzing method: setName(java.lang.String)",
"[DEBUG] │ │ │ ├─ Processing method generators",
"[DEBUG] │ │ │ │ ├─ Applying: BasicSetterGenerator (priority: 100)",
"[DEBUG] │ │ │ │ ├─ Applying: StringFormatHelperGenerator (priority: 80)",
Expand Down Expand Up @@ -2682,7 +2681,6 @@ public class InnerClass {
}

@Test
@Disabled("Missing feature: #131")
void shouldHandleOverloadedSettersForSameFieldWithoutConflicts() {
// Given
String packageName = "test";
Expand All @@ -2697,8 +2695,8 @@ void shouldHandleOverloadedSettersForSameFieldWithoutConflicts() {
private java.util.List<String> names;

public java.util.List<String> getNames() { return names; }
public void setNames(String[] names) { this.names = names; }
public void setNames(String... names) { this.names = java.util.List.of(names); }
public void setNames(String[] names) { this.names = java.util.List.of(names); }
public void setNames(java.util.List<String> names) { this.names = names; }
""");

// When
Expand Down
Loading