Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some missing Nullable annotations #2963

Merged
merged 1 commit into from
Nov 16, 2018
Merged

Add some missing Nullable annotations #2963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions retrofit/src/main/java/retrofit2/RequestFactory.java
View file
Open in desktop
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