diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/querybyexample/package-info.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/querybyexample/package-info.java
new file mode 100644
index 000000000..aea4322e9
--- /dev/null
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/querybyexample/package-info.java
@@ -0,0 +1,3 @@
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
+package org.springframework.data.elasticsearch.repository.support.querybyexample;
diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/spel/package-info.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/spel/package-info.java
new file mode 100644
index 000000000..1d76d236d
--- /dev/null
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/spel/package-info.java
@@ -0,0 +1,3 @@
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
+package org.springframework.data.elasticsearch.repository.support.spel;
diff --git a/src/main/java/org/springframework/data/elasticsearch/repository/support/value/package-info.java b/src/main/java/org/springframework/data/elasticsearch/repository/support/value/package-info.java
new file mode 100644
index 000000000..89f2436e2
--- /dev/null
+++ b/src/main/java/org/springframework/data/elasticsearch/repository/support/value/package-info.java
@@ -0,0 +1,3 @@
+@org.springframework.lang.NonNullApi
+@org.springframework.lang.NonNullFields
+package org.springframework.data.elasticsearch.repository.support.value;