Skip to content

Fix #4079 @NullMarked scope not detected for constructor/setter parameters #4080

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

Open
RaniAgus wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix #4079 @NullMarked scope not detected for constructor/setter parameters #4080

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
1a673a3
test: reproduce #4079
RaniAgus Jun 28, 2026
79713c0
chore: Use Erroneous convention for expected compilation errors
RaniAgus Jun 28, 2026
630dc62
fix `@NullMarked` scope not detected for constructor/setter parameters
RaniAgus Jun 28, 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
5 changes: 4 additions & 1 deletion processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,10 @@ private boolean targetDeclaringTypeIsNullMarked() {
return false;
}
Element declaring = targetElement.getEnclosingElement();
if ( !( declaring instanceof TypeElement ) ) {
while ( declaring != null && !( declaring instanceof TypeElement ) ) {
declaring = declaring.getEnclosingElement();
}
if ( declaring == null ) {
return false;
}
return ctx.getTypeFactory().getType( declaring.asType() ).isNullMarked();
Expand Down
15 changes: 15 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_4079/ErroneousIssue4079Mapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.bugs._4079;

import org.jspecify.annotations.NullMarked;
import org.mapstruct.Mapper;

@Mapper
@NullMarked
public interface ErroneousIssue4079Mapper {
Target map(Source source);
}
37 changes: 37 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_4079/Issue4079Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.bugs._4079;

import org.junit.jupiter.api.extension.RegisterExtension;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.ProcessorTest;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.WithJSpecify;
import org.mapstruct.ap.testutil.compilation.annotation.CompilationResult;
import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
import org.mapstruct.ap.testutil.runner.GeneratedSource;

@IssueKey( "4079" )
@WithJSpecify
public class Issue4079Test {

@RegisterExtension
final GeneratedSource generatedSource = new GeneratedSource();

@ProcessorTest
@WithClasses( { ErroneousIssue4079Mapper.class, Source.class, Target.class } )
@ExpectedCompilationOutcome(value = CompilationResult.FAILED,
diagnostics = {
@Diagnostic(type = ErroneousIssue4079Mapper.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
message = "Can't map potentially nullable source property \"nested\" to @NonNull " +
"constructor parameter \"nested\". Consider adding a defaultValue or " +
"defaultExpression.")
})
public void nullableSourceToNonNullConstructorParamUnderNullMarkedShouldFail() {
}
}
34 changes: 34 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_4079/Source.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.bugs._4079;

import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

@NullMarked
public class Source {
private final @Nullable Nested nested;

public Source(@Nullable Nested nested) {
this.nested = nested;
}

public @Nullable Nested getNested() {
return nested;
}

public static class Nested {
private final String foo;

public Nested(String foo) {
this.foo = foo;
}

public String getFoo() {
return foo;
}
}
}
33 changes: 33 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_4079/Target.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.bugs._4079;

import org.jspecify.annotations.NullMarked;

@NullMarked
public class Target {
private final Nested nested;

public Target(Nested nested) {
this.nested = nested;
}

public Nested getNested() {
return nested;
}

public static class Nested {
private final String foo;

public Nested(String foo) {
this.foo = foo;
}

public String getFoo() {
return foo;
}
}
}
Loading