fix: mark remoteAddress as @nullable in SqlStatementFactory

egg.boiled · egg.boiled · commit 637e1cb9b3f0 · 2026-05-20T15:55:48.000+09:00
diff --git a/sql/src/main/java/org/apache/druid/sql/SqlStatementFactory.java b/sql/src/main/java/org/apache/druid/sql/SqlStatementFactory.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.sql;
 
+import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
 
 /**
@@ -54,7 +55,7 @@ public DirectStatement directStatement(final SqlQueryPlus sqlRequest)
     return new DirectStatement(lifecycleToolbox, sqlRequest, null);
   }
 
-  public DirectStatement directStatement(final SqlQueryPlus sqlRequest, final String remoteAddress)
+  public DirectStatement directStatement(final SqlQueryPlus sqlRequest, @Nullable final String remoteAddress)
   {
     return new DirectStatement(lifecycleToolbox, sqlRequest, remoteAddress);
   }
@@ -64,7 +65,7 @@ public PreparedStatement preparedStatement(final SqlQueryPlus sqlRequest)
     return new PreparedStatement(lifecycleToolbox, sqlRequest, null);
   }
 
-  public PreparedStatement preparedStatement(final SqlQueryPlus sqlRequest, final String remoteAddress)
+  public PreparedStatement preparedStatement(final SqlQueryPlus sqlRequest, @Nullable final String remoteAddress)
   {
     return new PreparedStatement(lifecycleToolbox, sqlRequest, remoteAddress);
   }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`package org.apache.druid.sql;`
`21`	`21`
	`22`	`+import javax.annotation.Nullable;`
`22`	`23`	`import javax.servlet.http.HttpServletRequest;`
`23`	`24`
`24`	`25`	`/**`
`@@ -54,7 +55,7 @@ public DirectStatement directStatement(final SqlQueryPlus sqlRequest)`
`54`	`55`	`return new DirectStatement(lifecycleToolbox, sqlRequest, null);`
`55`	`56`	`}`
`56`	`57`
`57`		`- public DirectStatement directStatement(final SqlQueryPlus sqlRequest, final String remoteAddress)`
	`58`	`+ public DirectStatement directStatement(final SqlQueryPlus sqlRequest, @Nullable final String remoteAddress)`
`58`	`59`	`{`
`59`	`60`	`return new DirectStatement(lifecycleToolbox, sqlRequest, remoteAddress);`
`60`	`61`	`}`
`@@ -64,7 +65,7 @@ public PreparedStatement preparedStatement(final SqlQueryPlus sqlRequest)`
`64`	`65`	`return new PreparedStatement(lifecycleToolbox, sqlRequest, null);`
`65`	`66`	`}`
`66`	`67`
`67`		`- public PreparedStatement preparedStatement(final SqlQueryPlus sqlRequest, final String remoteAddress)`
	`68`	`+ public PreparedStatement preparedStatement(final SqlQueryPlus sqlRequest, @Nullable final String remoteAddress)`
`68`	`69`	`{`
`69`	`70`	`return new PreparedStatement(lifecycleToolbox, sqlRequest, remoteAddress);`
`70`	`71`	`}`