starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-05-25 16:19:20 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Make codegen default to jspecify NonNull annotations (#1607)

Browse Source 
With JSpecify now a dependency of pkl-config-java, this moves the
non-null annotation to jspecify's.
This makes it simpler for users to do nullness checks, as tooling
already understands JSpecify nullness annotations.
This commit is contained in:
Daniel Chao
2026-05-21 21:12:15 -07:00
committed by GitHub
parent 8e2e5e4ba8
commit da4dd4c4f8
9 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkl-codegen-java/src/main/kotlin/org/pkl/codegen/java/JavaCodeGenerator.kt
+2 -2
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:Suppress("unused")
@file:Suppress("unused", "CanConvertToMultiDollarString")
package org.pkl.codegen.java
@@ -172,7 +172,7 @@ class JavaCodeGenerator(
val annotation = codegenOptions.nonNullAnnotation
val className =
if (annotation == null) {
ClassName.get("org.pkl.config.java.mapper", "NonNull")
ClassName.get("org.jspecify.annotations", "NonNull")
} else {
toClassName(annotation)
}
pkl-codegen-java/src/test/resources/org/pkl/codegen/java/GenerateGetters.jva
+1 -1
View File
@@ -5,8 +5,8 @@ import java.lang.Override;
import java.lang.String;
import java.lang.StringBuilder;
import java.util.Objects;
import org.jspecify.annotations.NonNull;
import org.pkl.config.java.mapper.Named;
import org.pkl.config.java.mapper.NonNull;
import org.pkl.core.DataSize;
import org.pkl.core.Duration;
pkl-codegen-java/src/test/resources/org/pkl/codegen/java/Inheritance.jva
+1 -1
View File
@@ -5,8 +5,8 @@ import java.lang.Override;
import java.lang.String;
import java.lang.StringBuilder;
import java.util.Objects;
import org.jspecify.annotations.NonNull;
import org.pkl.config.java.mapper.Named;
import org.pkl.config.java.mapper.NonNull;
import org.pkl.core.Duration;
public final class Mod {
pkl-codegen-java/src/test/resources/org/pkl/codegen/java/Javadoc.jva
+1 -1
View File
@@ -5,8 +5,8 @@ import java.lang.Override;
import java.lang.String;
import java.lang.StringBuilder;
import java.util.Objects;
import org.jspecify.annotations.NonNull;
import org.pkl.config.java.mapper.Named;
import org.pkl.config.java.mapper.NonNull;
/**
* module comment.
pkl-codegen-java/src/test/resources/org/pkl/codegen/java/PropertyTypes.jva
+1 -1
View File
@@ -11,8 +11,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern;
import org.jspecify.annotations.NonNull;
import org.pkl.config.java.mapper.Named;
import org.pkl.config.java.mapper.NonNull;
import org.pkl.core.DataSize;
import org.pkl.core.DataSizeUnit;
import org.pkl.core.Duration;