Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -1412,6 +1412,12 @@ protected void applyJspecify() {
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator),
"package-info.java"));
}
// the authentication classes live in a sub-package of the invoker package, so they are not
// covered by the invoker package-info.java. Libraries such as "native" generate no
// authentication class at all, and an empty package must not get a package-info.java.
if (supportingFiles.stream().anyMatch(sf -> sf.getTemplateFile().startsWith("auth/"))) {
supportingFiles.add(new SupportingFile("authPackageInfo.mustache", authFolder, "package-info.java"));
}
String nullableAnnotation = "@" + additionalProperties.get(JAVAX_PACKAGE) + ".annotation.Nullable";
// nullable_var_annotations.mustache generates nullable annotations as @{{javaxPackage}}.annotation.Nullable
// override the default pattern for the "find and replace"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@org.jspecify.annotations.NullMarked
package {{invokerPackage}}.auth;
Original file line number Diff line number Diff line change
Expand Up @@ -4786,6 +4786,13 @@ public void testJspecify(String library, int springBootVersion, boolean hasJspec
.fileContains("@org.jspecify.annotations.NullMarked");
JavaFileAssert.assertThat(files.get("client/package-info.java"))
.fileContains("@org.jspecify.annotations.NullMarked");
if (NATIVE.equals(library)) { // native library generates no authentication class
assertThat(files).doesNotContainKey("auth/package-info.java");
} else {
assertThat(files).containsKey("auth/package-info.java");
JavaFileAssert.assertThat(files.get("auth/package-info.java"))
.fileContains("@org.jspecify.annotations.NullMarked");
}
}

@Test(dataProvider = "jspecifyLibraries")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
src/main/java/org/openapitools/client/auth/Authentication.java
src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
src/main/java/org/openapitools/client/auth/package-info.java
src/main/java/org/openapitools/client/model/FileContent.java
src/main/java/org/openapitools/client/model/Foo.java
src/main/java/org/openapitools/client/model/RequiredAndNullable.java
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@org.jspecify.annotations.NullMarked
package org.openapitools.client.auth;
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
src/main/java/org/openapitools/client/auth/Authentication.java
src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
src/main/java/org/openapitools/client/auth/package-info.java
src/main/java/org/openapitools/client/model/FileContent.java
src/main/java/org/openapitools/client/model/Foo.java
src/main/java/org/openapitools/client/model/RequiredAndNullable.java
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@org.jspecify.annotations.NullMarked
package org.openapitools.client.auth;
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
src/main/java/org/openapitools/client/auth/Authentication.java
src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
src/main/java/org/openapitools/client/auth/package-info.java
src/main/java/org/openapitools/client/model/FileContent.java
src/main/java/org/openapitools/client/model/Foo.java
src/main/java/org/openapitools/client/model/RequiredAndNullable.java
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@org.jspecify.annotations.NullMarked
package org.openapitools.client.auth;
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
src/main/java/org/openapitools/client/auth/Authentication.java
src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
src/main/java/org/openapitools/client/auth/package-info.java
src/main/java/org/openapitools/client/model/FileContent.java
src/main/java/org/openapitools/client/model/Foo.java
src/main/java/org/openapitools/client/model/RequiredAndNullable.java
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@org.jspecify.annotations.NullMarked
package org.openapitools.client.auth;
Loading