Skip to content
This repository was archived by the owner on Mar 3, 2026. It is now read-only.

Commit c9c6acf

Browse files
jknackjknack
committed
Remove @nonnull from source code
1 parent d6a027c commit c9c6acf

20 files changed

+405
-499
lines changed

‎jooby/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@
8181
<artifactId>guice-multibindings</artifactId>
8282
</dependency>
8383

84-
<dependency>
85-
<groupId>com.google.code.findbugs</groupId>
86-
<artifactId>jsr305</artifactId>
87-
</dependency>
88-
8984
<!-- Test dependencies -->
9085
<dependency>
9186
<groupId>junit</groupId>

‎jooby/src/main/java/org/jooby/Asset.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import java.io.IOException;
2222
import java.io.InputStream;
2323

24-
import javax.annotation.Nonnull;
25-
2624
/**
2725
* Usually a public file/resource like javascript, css, images files, etc...
2826
* An asset consist of content type, stream and last modified since, between others.
@@ -36,7 +34,7 @@ public interface Asset {
3634
/**
3735
* @return The asset name (without path).
3836
*/
39-
@Nonnull String name();
37+
String name();
4038

4139
/**
4240
* @return Asset size (in bytes) or <code>-1</code> if undefined.
@@ -52,10 +50,10 @@ public interface Asset {
5250
* @return The content of this asset.
5351
* @throws IOException If content can't be read it.
5452
*/
55-
@Nonnull InputStream stream() throws IOException;
53+
InputStream stream() throws IOException;
5654

5755
/**
5856
* @return Asset media type.
5957
*/
60-
@Nonnull MediaType type();
58+
MediaType type();
6159
}

‎jooby/src/main/java/org/jooby/BodyFormatter.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import java.util.List;
2424
import java.util.Map;
2525

26-
import javax.annotation.Nonnull;
27-
2826
/**
2927
* Format a Java object into bytes and/or text. A formatter is responsible for converting a Java
3028
* Object to HTML, JSON, XML, etc..
@@ -101,15 +99,15 @@ interface Text {
10199
* @param text A text strategy.
102100
* @throws Exception When the operation fails.
103101
*/
104-
void text(@Nonnull Text text) throws Exception;
102+
void text(Text text) throws Exception;
105103

106104
/**
107105
* Write bytes into the HTTP response body and close the resources.
108106
*
109107
* @param bytes A bytes strategy.
110108
* @throws Exception When the operation fails.
111109
*/
112-
void bytes(@Nonnull Bytes bytes) throws Exception;
110+
void bytes(Bytes bytes) throws Exception;
113111

114112
}
115113

@@ -127,7 +125,7 @@ interface Text {
127125
* @param type The candidate type.
128126
* @return True if the converter can write into the HTTP response body.
129127
*/
130-
boolean canFormat(@Nonnull Class<?> type);
128+
boolean canFormat(Class<?> type);
131129

132130
/**
133131
* Attempt to write a message into the HTTP response body.
@@ -146,6 +144,6 @@ interface Text {
146144
* @param ctx A write context.
147145
* @throws Exception If write operation fail.
148146
*/
149-
void format(@Nonnull Object body, @Nonnull BodyFormatter.Context ctx) throws Exception;
147+
void format(Object body, BodyFormatter.Context ctx) throws Exception;
150148

151149
}

‎jooby/src/main/java/org/jooby/BodyParser.java‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import java.nio.charset.Charset;
2323
import java.util.List;
2424

25-
import javax.annotation.Nonnull;
26-
2725
import com.google.inject.TypeLiteral;
2826

2927
/**
@@ -96,8 +94,7 @@ interface Text {
9694
* @return A HTTP body converted to something else.
9795
* @throws Exception When the operation fails.
9896
*/
99-
@Nonnull
100-
<T> T text(@Nonnull Text text) throws Exception;
97+
<T> T text(Text text) throws Exception;
10198

10299
/**
103100
* Convert a HTTP request body to something else.
@@ -107,8 +104,7 @@ interface Text {
107104
* @return A HTTP body converted to something else.
108105
* @throws Exception When the operation fails.
109106
*/
110-
@Nonnull
111-
<T> T bytes(@Nonnull Bytes bytes) throws Exception;
107+
<T> T bytes(Bytes bytes) throws Exception;
112108

