Context.attribute(key) should be marked @nullable on return fix jooby-project#2306

jknack · jknack · commit 45c23af8db10 · 2021-05-09T21:09:09.000-03:00
diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java
@@ -81,9 +81,9 @@ public interface Context extends Registry {
    *
    * @param key Attribute key.
    * @param <T> Attribute type.
-   * @return Attribute value.
+   * @return Attribute value or <code>null</code>.
    */
-  @Nonnull <T> T attribute(@Nonnull String key);
+  @Nullable <T> T attribute(@Nonnull String key);
 
   /**
    * Set an application attribute.
diff --git a/jooby/src/main/java/io/jooby/DefaultContext.java b/jooby/src/main/java/io/jooby/DefaultContext.java
@@ -79,7 +79,7 @@ public interface DefaultContext extends Context {
    * @param <T> Attribute type.
    * @return Attribute value.
    */
-  @Override @Nonnull default <T> T attribute(@Nonnull String key) {
+  @Override @Nullable default <T> T attribute(@Nonnull String key) {
     T attribute = (T) getAttributes().get(key);
     if (attribute == null) {
       Map<String, Object> globals = getRouter().getAttributes();
diff --git a/jooby/src/main/java/io/jooby/ForwardingContext.java b/jooby/src/main/java/io/jooby/ForwardingContext.java
@@ -68,7 +68,7 @@ public ForwardingContext(@Nonnull Context context) {
     return ctx.getAttributes();
   }
 
-  @Nonnull @Override public <T> T attribute(@Nonnull String key) {
+  @Nullable @Override public <T> T attribute(@Nonnull String key) {
     return ctx.attribute(key);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public ForwardingContext(@Nonnull Context context) {`
`68`	`68`	`return ctx.getAttributes();`
`69`	`69`	`}`
`70`	`70`
`71`		`- @Nonnull @Override public <T> T attribute(@Nonnull String key) {`
	`71`	`+ @Nullable @Override public <T> T attribute(@Nonnull String key) {`
`72`	`72`	`return ctx.attribute(key);`
`73`	`73`	`}`
`74`	`74`