From 25602a9f8431d99aaa9a726c0046941de24c520e Mon Sep 17 00:00:00 2001
From: Robert Godfrey
 <rgodfrey@apache.org =  rgodfrey = Robert Godfrey rgodfrey@apache.org@apache.org>
Date: Mon, 14 Apr 2014 17:56:51 +0000
Subject: QPID-5698 : [Java Broker] make the durable attribute automated,
 remove unused setters

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1587262 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugins/ACLFileAccessControlProviderImpl.java  | 43 ++++++++++------------
 1 file changed, 19 insertions(+), 24 deletions(-)

(limited to 'qpid/java/broker-plugins/access-control')

diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
index db2b44c5e6..ae23a308f5 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
@@ -72,40 +72,42 @@ public class ACLFileAccessControlProviderImpl
     }
 
     @Override
-    protected void onOpen()
+    public void validate()
     {
-        super.onOpen();
-        _accessControl = new DefaultAccessControl(getPath(), _broker);
-    }
-
-    @Override
-    public String getPath()
-    {
-        return _path;
+        super.validate();
+        if(!isDurable())
+        {
+            throw new IllegalArgumentException(getClass().getSimpleName() + " must be durable");
+        }
     }
 
     @Override
-    public String setName(String currentName, String desiredName) throws IllegalStateException, AccessControlException
+    protected void validateChange(final ConfiguredObject<?> proxyForValidation, final Set<String> changedAttributes)
     {
-        return null;
+        super.validateChange(proxyForValidation, changedAttributes);
+        if(changedAttributes.contains(DURABLE) && !proxyForValidation.isDurable())
+        {
+            throw new IllegalArgumentException(getClass().getSimpleName() + " must be durable");
+        }
     }
 
     @Override
-    public State getState()
+    protected void onOpen()
     {
-        return _state.get();
+        super.onOpen();
+        _accessControl = new DefaultAccessControl(getPath(), _broker);
     }
 
     @Override
-    public boolean isDurable()
+    public String getPath()
     {
-        return true;
+        return _path;
     }
 
     @Override
-    public void setDurable(boolean durable)
-            throws IllegalStateException, AccessControlException, IllegalArgumentException
+    public State getState()
     {
+        return _state.get();
     }
 
     @Override
@@ -114,13 +116,6 @@ public class ACLFileAccessControlProviderImpl
         return LifetimePolicy.PERMANENT;
     }
 
-    @Override
-    public LifetimePolicy setLifetimePolicy(LifetimePolicy expected, LifetimePolicy desired)
-            throws IllegalStateException, AccessControlException, IllegalArgumentException
-    {
-        return null;
-    }
-
     @Override
     public Collection<String> getAttributeNames()
     {
-- 
cgit v1.2.1