mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-07-01 00:19:44 +02:00
improve listener support
This commit is contained in:
@@ -29,8 +29,14 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
package sonia.scm;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Sebastian Sdorra
|
||||
@@ -48,6 +54,14 @@ public interface ListenerSupport<T>
|
||||
*/
|
||||
public void addListener(T listener);
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @param listeners
|
||||
*/
|
||||
public void addListeners(Collection<T> listeners);
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
|
||||
@@ -39,6 +39,7 @@ import sonia.scm.HandlerEvent;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -61,6 +62,18 @@ public abstract class AbstractGroupManager implements GroupManager
|
||||
listenerSet.add(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @param listeners
|
||||
*/
|
||||
@Override
|
||||
public void addListeners(Collection<GroupListener> listeners)
|
||||
{
|
||||
listenerSet.addAll(listeners);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
|
||||
@@ -36,11 +36,13 @@ package sonia.scm.group;
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import sonia.scm.HandlerEvent;
|
||||
import sonia.scm.plugin.ExtensionPoint;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Sebastian Sdorra
|
||||
*/
|
||||
@ExtensionPoint
|
||||
public interface GroupListener
|
||||
{
|
||||
|
||||
|
||||
@@ -48,6 +48,7 @@ import sonia.scm.store.StoreFactory;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -102,6 +103,18 @@ public abstract class AbstractRepositoryHandler<C extends SimpleRepositoryConfig
|
||||
listenerSet.add(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @param listeners
|
||||
*/
|
||||
@Override
|
||||
public void addListeners(Collection<ConfigChangedListener> listeners)
|
||||
{
|
||||
listenerSet.addAll(listeners);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
|
||||
@@ -29,11 +29,17 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
package sonia.scm.repository;
|
||||
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import sonia.scm.HandlerEvent;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import sonia.scm.HandlerEvent;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -56,6 +62,18 @@ public abstract class AbstractRepositoryManager implements RepositoryManager
|
||||
listenerSet.add(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @param listeners
|
||||
*/
|
||||
@Override
|
||||
public void addListeners(Collection<RepositoryListener> listeners)
|
||||
{
|
||||
listenerSet.addAll(listeners);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
|
||||
@@ -29,18 +29,20 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
package sonia.scm.repository;
|
||||
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import sonia.scm.SCMContextProvider;
|
||||
import sonia.scm.Type;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import java.util.Collection;
|
||||
import sonia.scm.Type;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -61,6 +63,8 @@ public abstract class AbstractRepositoryManagerDecorator
|
||||
this.orginal = orginal;
|
||||
}
|
||||
|
||||
//~--- methods --------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
@@ -73,6 +77,18 @@ public abstract class AbstractRepositoryManagerDecorator
|
||||
orginal.addListener(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @param listeners
|
||||
*/
|
||||
@Override
|
||||
public void addListeners(Collection<RepositoryListener> listeners)
|
||||
{
|
||||
orginal.addListeners(listeners);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
|
||||
@@ -29,14 +29,20 @@
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
package sonia.scm.repository;
|
||||
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import sonia.scm.HandlerEvent;
|
||||
import sonia.scm.plugin.ExtensionPoint;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Sebastian Sdorra
|
||||
*/
|
||||
@ExtensionPoint
|
||||
public interface RepositoryListener
|
||||
{
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@ import sonia.scm.HandlerEvent;
|
||||
|
||||
//~--- JDK imports ------------------------------------------------------------
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -61,6 +62,18 @@ public abstract class AbstractUserManager implements UserManager
|
||||
listenerSet.add(listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @param listeners
|
||||
*/
|
||||
@Override
|
||||
public void addListeners(Collection<UserListener> listeners)
|
||||
{
|
||||
listenerSet.addAll(listeners);
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
|
||||
@@ -36,11 +36,13 @@ package sonia.scm.user;
|
||||
//~--- non-JDK imports --------------------------------------------------------
|
||||
|
||||
import sonia.scm.HandlerEvent;
|
||||
import sonia.scm.plugin.ExtensionPoint;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Sebastian Sdorra
|
||||
*/
|
||||
@ExtensionPoint
|
||||
public interface UserListener
|
||||
{
|
||||
|
||||
|
||||
@@ -42,10 +42,13 @@ import com.google.inject.multibindings.Multibinder;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import sonia.scm.group.GroupListener;
|
||||
import sonia.scm.plugin.ext.Extension;
|
||||
import sonia.scm.plugin.ext.ExtensionProcessor;
|
||||
import sonia.scm.repository.RepositoryHandler;
|
||||
import sonia.scm.repository.RepositoryListener;
|
||||
import sonia.scm.security.EncryptionHandler;
|
||||
import sonia.scm.user.UserListener;
|
||||
import sonia.scm.web.security.AuthenticationHandler;
|
||||
import sonia.scm.web.security.XmlAuthenticationHandler;
|
||||
|
||||
@@ -125,6 +128,40 @@ public class BindingExtensionProcessor implements ExtensionProcessor
|
||||
binder.bind(extensionClass);
|
||||
authenticators.addBinding().to(extensionClass);
|
||||
}
|
||||
else if (GroupListener.class.isAssignableFrom(extensionClass))
|
||||
{
|
||||
if (logger.isInfoEnabled())
|
||||
{
|
||||
logger.info("bind GroupListener {}", extensionClass.getName());
|
||||
}
|
||||
|
||||
GroupListener listener = (GroupListener) extensionClass.newInstance();
|
||||
|
||||
groupListeners.add(listener);
|
||||
}
|
||||
else if (UserListener.class.isAssignableFrom(extensionClass))
|
||||
{
|
||||
if (logger.isInfoEnabled())
|
||||
{
|
||||
logger.info("bind UserListener {}", extensionClass.getName());
|
||||
}
|
||||
|
||||
UserListener listener = (UserListener) extensionClass.newInstance();
|
||||
|
||||
userListeners.add(listener);
|
||||
}
|
||||
else if (RepositoryListener.class.isAssignableFrom(extensionClass))
|
||||
{
|
||||
if (logger.isInfoEnabled())
|
||||
{
|
||||
logger.info("bind RepositoryListener {}", extensionClass.getName());
|
||||
}
|
||||
|
||||
RepositoryListener listener =
|
||||
(RepositoryListener) extensionClass.newInstance();
|
||||
|
||||
repositoryListeners.add(listener);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (logger.isInfoEnabled())
|
||||
@@ -169,6 +206,17 @@ public class BindingExtensionProcessor implements ExtensionProcessor
|
||||
|
||||
//~--- get methods ----------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Set<GroupListener> getGroupListeners()
|
||||
{
|
||||
return groupListeners;
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
@@ -180,6 +228,28 @@ public class BindingExtensionProcessor implements ExtensionProcessor
|
||||
return moduleSet;
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Set<RepositoryListener> getRepositoryListeners()
|
||||
{
|
||||
return repositoryListeners;
|
||||
}
|
||||
|
||||
/**
|
||||
* Method description
|
||||
*
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Set<UserListener> getUserListeners()
|
||||
{
|
||||
return userListeners;
|
||||
}
|
||||
|
||||
//~--- methods --------------------------------------------------------------
|
||||
|
||||
/**
|
||||
@@ -219,8 +289,7 @@ public class BindingExtensionProcessor implements ExtensionProcessor
|
||||
{
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("bind Authenticator {}", type.getName(),
|
||||
bindingType.getName());
|
||||
logger.debug("bind {} of type {}", type.getName(), bindingType.getName());
|
||||
}
|
||||
|
||||
binder.bind(type).to(bindingType);
|
||||
@@ -233,4 +302,14 @@ public class BindingExtensionProcessor implements ExtensionProcessor
|
||||
|
||||
/** Field description */
|
||||
private Set<Module> moduleSet;
|
||||
|
||||
/** Field description */
|
||||
private Set<RepositoryListener> repositoryListeners =
|
||||
new HashSet<RepositoryListener>();
|
||||
|
||||
/** Field description */
|
||||
private Set<UserListener> userListeners = new HashSet<UserListener>();
|
||||
|
||||
/** Field description */
|
||||
private Set<GroupListener> groupListeners = new HashSet<GroupListener>();
|
||||
}
|
||||
|
||||
@@ -125,13 +125,23 @@ public class ScmContextListener extends GuiceServletContextListener
|
||||
injector.getInstance(StoreFactory.class).init(context);
|
||||
|
||||
// init RepositoryManager
|
||||
injector.getInstance(RepositoryManager.class).init(context);
|
||||
RepositoryManager repositoryManager =
|
||||
injector.getInstance(RepositoryManager.class);
|
||||
|
||||
repositoryManager.addListeners(bindExtProcessor.getRepositoryListeners());
|
||||
repositoryManager.init(context);
|
||||
|
||||
// init UserManager
|
||||
injector.getInstance(UserManager.class).init(context);
|
||||
UserManager userManager = injector.getInstance(UserManager.class);
|
||||
|
||||
userManager.addListeners(bindExtProcessor.getUserListeners());
|
||||
userManager.init(context);
|
||||
|
||||
// init GroupManager
|
||||
injector.getInstance(GroupManager.class).init(context);
|
||||
GroupManager groupManager = injector.getInstance(GroupManager.class);
|
||||
|
||||
groupManager.addListeners(bindExtProcessor.getGroupListeners());
|
||||
groupManager.init(context);
|
||||
|
||||
// init Authenticator
|
||||
injector.getInstance(AuthenticationManager.class).init(context);
|
||||
|
||||
Reference in New Issue
Block a user