opendev/gerrit
Code Issues Proposed changes

Extensions GWT API: Align rule with package boundaries

Browse Source 
Plugins need to be adapted to import the classes from the new client
package.

Change-Id: I9c3533410fbfceebcdf4d7d899513d14ea1f0f34
This commit is contained in:
David Ostrovsky
2015-01-23 23:40:11 +01:00
committed by David Pursehouse
parent 6f560ffbdd
commit 7a722f73fd
108 changed files with 163 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gerrit-extension-api/BUCK
View File

@@ -1,31 +1,19 @@
SRC = 'src/main/java/com/google/gerrit/extensions/'
SRCS = glob([SRC + '**/*.java'])
# TODO(davido): align this rule with package boundaries.
# This would probably affect quite some plugins, though.
CLIENT_SRCS = [SRC + n for n in [
'api/projects/ProjectState.java',
'common/ChangeStatus.java',
'common/Comment.java',
'common/InheritableBoolean.java',
'common/ListChangesOption.java',
'common/Side.java',
'common/SubmitType.java',
'common/Theme.java',
'webui/GerritTopMenu.java',
]]
EXT_API_SRCS = glob([SRC + 'client/*.java'])
gwt_module(
name = 'client',
srcs = glob(CLIENT_SRCS),
srcs = EXT_API_SRCS,
gwt_xml = SRC + 'Extensions.gwt.xml',
visibility = ['PUBLIC'],
)
java_library(
name = 'client-lib',
srcs = glob(CLIENT_SRCS),
resources = glob(CLIENT_SRCS + [SRC + 'Extensions.gwt.xml']),
srcs = EXT_API_SRCS,
resources = EXT_API_SRCS + glob([SRC + 'Extensions.gwt.xml']),
visibility = ['PUBLIC'],
)

4
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/Extensions.gwt.xml
View File

@@ -14,7 +14,5 @@
limitations under the License.
-->
<module>
<source path='api' />
<source path='common' />
<source path='webui' />
<source path='client' />
</module>

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java
View File

@@ -14,8 +14,8 @@
package com.google.gerrit.extensions.api.changes;
import com.google.gerrit.extensions.client.ListChangesOption;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.ListChangesOption;
import com.google.gerrit.extensions.common.SuggestedReviewerInfo;
import com.google.gerrit.extensions.restapi.NotImplementedException;
import com.google.gerrit.extensions.restapi.RestApiException;

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java
View File

@@ -14,8 +14,8 @@
package com.google.gerrit.extensions.api.changes;
import com.google.gerrit.extensions.client.ListChangesOption;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.ListChangesOption;
import com.google.gerrit.extensions.restapi.NotImplementedException;
import com.google.gerrit.extensions.restapi.RestApiException;

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftInput.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.extensions.api.changes;
import com.google.gerrit.extensions.common.Comment;
import com.google.gerrit.extensions.client.Comment;
public class DraftInput extends Comment {
}

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

@@ -14,7 +14,7 @@
package com.google.gerrit.extensions.api.changes;
import com.google.gerrit.extensions.common.Comment;
import com.google.gerrit.extensions.client.Comment;
import com.google.gerrit.extensions.restapi.DefaultInput;
import java.util.LinkedHashMap;

4
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectInput.java
View File

@@ -14,8 +14,8 @@
package com.google.gerrit.extensions.api.projects;
import com.google.gerrit.extensions.common.InheritableBoolean;
import com.google.gerrit.extensions.common.SubmitType;
import com.google.gerrit.extensions.client.InheritableBoolean;
import com.google.gerrit.extensions.client.SubmitType;
import java.util.List;
import java.util.Map;

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeStatus.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ChangeStatus.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.common;
package com.google.gerrit.extensions.client;
/* Current state within the basic workflow of the change **/
public enum ChangeStatus {

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/Comment.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Comment.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.common;
package com.google.gerrit.extensions.client;
import java.sql.Timestamp;

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/GerritTopMenu.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/GerritTopMenu.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.webui;
package com.google.gerrit.extensions.client;
public enum GerritTopMenu {
ALL, MY, DIFFERENCES, PROJECTS, PEOPLE, PLUGINS, DOCUMENTATION;

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/InheritableBoolean.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/InheritableBoolean.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.common;
package com.google.gerrit.extensions.client;
public enum InheritableBoolean {
TRUE,

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ListChangesOption.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ListChangesOption.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.common;
package com.google.gerrit.extensions.client;
import java.util.EnumSet;

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectState.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/ProjectState.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.api.projects;
package com.google.gerrit.extensions.client;
public enum ProjectState {
ACTIVE,

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/Side.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Side.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.common;
package com.google.gerrit.extensions.client;
public enum Side {
PARENT, REVISION

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/SubmitType.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/SubmitType.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.common;
package com.google.gerrit.extensions.client;
public enum SubmitType {
FAST_FORWARD_ONLY,

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/Theme.java → gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/Theme.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.extensions.common;
package com.google.gerrit.extensions.client;
public enum Theme {
// Light themes

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeInfo.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.extensions.common;
import com.google.gerrit.extensions.client.ChangeStatus;
import java.sql.Timestamp;
import java.util.Collection;
import java.util.List;

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

@@ -14,6 +14,8 @@
package com.google.gerrit.extensions.common;
import com.google.gerrit.extensions.client.Comment;
public class CommentInfo extends Comment {
public AccountInfo author;
}

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/MergeableInfo.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.extensions.common;
import com.google.gerrit.extensions.client.SubmitType;
import java.util.List;
public class MergeableInfo {

2
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ProjectInfo.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.extensions.common;
import com.google.gerrit.extensions.api.projects.ProjectState;
import com.google.gerrit.extensions.client.ProjectState;
import java.util.List;
import java.util.Map;

1
gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TopMenu.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.extensions.webui;
import com.google.gerrit.extensions.annotations.ExtensionPoint;
import com.google.gerrit.extensions.client.GerritTopMenu;
import java.util.List;