113109
}
114110

@@ -126,7 +122,7 @@ interface Text {
126122
* @param type The candidate Type.
127123
* @return True if the converter can read the HTTP request body.
128124
*/
129-
default boolean canParse(@Nonnull final Class<?> type) {
125+
default boolean canParse(final Class<?> type) {
130126
return canParse(TypeLiteral.get(type));
131127
}
132128

@@ -136,7 +132,7 @@ default boolean canParse(@Nonnull final Class<?> type) {
136132
* @param type The candidate Type.
137133
* @return True if the converter can read the HTTP request body.
138134
*/
139-
boolean canParse(@Nonnull TypeLiteral<?> type);
135+
boolean canParse(TypeLiteral<?> type);
140136

141137
/**
142138
* Attempt to read a message from HTTP request body.
@@ -157,8 +153,7 @@ default boolean canParse(@Nonnull final Class<?> type) {
157153
* @return A body message.
158154
* @throws Exception If read operation fail.
159155
*/
160-
@Nonnull
161-
default <T> T parse(@Nonnull final Class<T> type, @Nonnull final Context ctx)
156+
default <T> T parse(final Class<T> type, final Context ctx)
162157
throws Exception {
163158
return parse(TypeLiteral.get(type), ctx);
164159
}
@@ -182,7 +177,6 @@ default <T> T parse(@Nonnull final Class<T> type, @Nonnull final Context ctx)
182177
* @return A body message.
183178
* @throws Exception If read operation fail.
184179
*/
185-
@Nonnull
186-
<T> T parse(@Nonnull TypeLiteral<T> type, @Nonnull BodyParser.Context ctx) throws Exception;
180+
<T> T parse(TypeLiteral<T> type, BodyParser.Context ctx) throws Exception;
187181

188182
}

‎jooby/src/main/java/org/jooby/Cookie.java‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.Optional;
2626
import java.util.regex.Pattern;
2727

28-
import javax.annotation.Nonnull;
2928
import javax.crypto.Mac;
3029
import javax.crypto.spec.SecretKeySpec;
3130

@@ -107,7 +106,7 @@ class Definition {
107106
*
108107
* @param name Cookie's name.
109108
*/
110-
public Definition(@Nonnull final String name) {
109+
public Definition(final String name) {
111110
name(name);
112111
}
113112

@@ -116,7 +115,7 @@ public Definition(@Nonnull final String name) {
116115
*
117116
* @param def A cookie's definition.
118117
*/
119-
public Definition(@Nonnull final Definition def) {
118+
public Definition(final Definition def) {
120119
this.comment = def.comment;
121120
this.domain = def.domain;
122121
this.httpOnly = def.httpOnly;
@@ -133,7 +132,7 @@ public Definition(@Nonnull final Definition def) {
133132
* @param name Cookie's name.
134133
* @param value Cookie's value.
135134
*/
136-
public Definition(@Nonnull final String name, @Nonnull final String value) {
135+
public Definition(final String name, final String value) {
137136
name(name);
138137
value(value);
139138
}
@@ -243,16 +242,15 @@ public String toString() {
243242
* @param name A cookie's name.
244243
* @return This definition.
245244
*/
246-
@Nonnull
247-
public Definition name(@Nonnull final String name) {
245+
public Definition name(final String name) {
248246
this.name = requireNonNull(name, "A cookie name is required.");
249247
return this;
250248
}
251249

252250
/**
253251
* @return Cookie's name.
254252
*/
255-
public @Nonnull Optional<String> name() {
253+
public Optional<String> name() {
256254
return Optional.ofNullable(name);
257255
}
258256

@@ -262,15 +260,15 @@ public Definition name(@Nonnull final String name) {
262260
* @param value A value.
263261
* @return This definition.
264262
*/
265-
public @Nonnull Definition value(@Nonnull final String value) {
263+
public Definition value(final String value) {
266264
this.value = requireNonNull(value, "A cookie value is required.");
267265
return this;
268266
}
269267

270268
/**
271269
* @return Cookie's value.
272270
*/
273-
public @Nonnull Optional<String> value() {
271+
public Optional<String> value() {
274272
return Optional.ofNullable(value);
275273
}
276274

@@ -280,15 +278,15 @@ public Definition name(@Nonnull final String name) {
280278
* @param domain Cookie's domain.
281279
* @return This definition.
282280
*/
283-
public @Nonnull Definition domain(@Nonnull final String domain) {
281+
public Definition domain(final String domain) {
284282
this.domain = requireNonNull(domain, "A cookie domain is required.");
285283
return this;
286284
}
287285

288286
/**
289287
* @return A cookie's domain.
290288
*/
291-
public @Nonnull Optional<String> domain() {
289+
public Optional<String> domain() {
292290
return Optional.ofNullable(domain);
293291
}
294292

@@ -298,15 +296,15 @@ public Definition name(@Nonnull final String name) {
298296
* @param path Cookie's path.
299297
* @return This definition.
300298
*/
301-
public @Nonnull Definition path(final @Nonnull String path) {
299+
public Definition path(final String path) {
302300
this.path = requireNonNull(path, "A cookie path is required.");
303301
return this;
304302
}
305303

306304
/**
307305
* @return Get cookie's path.
308306
*/
309-
public @Nonnull Optional<String> path() {
307+
public Optional<String> path() {
310308
return Optional.ofNullable(path);
311309
}
312310

@@ -316,15 +314,15 @@ public Definition name(@Nonnull final String name) {
316314
* @param comment A cookie's comment.
317315
* @return This definition.
318316
*/
319-
public @Nonnull Definition comment(final @Nonnull String comment) {
317+
public Definition comment(final String comment) {
320318
this.comment = requireNonNull(comment, "A cookie comment is required.");
321319
return this;
322320
}
323321

324322
/**
325323
* @return Cookie's comment.
326324
*/
327-
public @Nonnull Optional<String> comment() {
325+
public Optional<String> comment() {
328326
return Optional.ofNullable(comment);
329327
}
330328

@@ -334,15 +332,15 @@ public Definition name(@Nonnull final String name) {
334332
* @param httpOnly True, for HTTP Only.
335333
* @return This definition.
336334
*/
337-
public @Nonnull Definition httpOnly(final boolean httpOnly) {
335+
public Definition httpOnly(final boolean httpOnly) {
338336
this.httpOnly = httpOnly;
339337
return this;
340338
}
341339

342340
/**
343341
* @return HTTP only flag.
344342
*/
345-
public @Nonnull Optional<Boolean> httpOnly() {
343+
public Optional<Boolean> httpOnly() {
346344
return Optional.ofNullable(httpOnly);
347345
}
348346

@@ -352,15 +350,15 @@ public Definition name(@Nonnull final String name) {
352350
* @param secure True, ensure that the session cookie is only transmitted via HTTPS.
353351
* @return This definition.
354352
*/
355-
public @Nonnull Definition secure(final boolean secure) {
353+
public Definition secure(final boolean secure) {
356354
this.secure = secure;
357355
return this;
358356
}
359357

360358
/**
361359
* @return True, ensure that the session cookie is only transmitted via HTTPS.
362360
*/
363-
public @Nonnull Optional<Boolean> secure() {
361+
public Optional<Boolean> secure() {
364362
return Optional.ofNullable(secure);
365363
}
366364

@@ -382,7 +380,7 @@ public Definition name(@Nonnull final String name) {
382380
* means the cookie is not stored; if zero, deletes the cookie.
383381
* @return This definition.
384382
*/
385-
public @Nonnull Definition maxAge(final long maxAge) {
383+
public Definition maxAge(final long maxAge) {
386384
this.maxAge = maxAge;
387385
return this;
388386
}
@@ -402,7 +400,7 @@ public Definition name(@Nonnull final String name) {
402400
* </p>
403401
* @return Cookie's max age in seconds.
404402
*/
405-
public @Nonnull Optional<Long> maxAge() {
403+
public Optional<Long> maxAge() {
406404
return Optional.ofNullable(maxAge);
407405
}
408406

0 commit comments

Comments
 (0)