Merge "Split the ChangeHooks interface in 2"
This commit is contained in:
commit
f39eb0617e
@ -29,8 +29,8 @@ import com.google.gerrit.acceptance.GitUtil;
|
|||||||
import com.google.gerrit.acceptance.PushOneCommit;
|
import com.google.gerrit.acceptance.PushOneCommit;
|
||||||
import com.google.gerrit.acceptance.RestResponse;
|
import com.google.gerrit.acceptance.RestResponse;
|
||||||
import com.google.gerrit.acceptance.SshSession;
|
import com.google.gerrit.acceptance.SshSession;
|
||||||
import com.google.gerrit.common.ChangeHooks;
|
|
||||||
import com.google.gerrit.common.EventListener;
|
import com.google.gerrit.common.EventListener;
|
||||||
|
import com.google.gerrit.common.EventSource;
|
||||||
import com.google.gerrit.extensions.api.changes.ReviewInput;
|
import com.google.gerrit.extensions.api.changes.ReviewInput;
|
||||||
import com.google.gerrit.extensions.api.changes.SubmitInput;
|
import com.google.gerrit.extensions.api.changes.SubmitInput;
|
||||||
import com.google.gerrit.extensions.client.ChangeStatus;
|
import com.google.gerrit.extensions.client.ChangeStatus;
|
||||||
@ -98,13 +98,13 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
|
|||||||
private IdentifiedUser.GenericFactory factory;
|
private IdentifiedUser.GenericFactory factory;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
ChangeHooks hooks;
|
EventSource source;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() throws Exception {
|
public void setUp() throws Exception {
|
||||||
mergeResults = Maps.newHashMap();
|
mergeResults = Maps.newHashMap();
|
||||||
CurrentUser listenerUser = factory.create(user.id);
|
CurrentUser listenerUser = factory.create(user.id);
|
||||||
hooks.addEventListener(new EventListener() {
|
source.addEventListener(new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) {
|
public void onEvent(Event event) {
|
||||||
|
@ -86,7 +86,8 @@ import java.util.concurrent.TimeoutException;
|
|||||||
|
|
||||||
/** Spawns local executables when a hook action occurs. */
|
/** Spawns local executables when a hook action occurs. */
|
||||||
@Singleton
|
@Singleton
|
||||||
public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
|
public class ChangeHookRunner implements ChangeHooks, EventSource,
|
||||||
|
LifecycleListener {
|
||||||
/** A logger for this class. */
|
/** A logger for this class. */
|
||||||
private static final Logger log = LoggerFactory.getLogger(ChangeHookRunner.class);
|
private static final Logger log = LoggerFactory.getLogger(ChangeHookRunner.class);
|
||||||
|
|
||||||
@ -95,6 +96,7 @@ public class ChangeHookRunner implements ChangeHooks, LifecycleListener {
|
|||||||
protected void configure() {
|
protected void configure() {
|
||||||
bind(ChangeHookRunner.class);
|
bind(ChangeHookRunner.class);
|
||||||
bind(ChangeHooks.class).to(ChangeHookRunner.class);
|
bind(ChangeHooks.class).to(ChangeHookRunner.class);
|
||||||
|
bind(EventSource.class).to(ChangeHookRunner.class);
|
||||||
listener().to(ChangeHookRunner.class);
|
listener().to(ChangeHookRunner.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,6 @@ import com.google.gerrit.reviewdb.client.Change;
|
|||||||
import com.google.gerrit.reviewdb.client.PatchSet;
|
import com.google.gerrit.reviewdb.client.PatchSet;
|
||||||
import com.google.gerrit.reviewdb.client.Project;
|
import com.google.gerrit.reviewdb.client.Project;
|
||||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||||
import com.google.gerrit.server.CurrentUser;
|
|
||||||
import com.google.gerrit.server.events.Event;
|
import com.google.gerrit.server.events.Event;
|
||||||
import com.google.gwtorm.server.OrmException;
|
import com.google.gwtorm.server.OrmException;
|
||||||
|
|
||||||
@ -34,10 +33,6 @@ import java.util.Set;
|
|||||||
|
|
||||||
/** Invokes hooks on server actions. */
|
/** Invokes hooks on server actions. */
|
||||||
public interface ChangeHooks {
|
public interface ChangeHooks {
|
||||||
public void addEventListener(EventListener listener, CurrentUser user);
|
|
||||||
|
|
||||||
public void removeEventListener(EventListener listener);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fire the Patchset Created Hook.
|
* Fire the Patchset Created Hook.
|
||||||
*
|
*
|
||||||
|
@ -32,7 +32,7 @@ import java.util.Map;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
/** Does not invoke hooks. */
|
/** Does not invoke hooks. */
|
||||||
public final class DisabledChangeHooks implements ChangeHooks {
|
public final class DisabledChangeHooks implements ChangeHooks, EventSource {
|
||||||
@Override
|
@Override
|
||||||
public void addEventListener(EventListener listener, CurrentUser user) {
|
public void addEventListener(EventListener listener, CurrentUser user) {
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,24 @@
|
|||||||
|
// 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.common;
|
||||||
|
|
||||||
|
import com.google.gerrit.server.CurrentUser;
|
||||||
|
|
||||||
|
/** Distributes Events to ChangeListeners. Register listeners here. */
|
||||||
|
public interface EventSource {
|
||||||
|
public void addEventListener(EventListener listener, CurrentUser user);
|
||||||
|
|
||||||
|
public void removeEventListener(EventListener listener);
|
||||||
|
}
|
@ -16,8 +16,8 @@ package com.google.gerrit.sshd.commands;
|
|||||||
|
|
||||||
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
|
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
|
||||||
|
|
||||||
import com.google.gerrit.common.ChangeHooks;
|
|
||||||
import com.google.gerrit.common.EventListener;
|
import com.google.gerrit.common.EventListener;
|
||||||
|
import com.google.gerrit.common.EventSource;
|
||||||
import com.google.gerrit.common.data.GlobalCapability;
|
import com.google.gerrit.common.data.GlobalCapability;
|
||||||
import com.google.gerrit.extensions.annotations.RequiresCapability;
|
import com.google.gerrit.extensions.annotations.RequiresCapability;
|
||||||
import com.google.gerrit.server.IdentifiedUser;
|
import com.google.gerrit.server.IdentifiedUser;
|
||||||
@ -52,7 +52,7 @@ final class StreamEvents extends BaseCommand {
|
|||||||
private IdentifiedUser currentUser;
|
private IdentifiedUser currentUser;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private ChangeHooks hooks;
|
private EventSource source;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
@StreamCommandExecutor
|
@StreamCommandExecutor
|
||||||
@ -132,12 +132,12 @@ final class StreamEvents extends BaseCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
stdout = toPrintWriter(out);
|
stdout = toPrintWriter(out);
|
||||||
hooks.addEventListener(listener, currentUser);
|
source.addEventListener(listener, currentUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onExit(final int rc) {
|
protected void onExit(final int rc) {
|
||||||
hooks.removeEventListener(listener);
|
source.removeEventListener(listener);
|
||||||
|
|
||||||
synchronized (taskLock) {
|
synchronized (taskLock) {
|
||||||
done = true;
|
done = true;
|
||||||
@ -148,7 +148,7 @@ final class StreamEvents extends BaseCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void destroy() {
|
public void destroy() {
|
||||||
hooks.removeEventListener(listener);
|
source.removeEventListener(listener);
|
||||||
|
|
||||||
final boolean exit;
|
final boolean exit;
|
||||||
synchronized (taskLock) {
|
synchronized (taskLock) {
|
||||||
@ -196,7 +196,7 @@ final class StreamEvents extends BaseCommand {
|
|||||||
// destroy() above, or it closed the stream and is no longer
|
// destroy() above, or it closed the stream and is no longer
|
||||||
// accepting output. Either way terminate this instance.
|
// accepting output. Either way terminate this instance.
|
||||||
//
|
//
|
||||||
hooks.removeEventListener(listener);
|
source.removeEventListener(listener);
|
||||||
flush();
|
flush();
|
||||||
onExit(0);
|
onExit(0);
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user