From 3360705577c8bb82d31e593cc5890aebeca063c1 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 05 Sep 2007 22:57:40 +0000
Subject: [PATCH] Improvements to the server-side constraint violation APIs. Now there are just two server-side constraint enforcement call-backs: isUsable and isDeleteAllowed. The first is invoked whenever a managed object is decoded (except in the case where it's about to be deleted). The second is invoked whenever a managed object is about to be deleted. With this change we will now detect constraint violations during server initialization, not just when config change/add/delete events occur.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java | 65 +++++++++++---------------------
1 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java
index e5d9368..77c594d 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java
@@ -57,13 +57,14 @@
* {@inheritDoc}
*/
@Override
- public boolean isAddAcceptable(ServerManagedObject<?> managedObject,
+ public boolean isDeleteAllowed(ServerManagedObject<?> managedObject,
Collection<Message> unacceptableReasons) throws ConfigException {
- if (!allowAdds) {
- unacceptableReasons.add(Message.raw("Adds not allowed"));
+ if (!isDeleteAllowed) {
+ unacceptableReasons
+ .add(Message.raw("Configuration cannot be deleted."));
}
- return allowAdds;
+ return isDeleteAllowed;
}
@@ -72,13 +73,13 @@
* {@inheritDoc}
*/
@Override
- public boolean isDeleteAcceptable(ServerManagedObject<?> managedObject,
+ public boolean isUsable(ServerManagedObject<?> managedObject,
Collection<Message> unacceptableReasons) throws ConfigException {
- if (!allowDeletes) {
- unacceptableReasons.add(Message.raw("Deletes not allowed"));
+ if (!isUsable) {
+ unacceptableReasons.add(Message.raw("Configuration is not usable."));
}
- return allowDeletes;
+ return isUsable;
}
@@ -87,22 +88,7 @@
* {@inheritDoc}
*/
@Override
- public boolean isModifyAcceptable(ServerManagedObject<?> managedObject,
- Collection<Message> unacceptableReasons) throws ConfigException {
- if (!allowModifies) {
- unacceptableReasons.add(Message.raw("Modifies not allowed"));
- }
-
- return allowModifies;
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void performAddPostCondition(ServerManagedObject<?> managedObject)
+ public void performPostAdd(ServerManagedObject<?> managedObject)
throws ConfigException {
// Make sure that the associated config entry exists.
DN targetDN = managedObject.getDN();
@@ -116,7 +102,7 @@
* {@inheritDoc}
*/
@Override
- public void performDeletePostCondition(ServerManagedObject<?> managedObject)
+ public void performPostDelete(ServerManagedObject<?> managedObject)
throws ConfigException {
// Make sure that the associated config entry does not exist.
DN targetDN = managedObject.getDN();
@@ -130,7 +116,7 @@
* {@inheritDoc}
*/
@Override
- public void performModifyPostCondition(ServerManagedObject<?> managedObject)
+ public void performPostModify(ServerManagedObject<?> managedObject)
throws ConfigException {
// Make sure that the associated config entry exists.
DN targetDN = managedObject.getDN();
@@ -140,32 +126,25 @@
}
- // Determines if add operations are allowed.
- private final boolean allowAdds;
-
- // Determines if modify operations are allowed.
- private final boolean allowModifies;
-
// Determines if delete operations are allowed.
- private final boolean allowDeletes;
+ private final boolean isDeleteAllowed;
+
+ // Determines if configurations can be decoded.
+ private final boolean isUsable;
/**
* Creates a new mock constraint.
*
- * @param allowAdds
- * Determines if add operations are allowed.
- * @param allowModifies
- * Determines if modify operations are allowed.
- * @param allowDeletes
+ * @param isUsable
+ * Determines if configurations can be decoded.
+ * @param isDeleteAllowed
* Determines if delete operations are allowed.
*/
- public MockConstraint(boolean allowAdds, boolean allowModifies,
- boolean allowDeletes) {
- this.allowAdds = allowAdds;
- this.allowModifies = allowModifies;
- this.allowDeletes = allowDeletes;
+ public MockConstraint(boolean isUsable, boolean isDeleteAllowed) {
+ this.isUsable = isUsable;
+ this.isDeleteAllowed = isDeleteAllowed;
}
--
Gitblit v1.10.0