MF-5140 Adds @nullable & @nonnull annotations to generated data model…

… getters

CHANGELOG.md

@@ -1,3 +1,6 @@
+6.1.0 (202X-XX-XX)
+---------------------------------------------
+- [#527](https://github.com/dropbox/dropbox-sdk-java/pull/527) Adds nullability annotations to data models for improved interop with Kotlin
 
 6.0.0 (2023-11-30)
 ---------------------------------------------

core/build.gradle

@@ -56,6 +56,7 @@ sourceSets.main.java.srcDir(versionWriterTask)
 
 dependencies {
     api(dropboxJavaSdkLibs.jackson.core)
+    api(dropboxJavaSdkLibs.jsr305)
 
     compileOnly dropboxJavaSdkLibs.appengine.api
     compileOnly dropboxJavaSdkLibs.jakarta.servlet.api

core/generator/java/java.stoneg.py

@@ -3433,6 +3433,12 @@ def generate_data_type_struct(self, data_type):
                     returns += ' Defaults to %s.' % w.java_default_value(field)
 
                 w.javadoc(field.doc or '', stone_elem=field, returns=returns)
+
+                if not field.has_default and field in data_type.all_optional_fields:
+                    w.out('@javax.annotation.Nullable')
+                elif not j.is_java_primitive(field.data_type):
+                    w.out('@javax.annotation.Nonnull')
+
                 with w.block('public %s %s()', j.java_class(field), j.field_getter_method(field)):
                     w.out('return %s;' % j.param_name(field))
 

gradle/dropboxJavaSdkLibs.versions.toml

@@ -29,6 +29,7 @@ jackson-databind = 'com.fasterxml.jackson.core:jackson-databind:2.15.0'
 jetty-server = "org.eclipse.jetty:jetty-server:11.0.15"
 json = "org.json:json:20230618"
 jakarta-servlet-api = 'jakarta.servlet:jakarta.servlet-api:5.0.0'
+jsr305 = 'com.google.code.findbugs:jsr305:3.0.2'
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }