-
Notifications
You must be signed in to change notification settings - Fork 117
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Motivation: The libthrift is not stable enough yet, we need two diffrent jars to compile. If we use HTTP API, we can avoid that situation and have fewer depedencies for the client library. Modifications: - Revise admin REST APIs - Add more APIs to cover all of the features in Thrift service Result: - We are ready to transfer from Thrift to HTTP API Todos: - Catch more exceptions and respond it with proper status - Add meaningful reponse body corresponding to the invalid requests - Gather scattered exception handling _ Remove admin package or keep it minumun - Remove thrift service ultimately
- Loading branch information
Showing
42 changed files
with
3,637 additions
and
207 deletions.
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
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
74 changes: 74 additions & 0 deletions
74
common/src/main/java/com/linecorp/centraldogma/internal/httpapi/v1/ChangeDto.java
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 2017 LINE Corporation | ||
| * | ||
| * LINE Corporation licenses this file to you 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.linecorp.centraldogma.internal.httpapi.v1; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
| import com.fasterxml.jackson.annotation.JsonInclude.Include; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.google.common.base.MoreObjects; | ||
| import com.google.common.base.MoreObjects.ToStringHelper; | ||
|
|
||
| import com.linecorp.centraldogma.common.ChangeType; | ||
|
|
||
| @JsonInclude(Include.NON_DEFAULT) | ||
| public class ChangeDto<T> { | ||
|
|
||
| private final String path; | ||
|
|
||
| private final ChangeType type; | ||
|
|
||
| @Nullable | ||
| private final T content; | ||
|
|
||
| @JsonCreator | ||
| public ChangeDto(String path, ChangeType type, @Nullable T content) { | ||
| this.path = requireNonNull(path, "path"); | ||
| this.type = requireNonNull(type, "type"); | ||
| this.content = content; | ||
| } | ||
|
|
||
| @JsonProperty("path") | ||
| public String path() { | ||
| return path; | ||
| } | ||
|
|
||
| @JsonProperty("type") | ||
| public ChangeType type() { | ||
| return type; | ||
| } | ||
|
|
||
| @JsonProperty("content") | ||
| public T content() { | ||
| return content; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| final ToStringHelper stringHelper = MoreObjects.toStringHelper(this) | ||
| .add("path", path()) | ||
| .add("type", type()); | ||
| if (content() != null) { | ||
| stringHelper.add("content", content()); | ||
| } | ||
| return stringHelper.toString(); | ||
| } | ||
| } |
80 changes: 80 additions & 0 deletions
80
common/src/main/java/com/linecorp/centraldogma/internal/httpapi/v1/CommitDto.java
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,80 @@ | ||
| /* | ||
| * Copyright 2017 LINE Corporation | ||
| * | ||
| * LINE Corporation licenses this file to you 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.linecorp.centraldogma.internal.httpapi.v1; | ||
|
|
||
| import static java.time.format.DateTimeFormatter.ISO_INSTANT; | ||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| import java.time.Instant; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.google.common.base.MoreObjects; | ||
|
|
||
| import com.linecorp.centraldogma.common.Author; | ||
| import com.linecorp.centraldogma.common.Commit; | ||
| import com.linecorp.centraldogma.common.Revision; | ||
|
|
||
| public class CommitDto { | ||
|
|
||
| private final Revision revision; | ||
|
|
||
| private final Author author; | ||
|
|
||
| private final CommitMessageDto commitMessage; | ||
|
|
||
| private final String pushedAt; | ||
|
|
||
| @JsonCreator | ||
| public CommitDto(Commit commit) { | ||
| requireNonNull(commit, "commit"); | ||
| revision = commit.revision(); | ||
| author = commit.author(); | ||
| commitMessage = new CommitMessageDto(commit.summary(), commit.detail(), commit.markup()); | ||
| pushedAt = ISO_INSTANT.format(Instant.ofEpochMilli(commit.when())); | ||
| } | ||
|
|
||
| @JsonProperty("revision") | ||
| public Revision revision() { | ||
| return revision; | ||
| } | ||
|
|
||
| @JsonProperty("author") | ||
| public Author author() { | ||
| return author; | ||
| } | ||
|
|
||
| @JsonProperty("pushedAt") | ||
| public String pushedAt() { | ||
| return pushedAt; | ||
| } | ||
|
|
||
| @JsonProperty("commitMessage") | ||
| public CommitMessageDto commitMessage() { | ||
| return commitMessage; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return MoreObjects.toStringHelper(this) | ||
| .add("revision", revision()) | ||
| .add("author", author()) | ||
| .add("commitMessage", commitMessage()) | ||
| .add("pushedAt", pushedAt()) | ||
| .toString(); | ||
| } | ||
| } |
Oops, something went wrong.