You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/08/14 18:35:12 UTC
svn commit: r1695938 - in /qpid/java/trunk/broker-core/src:
main/java/org/apache/qpid/server/binding/
main/java/org/apache/qpid/server/configuration/updater/
main/java/org/apache/qpid/server/model/
main/java/org/apache/qpid/server/security/auth/manager...
Author: kwall
Date: Fri Aug 14 16:35:12 2015
New Revision: 1695938
URL: http://svn.apache.org/r1695938
Log:
QPID-6695: [Java Broker] Refactoring - remove excessive specialisations of Task
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/VoidTask.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/VoidTaskWithException.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java?rev=1695938&r1=1695937&r2=1695938&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/binding/BindingImpl.java Fri Aug 14 16:35:12 2015
@@ -30,7 +30,7 @@ import com.google.common.util.concurrent
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.updater.VoidTask;
+import org.apache.qpid.server.configuration.updater.Task;
import org.apache.qpid.server.exchange.AbstractExchange;
import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.filter.AMQInvalidArgumentException;
@@ -222,13 +222,14 @@ public class BindingImpl
public void setArguments(final Map<String, Object> arguments)
{
- runTask(new VoidTask()
+ runTask(new Task<Void>()
{
@Override
- public void execute()
+ public Void execute()
{
_arguments = arguments;
BindingImpl.super.setAttribute(ARGUMENTS, getActualAttributes().get(ARGUMENTS), arguments);
+ return null;
}
}
);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java?rev=1695938&r1=1695937&r2=1695938&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java Fri Aug 14 16:35:12 2015
@@ -46,12 +46,8 @@ public interface TaskExecutor
void stop();
- void run(VoidTask task) throws CancellationException;
-
<T, E extends Exception> T run(TaskWithException<T, E> task) throws CancellationException, E;
- <E extends Exception> void run(VoidTaskWithException<E> task) throws CancellationException, E;
-
<T> T run(Task<T> task) throws CancellationException;
<T> Future<T> submit(Task<T> task) throws CancellationException;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java?rev=1695938&r1=1695937&r2=1695938&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java Fri Aug 14 16:35:12 2015
@@ -152,20 +152,6 @@ public class TaskExecutorImpl implements
}
}
- @Override
- public void run(final VoidTask task) throws CancellationException
- {
- run(new Task<Void>()
- {
- @Override
- public Void execute()
- {
- task.execute();
- return null;
- }
- });
- }
-
private static class ExceptionTaskWrapper<T, E extends Exception> implements Task<T>
{
private final TaskWithException<T,E> _underlying;
@@ -197,39 +183,6 @@ public class TaskExecutorImpl implements
}
}
-
- private static class ExceptionVoidTaskWrapper<E extends Exception> implements Task<Void>
- {
- private final VoidTaskWithException<E> _underlying;
- private E _exception;
-
- private ExceptionVoidTaskWrapper(final VoidTaskWithException<E> underlying)
- {
- _underlying = underlying;
- }
-
-
- @Override
- public Void execute()
- {
- try
- {
- _underlying.execute();
-
- }
- catch (Exception e)
- {
- _exception = (E) e;
- }
- return null;
- }
-
- E getException()
- {
- return _exception;
- }
- }
-
@Override
public <T, E extends Exception> T run(TaskWithException<T, E> task) throws CancellationException, E
{
@@ -247,17 +200,6 @@ public class TaskExecutorImpl implements
@Override
- public <E extends Exception> void run(VoidTaskWithException<E> task) throws CancellationException, E
- {
- ExceptionVoidTaskWrapper<E> wrapper = new ExceptionVoidTaskWrapper<E>(task);
- run(wrapper);
- if(wrapper.getException() != null)
- {
- throw wrapper.getException();
- }
- }
-
- @Override
public <T> T run(Task<T> task) throws CancellationException
{
try
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1695938&r1=1695937&r2=1695938&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Fri Aug 14 16:35:12 2015
@@ -68,8 +68,6 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.updater.Task;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskWithException;
-import org.apache.qpid.server.configuration.updater.VoidTask;
-import org.apache.qpid.server.configuration.updater.VoidTaskWithException;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.encryption.ConfigurationSecretEncrypter;
@@ -1930,21 +1928,11 @@ public abstract class AbstractConfigured
return _taskExecutor.run(task);
}
- protected void runTask(VoidTask task)
- {
- _taskExecutor.run(task);
- }
-
protected final <T, E extends Exception> T runTask(TaskWithException<T,E> task) throws E
{
return _taskExecutor.run(task);
}
- protected final <E extends Exception> void runTask(VoidTaskWithException<E> task) throws E
- {
- _taskExecutor.run(task);
- }
-
@Override
public void setAttributes(Map<String, Object> attributes) throws IllegalStateException, AccessControlException, IllegalArgumentException
{
@@ -2184,15 +2172,16 @@ public abstract class AbstractConfigured
{
final Map<String,Object> updateAttributes = new HashMap<>(attributes);
Object desiredState = updateAttributes.remove(ConfiguredObject.DESIRED_STATE);
- runTask(new VoidTask()
+ runTask(new Task<Void>()
{
@Override
- public void execute()
+ public Void execute()
{
authoriseSetAttributes(createProxyForValidation(attributes), attributes.keySet());
validateChange(createProxyForValidation(attributes), attributes.keySet());
changeAttributes(updateAttributes);
+ return null;
}
});
if(desiredState != null)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java?rev=1695938&r1=1695937&r2=1695938&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java Fri Aug 14 16:35:12 2015
@@ -36,7 +36,7 @@ import com.google.common.util.concurrent
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.configuration.updater.Task;
-import org.apache.qpid.server.configuration.updater.VoidTaskWithException;
+import org.apache.qpid.server.configuration.updater.TaskWithException;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
@@ -139,16 +139,17 @@ public abstract class ConfigModelPasswor
@Override
public void setPassword(final String username, final String password) throws AccountNotFoundException
{
- runTask(new VoidTaskWithException<AccountNotFoundException>()
+ runTask(new TaskWithException<Void, AccountNotFoundException>()
{
@Override
- public void execute() throws AccountNotFoundException
+ public Void execute() throws AccountNotFoundException
{
final ManagedUser authUser = getUser(username);
if (authUser != null)
{
authUser.setPassword(password);
+ return null;
}
else
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java?rev=1695938&r1=1695937&r2=1695938&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java Fri Aug 14 16:35:12 2015
@@ -33,7 +33,7 @@ import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.updater.VoidTask;
+import org.apache.qpid.server.configuration.updater.Task;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -51,12 +51,13 @@ public class GenericRecoverer
public void recover(final List<ConfiguredObjectRecord> records)
{
- _root.getTaskExecutor().run(new VoidTask()
+ _root.getTaskExecutor().run(new Task<Void>()
{
@Override
- public void execute()
+ public Void execute()
{
performRecover(records);
+ return null;
}
@Override
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java?rev=1695938&r1=1695937&r2=1695938&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/CurrentThreadTaskExecutor.java Fri Aug 14 16:35:12 2015
@@ -74,13 +74,6 @@ public class CurrentThreadTaskExecutor i
}
@Override
- public void run(final VoidTask task) throws CancellationException
- {
- checkThread();
- task.execute();
- }
-
- @Override
public <T, E extends Exception> T run(final TaskWithException<T, E> task) throws CancellationException, E
{
checkThread();
@@ -88,13 +81,6 @@ public class CurrentThreadTaskExecutor i
}
@Override
- public <E extends Exception> void run(final VoidTaskWithException<E> task) throws CancellationException, E
- {
- checkThread();
- task.execute();
- }
-
- @Override
public <T> T run(final Task<T> task) throws CancellationException
{
checkThread();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org