opendev/gerrit
Code Issues Proposed changes

Move ReviewInput.Comment to abstract class Comment

Browse Source 
This class is used in both CommentInfo and ReviewInput.CommentInput.

Change-Id: I933ec829488d777a11b84aa57108415568950f58
This commit is contained in:
Urs Wolfer
2014-05-02 20:37:50 +02:00
committed by Shawn Pearce
parent 9f9284679e
commit 3ef5d4268c
5 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ReviewInput.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.extensions.api.changes;
import com.google.gerrit.extensions.common.Comment;
import com.google.gerrit.extensions.restapi.DefaultInput;
import java.util.LinkedHashMap;
@@ -26,7 +27,7 @@ public class ReviewInput {
public String message;
public Map<String, Short> labels;
public Map<String, List<Comment>> comments;
public Map<String, List<CommentInput>> comments;
/**
* If true require all labels to be within the user's permitted ranges based
@@ -67,24 +68,7 @@ public class ReviewInput {
NONE, OWNER, OWNER_REVIEWERS, ALL
}
public static enum Side {
PARENT, REVISION
}
public static class Comment {
public String id;
public Side side;
public int line;
public String inReplyTo;
public String message;
public Range range;
public static class Range {
public int startLine;
public int startCharacter;
public int endLine;
public int endCharacter;
}
public static class CommentInput extends Comment {
}
public ReviewInput message(String msg) {

39
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/Comment.java Normal file
View File

@@ -0,0 +1,39 @@
// Copyright (C) 2014 The Android Open Source Project
//
// 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.google.gerrit.extensions.common;
import java.sql.Timestamp;
public abstract class Comment {
public String id;
public String path;
public Side side;
public int line;
public Range range;
public String inReplyTo;
public Timestamp updated;
public String message;
public static enum Side {
PARENT, REVISION
}
public static class Range {
public int startLine;
public int startCharacter;
public int endLine;
public int endCharacter;
}
}

19
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/CommentInfo.java Normal file
View File

@@ -0,0 +1,19 @@
// Copyright (C) 2014 The Android Open Source Project
//
// 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.google.gerrit.extensions.common;
public class CommentInfo extends Comment {
public AccountInfo author;
}