Skip to content

Commit

Permalink
Merge pull request #2963 from square/jakew/nullability/2018-11-16
Browse files Browse the repository at this point in the history
Add some missing Nullable annotations
  • Loading branch information
swankjesse authored Nov 16, 2018
2 parents 7dcac1d + a604fe1 commit bc62069
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions retrofit/src/main/java/retrofit2/RequestFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ static RequestFactory parseAnnotations(Retrofit retrofit, Method method) {
private final Method method;
private final HttpUrl baseUrl;
final String httpMethod;
private final String relativeUrl;
private final Headers headers;
private final MediaType contentType;
private final @Nullable String relativeUrl;
private final @Nullable Headers headers;
private final @Nullable MediaType contentType;
private final boolean hasBody;
private final boolean isFormEncoded;
private final boolean isMultipart;
Expand Down Expand Up @@ -138,15 +138,15 @@ static final class Builder {
boolean gotQueryName;
boolean gotQueryMap;
boolean gotUrl;
String httpMethod;
@Nullable String httpMethod;
boolean hasBody;
boolean isFormEncoded;
boolean isMultipart;
String relativeUrl;
Headers headers;
MediaType contentType;
Set<String> relativeUrlParamNames;
ParameterHandler<?>[] parameterHandlers;
@Nullable String relativeUrl;
@Nullable Headers headers;
@Nullable MediaType contentType;
@Nullable Set<String> relativeUrlParamNames;
@Nullable ParameterHandler<?>[] parameterHandlers;

Builder(Retrofit retrofit, Method method) {
this.retrofit = retrofit;
Expand Down Expand Up @@ -314,6 +314,7 @@ private ParameterHandler<?> parseParameter(
return result;
}

@Nullable
private ParameterHandler<?> parseParameterAnnotation(
int p, Type type, Annotation[] annotations, Annotation annotation) {
if (annotation instanceof Url) {
Expand Down

0 comments on commit bc62069

Please sign in to comment.