From f67a22ea8d1388eeea8c2d56635ba92079ed9f8c Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Apr 2015 08:54:20 +0000
Subject: [PATCH] OPENDJ-1929 Remove max block size in control panel
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java | 5 --
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 2
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java | 18 +--------
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 49 ------------------------
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 11 +----
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java | 2
6 files changed, 8 insertions(+), 79 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
index 02fd0db..5337dcf 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
@@ -44,7 +44,6 @@
private final SearchScope scope;
private final String filter;
private List<VLVSortOrder> sortOrder = Collections.emptyList();
- private final int maxBlockSize;
private int hashCode;
/**
@@ -62,18 +61,15 @@
* the filter or the search indexed by the VLV index.
* @param sortOrder
* the sort order list of the VLV index.
- * @param maxBlockSize
- * the maximum block size of the VLV index.
*/
public VLVIndexDescriptor(String name, BackendDescriptor backend, DN baseDN, SearchScope scope, String filter,
- List<VLVSortOrder> sortOrder, int maxBlockSize)
+ List<VLVSortOrder> sortOrder)
{
super(name, backend);
this.baseDN = baseDN;
this.scope = scope;
this.filter = filter;
this.sortOrder = Collections.unmodifiableList(sortOrder);
- this.maxBlockSize = maxBlockSize;
recalculateHashCode();
}
@@ -173,17 +169,7 @@
{
sb.append(getBackend().getBackendID());
}
- hashCode = (getName()+baseDN+scope+filter+sb+maxBlockSize).hashCode();
- }
-
- /**
- * Returns the maximum block size of the VLV index.
- *
- * @return the maximum block size of the VLV index.
- */
- public int getMaxBlockSize()
- {
- return maxBlockSize;
+ hashCode = (getName()+baseDN+scope+filter+sb).hashCode();
}
/**
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
index dd36296..6e81f24 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -76,8 +76,6 @@
import org.opends.guitools.controlpanel.ui.renderer.VLVSortOrderRenderer;
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.admin.DefinedDefaultBehaviorProvider;
-import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;
@@ -137,8 +135,6 @@
/** Filter text field. */
protected final JTextField filter = Utilities.createLongTextField();
- /** Max block size text field. */
- protected final JTextField maxBlockSize = Utilities.createShortTextField();
/** Attributes combo box. */
protected final JComboBox attributes = Utilities.createComboBox();
@@ -188,22 +184,6 @@
/** The list of custom attribute names. */
private final TreeSet<String> customAttrNames = new TreeSet<String>(new LowerCaseComparator());
- private final int defaultVLVEntryLimitValue;
- {
- DefinedDefaultBehaviorProvider<Integer> provider =
- (DefinedDefaultBehaviorProvider<Integer>) LocalDBVLVIndexCfgDefn.getInstance()
- .getMaxBlockSizePropertyDefinition().getDefaultBehaviorProvider();
- defaultVLVEntryLimitValue = Integer.parseInt(provider.getDefaultValues().iterator().next());
- }
-
- /** Minimum value for max block size. */
- private final int MIN_MAX_BLOCK_SIZE = LocalDBVLVIndexCfgDefn.getInstance().getMaxBlockSizePropertyDefinition()
- .getLowerLimit();
- /** Maximum value for max block size. */
- private final int MAX_MAX_BLOCK_SIZE = 2147483647;
- /** Default value for max block size. */
- private final int DEFAULT_MAX_BLOCK_SIZE = defaultVLVEntryLimitValue;
-
/**
* Constructor.
*
@@ -252,7 +232,6 @@
lines.add("ds-cfg-sort-order: " + getSortOrderStringValue(getSortOrder()));
lines.add("ds-cfg-base-dn: " + getBaseDN());
lines.add("ds-cfg-scope: " + VLVIndexDescriptor.getLocalDBVLVIndexScope(getScope()));
- lines.add("ds-cfg-max-block-size: " + maxBlockSize.getText().trim());
StringBuilder sb = new StringBuilder();
for (String line : lines)
{
@@ -701,22 +680,6 @@
setPrimaryInvalid(lSortOrder);
}
- String v = maxBlockSize.getText();
- try
- {
- int n = Integer.parseInt(v);
- if (n < MIN_MAX_BLOCK_SIZE || n > MAX_MAX_BLOCK_SIZE)
- {
- errors.add(ERR_CTRL_PANEL_INVALID_MAX_BLOCK_SIZE_FOR_VLV_PROVIDED.get(MIN_MAX_BLOCK_SIZE, MAX_MAX_BLOCK_SIZE));
- setPrimaryInvalid(lMaxBlockSize);
- }
- }
- catch (Throwable t)
- {
- errors.add(ERR_CTRL_PANEL_INVALID_MAX_BLOCK_SIZE_FOR_VLV_PROVIDED.get(MIN_MAX_BLOCK_SIZE, MAX_MAX_BLOCK_SIZE));
- setPrimaryInvalid(lMaxBlockSize);
- }
-
return errors;
}
@@ -907,18 +870,6 @@
gbc.insets.left = 0;
gbc.gridx = 0;
gbc.gridwidth = 1;
- c.add(lMaxBlockSize, gbc);
- gbc.insets.left = 10;
- gbc.gridx = 1;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- c.add(maxBlockSize, gbc);
- maxBlockSize.setText(String.valueOf(DEFAULT_MAX_BLOCK_SIZE));
- gbc.gridy++;
-
- gbc.insets.top = 10;
- gbc.insets.left = 0;
- gbc.gridx = 0;
- gbc.gridwidth = 1;
c.add(lSortOrder, gbc);
gbc.fill = GridBagConstraints.HORIZONTAL;
gbc.insets.left = 10;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
index 5e4b575..fd9280c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -172,7 +172,6 @@
private final String backendID;
private final String ldif;
private final String sortOrderStringValue;
- private final int maxBlock;
private VLVIndexDescriptor newIndex;
/**
@@ -196,7 +195,6 @@
backendID = backendName.getText();
ldif = getIndexLDIF(indexName);
sortOrderStringValue = getSortOrderStringValue(sortOrder);
- maxBlock = Integer.parseInt(maxBlockSize.getText());
}
@Override
@@ -364,7 +362,6 @@
index.setSortOrder(getSortOrderStringValue(getSortOrder()));
index.setBaseDN(DN.valueOf(getBaseDN()));
index.setScope(VLVIndexDescriptor.getLocalDBVLVIndexScope(getScope()));
- index.setMaxBlockSize(Integer.parseInt(maxBlockSize.getText().trim()));
index.commit();
}
@@ -406,7 +403,7 @@
if (backend.getBackendID().equalsIgnoreCase(backendID))
{
newIndex = new VLVIndexDescriptor(
- indexName, backend, DN.valueOf(baseDN), searchScope, filterValue, sortOrder, maxBlock);
+ indexName, backend, DN.valueOf(baseDN), searchScope, filterValue, sortOrder);
getInfo().registerModifiedIndex(newIndex);
notifyConfigurationElementCreated(newIndex);
break;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index fa8f10b..df22683 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -348,7 +348,6 @@
baseDN.getDocument().addDocumentListener(documentListener);
filter.getDocument().addDocumentListener(documentListener);
- maxBlockSize.getDocument().addDocumentListener(documentListener);
baseDN.getDocument().addDocumentListener(documentListener);
}
@@ -536,8 +535,7 @@
try
{
return !index.getBaseDN().equals(DN.valueOf(getBaseDN())) || !index.getScope().equals(getScope())
- || !index.getFilter().equals(filter.getText().trim()) || !index.getSortOrder().equals(getSortOrder())
- || !Integer.toString(index.getMaxBlockSize()).equals(maxBlockSize.getText().trim());
+ || !index.getFilter().equals(filter.getText().trim()) || !index.getSortOrder().equals(getSortOrder());
}
catch (final OpenDsException odse)
{
@@ -561,7 +559,6 @@
private final String sortOrderStringValue;
private final String ldif;
private final VLVIndexDescriptor indexToModify;
- private final int maxBlock;
private VLVIndexDescriptor modifiedIndex;
/**
@@ -585,7 +582,6 @@
searchScope = getScope();
sortOrderStringValue = getSortOrderStringValue(sortOrder);
ldif = getIndexLDIF(indexName);
- maxBlock = Integer.parseInt(maxBlockSize.getText());
indexToModify = index;
}
@@ -799,9 +795,8 @@
try
{
updateConfiguration();
- modifiedIndex =
- new VLVIndexDescriptor(indexName, indexToModify.getBackend(), DN.valueOf(baseDN), searchScope, filterValue,
- sortOrder, maxBlock);
+ modifiedIndex = new VLVIndexDescriptor(
+ indexName, indexToModify.getBackend(), DN.valueOf(baseDN), searchScope, filterValue, sortOrder);
getInfo().registerModifiedIndex(modifiedIndex);
state = State.FINISHED_SUCCESSFULLY;
}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index 8d994e0..fead893 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -502,7 +502,7 @@
List<VLVSortOrder> sortOrder = getVLVSortOrder(s);
vlvIndexes.add(new VLVIndexDescriptor(
index.getName(), null, index.getBaseDN(), VLVIndexDescriptor.toSearchScope(index.getScope()),
- index.getFilter(), sortOrder, index.getMaxBlockSize()));
+ index.getFilter(), sortOrder));
}
}
catch (OpenDsException oe)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
index 373dd5a..1f0a943 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -257,7 +257,7 @@
final List<VLVSortOrder> sortOrder = getVLVSortOrder(s);
vlvIndexes.add(new VLVIndexDescriptor(
index.getName(), null, index.getBaseDN(), VLVIndexDescriptor.toSearchScope(index.getScope()),
- index.getFilter(), sortOrder, index.getMaxBlockSize()));
+ index.getFilter(), sortOrder));
}
}
catch (final ConfigException ce)
--
Gitblit v1.10.0