Milestones module development #343
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,7 @@ | |
| import com.github.mobile.accounts.GitHubAccount; | ||
| import com.github.mobile.api.DateAdapter; | ||
| import com.github.mobile.api.RequestConfiguration; | ||
| import com.github.mobile.api.model.Milestone; | ||
| import com.github.mobile.core.commit.CommitStore; | ||
| import com.github.mobile.core.gist.GistStore; | ||
| import com.github.mobile.core.issue.IssueStore; | ||
|
|
@@ -33,6 +34,7 @@ | |
| import com.google.inject.Singleton; | ||
| import com.google.inject.assistedinject.FactoryModuleBuilder; | ||
| import com.google.inject.name.Named; | ||
| import com.squareup.moshi.JsonAdapter; | ||
| import com.squareup.moshi.Moshi; | ||
|
|
||
| import java.io.File; | ||
|
|
@@ -80,8 +82,11 @@ Retrofit retrofit(Provider<GitHubAccount> accountProvider) { | |
| .addInterceptor(new RequestConfiguration(accountProvider)) | ||
| .build(); | ||
|
|
||
| JsonAdapter<Milestone> adapter = | ||
| new Moshi.Builder().add(new DateAdapter()).build().adapter(Milestone.class).serializeNulls(); | ||
| Moshi converter = new Moshi.Builder() | ||
| .add(new DateAdapter()) | ||
| .add(Milestone.class, adapter) | ||
|
There was a problem hiding this comment. Why do you need a custom adapter for milestones? There was a problem hiding this comment. To allow setting null due_date for milestone There was a problem hiding this comment. Can't you achieve the same result by modifying the current There was a problem hiding this comment. No, default adapter for milestones just ignores null properties. There was a problem hiding this comment. No, I mean changing the behavior of https://github.com/jonan/ForkHub/blob/master/app/src/main/java/com/github/mobile/api/DateAdapter.java which is already being used. There was a problem hiding this comment. If we set due_on = null, then DateAdapter is not being called by Milestone adapter because it skips null properties. |
||
| .build(); | ||
|
|
||
| return new Retrofit.Builder() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,10 +15,11 @@ | |
| */ | ||
| package com.github.mobile.api.model; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.Date; | ||
| import java.util.List; | ||
|
|
||
| public class Issue implements Serializable { | ||
| public long id; | ||
|
|
||
| public Repository repository; | ||
|
|
@@ -76,6 +77,10 @@ public org.eclipse.egit.github.core.Issue getOldModel() { | |
| issue.setCreatedAt(created_at); | ||
| issue.setClosedAt(closed_at); | ||
| issue.setUpdatedAt(updated_at); | ||
| if (milestone != null){ | ||
| issue.setMilestone(milestone.getOldModel()); | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Whitespace missing before There was a problem hiding this comment. Fixed in phansier@30048f0 |
||
| if (user != null) { | ||
| issue.setUser(user.getOldModel()); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,9 +15,11 @@ | |
| */ | ||
| package com.github.mobile.api.model; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.Date; | ||
|
|
||
| public class Milestone implements Serializable { | ||
| public static final String MS_STATE_OPEN = "open"; | ||
| public long id; | ||
|
|
||
| public int number; | ||
|
|
@@ -41,4 +43,45 @@ public class Milestone { | |
| public Date closed_at; | ||
|
|
||
| public Date due_on; | ||
|
|
||
| private String url; | ||
|
|
||
| public Milestone() { | ||
| state = MS_STATE_OPEN; | ||
| } | ||
|
|
||
| public Milestone(org.eclipse.egit.github.core.Milestone milestone) { | ||
| //todo this.id=? | ||
| //there are two variants of id usage | ||
| //1)id is like an id in Issues, but it is in old Issues class too - the remove field | ||
| //2)id is like an serialVersionUID - then generate it using "serialver -classpath . Milestone" in terminal | ||
| this.number = milestone.getNumber(); | ||
| this.state = milestone.getState(); | ||
| this.title = milestone.getTitle(); | ||
| this.description = milestone.getDescription(); | ||
| org.eclipse.egit.github.core.User creator = milestone.getCreator(); | ||
| this.creator = creator == null ? null : new User(creator); | ||
| this.open_issues = milestone.getOpenIssues(); | ||
| this.closed_issues = milestone.getClosedIssues(); | ||
| this.created_at = milestone.getCreatedAt(); | ||
| this.url = milestone.getUrl(); | ||
| //todo this.updated_at=??? | ||
| this.due_on = milestone.getDueOn(); | ||
| } | ||
|
There was a problem hiding this comment. Why are you adding this comments here? There was a problem hiding this comment. There is an issue of probably missing some information in transition from old Milestone model to new one. |
||
|
|
||
| public org.eclipse.egit.github.core.Milestone getOldModel() { | ||
| org.eclipse.egit.github.core.Milestone milestone = new org.eclipse.egit.github.core.Milestone(); | ||
| milestone.setCreatedAt(created_at); | ||
| milestone.setDueOn(due_on); | ||
| milestone.setClosedIssues(closed_issues); | ||
| milestone.setNumber(number); | ||
| milestone.setOpenIssues(open_issues); | ||
| milestone.setDescription(description); | ||
| milestone.setState(state); | ||
| milestone.setTitle(title); | ||
| milestone.setUrl(url); | ||
| milestone.setCreator(creator.getOldModel()); | ||
|
|
||
| return milestone; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Copyright 2016 Jon Ander Peñalba | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.github.mobile.api.service; | ||
|
|
||
| import com.github.mobile.api.model.Issue; | ||
| import com.github.mobile.api.model.Milestone; | ||
| import java.util.List; | ||
|
|
||
| import retrofit2.Call; | ||
| import retrofit2.http.Body; | ||
| import retrofit2.http.DELETE; | ||
| import retrofit2.http.GET; | ||
| import retrofit2.http.Headers; | ||
| import retrofit2.http.PATCH; | ||
| import retrofit2.http.POST; | ||
| import retrofit2.http.Path; | ||
| import retrofit2.http.Query; | ||
|
|
||
| public interface MilestoneService { | ||
| @Headers("Accept: application/vnd.github.v3+json") | ||
|
There was a problem hiding this comment. This header is not needed, as we add There was a problem hiding this comment. @tsnik Please take a look, whether we could remove these? |
||
| @GET("repos/{owner}/{repo}/milestones/{number}") | ||
| Call<Milestone> getMilestone( | ||
| @Path("owner") String owner, | ||
| @Path("repo") String repo, | ||
| @Path("number") long number); | ||
|
|
||
| @Headers("Accept: application/vnd.github.v3+json") | ||
| @GET("repos/{owner}/{repo}/milestones") | ||
| Call<List<Milestone>> getMilestones( | ||
| @Path("owner") String owner, | ||
| @Path("repo") String repo); | ||
|
There was a problem hiding this comment. We prefer to fix it in future because it is not the vital problem for milestones |
||
|
|
||
| @Headers("Accept: application/vnd.github.squirrel-girl-preview") | ||
| @GET("repos/{owner}/{repo}/issues") | ||
| Call<List<Issue>> getIssues( | ||
| @Path("owner") String owner, | ||
| @Path("repo") String repo, | ||
| @Query("milestone") long milestone); | ||
|
There was a problem hiding this comment. We prefer to fix it in future because it is not the vital problem for milestones |
||
|
|
||
| @Headers("Accept: application/vnd.github.v3+json") | ||
| @POST("repos/{owner}/{repo}/milestones") | ||
| Call<Milestone> createMilestone ( | ||
| @Path("owner") String owner, | ||
| @Path("repo") String repo, | ||
| @Body Milestone milestone); | ||
|
|
||
| @Headers("Accept: application/vnd.github.v3+json") | ||
| @PATCH("repos/{owner}/{repo}/milestones/{number}") | ||
| Call<Milestone> editMilestone ( | ||
| @Path("owner") String owner, | ||
| @Path("repo") String repo, | ||
| @Path("number") long number, | ||
| @Body Milestone milestone); | ||
|
|
||
| @Headers("Accept: application/vnd.github.v3+json") | ||
| @DELETE("repos/{owner}/{repo}/milestones/{number}") | ||
| Call<Milestone> deleteMilestone( | ||
| @Path("owner") String owner, | ||
| @Path("repo") String repo, | ||
| @Path("number") long number); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be done removing the old
org.eclipse.egit.github.core.Milestonecode, simply creating the milestone with the new model object.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in phansier@9e5ae56
If OK, will be merged to PR