opendev/gerrit
Code Issues Proposed changes

InstallPlugin: Move static Input class to separate class in API

Browse Source 
Change-Id: I9fa66829addde23feaf089be39d1f2285fe8006e
This commit is contained in:
David Pursehouse
2017-07-26 11:52:43 +01:00
parent e253101f5a
commit fbfd17b8b3
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,23 @@
// Copyright (C) 2017 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 com.google.gerrit.extensions.restapi.DefaultInput;
import com.google.gerrit.extensions.restapi.RawInput;
public class InstallPluginInfo {
public @DefaultInput String url;
public RawInput raw;
}

19
gerrit-server/src/main/java/com/google/gerrit/server/plugins/InstallPlugin.java
View File

@@ -16,15 +16,13 @@ package com.google.gerrit.server.plugins;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability;
import com.google.gerrit.extensions.common.InstallPluginInfo;
import com.google.gerrit.extensions.common.PluginInfo;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.DefaultInput;
import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.RawInput;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.gerrit.server.plugins.InstallPlugin.Input;
import com.google.inject.Inject;
import java.io.IOException;
import java.io.InputStream;
@@ -34,12 +32,7 @@ import java.net.URL;
import java.util.zip.ZipException;
@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
class InstallPlugin implements RestModifyView<TopLevelResource, Input> {
static class Input {
@DefaultInput String url;
RawInput raw;
}
class InstallPlugin implements RestModifyView<TopLevelResource, InstallPluginInfo> {
private final PluginLoader loader;
private final String name;
private final boolean created;
@@ -51,7 +44,7 @@ class InstallPlugin implements RestModifyView<TopLevelResource, Input> {
}
@Override
public Response<PluginInfo> apply(TopLevelResource resource, Input input)
public Response<PluginInfo> apply(TopLevelResource resource, InstallPluginInfo input)
throws BadRequestException, MethodNotAllowedException, IOException {
if (!loader.isRemoteAdminEnabled()) {
throw new MethodNotAllowedException("remote installation is disabled");
@@ -78,7 +71,7 @@ class InstallPlugin implements RestModifyView<TopLevelResource, Input> {
}
}
private InputStream openStream(Input input) throws IOException, BadRequestException {
private InputStream openStream(InstallPluginInfo input) throws IOException, BadRequestException {
if (input.raw != null) {
return input.raw.getInputStream();
}
@@ -90,7 +83,7 @@ class InstallPlugin implements RestModifyView<TopLevelResource, Input> {
}
@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
static class Overwrite implements RestModifyView<PluginResource, Input> {
static class Overwrite implements RestModifyView<PluginResource, InstallPluginInfo> {
private final PluginLoader loader;
@Inject
@@ -99,7 +92,7 @@ class InstallPlugin implements RestModifyView<TopLevelResource, Input> {
}
@Override
public Response<PluginInfo> apply(PluginResource resource, Input input)
public Response<PluginInfo> apply(PluginResource resource, InstallPluginInfo input)
throws BadRequestException, MethodNotAllowedException, IOException {
return new InstallPlugin(loader, resource.getName(), false)
.apply(TopLevelResource.INSTANCE, input);