Changeset 3781

Timestamp:

Sep 25, 2007, 1:47:16 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #780: ParameterValuesImpl? doesn't implement ParameterValues? as specified

Location:

branches/2.4-stable/src/core/net/sf/basedb/core

Files:

• Job.java (modified) (7 diffs)
• ParameterValuesImpl.java (modified) (4 diffs)
• PluginConfiguration.java (modified) (3 diffs)

branches/2.4-stable/src/core/net/sf/basedb/core/Job.java

@@ -997 +997 @@
     throws InvalidDataException, PermissionDeniedException, BaseException
   {
+    checkPermission(Permission.WRITE);
+    if (name == null) throw new InvalidUseOfNullException("name");
     if (getStatus() == Status.EXECUTING) 
     {
@@ -1002 +1004 @@
     }
     getData().setStatus(Status.WAITING.getValue());
-    setParameterValuesInternal(name, label, description, parameterType, Arrays.asList(value));
+    setParameterValuesInternal(name, label, description, parameterType, Arrays.asList(value), true);
   }
   
@@ -1046 +1048 @@
     throws InvalidDataException, PermissionDeniedException, BaseException
   {
+    checkPermission(Permission.WRITE);
+    if (name == null) throw new InvalidUseOfNullException("name");
     if (getStatus() == Status.EXECUTING) 
     {
@@ -1051 +1055 @@
     }
     getData().setStatus(Status.WAITING.getValue());
-    setParameterValuesInternal(name, label, description, parameterType, values);
+    setParameterValuesInternal(name, label, description, parameterType, values, true);
   }
   
@@ -1111 +1115 @@
     @param values A list containing the new values, null or empty to remove the 
       configuration values
+    @param validate If validation by {@link ParameterType#validate(String, List)}
+      is needed or not
     @throws PermissionDeniedException If the logged in user doesn't have
       write permission
@@ -1117 +1123 @@
     @throws BaseException If there is another error
   */
-  void setParameterValuesInternal(String name, String label, String description, ParameterType<?> parameterType, List<?> values)
+  void setParameterValuesInternal(String name, String label, String description, 
+    ParameterType<?> parameterType, List<?> values, boolean validate)
     throws InvalidDataException, PermissionDeniedException, BaseException
   {
-    checkPermission(Permission.WRITE);
-    if (name == null) throw new InvalidUseOfNullException("name");
     ParameterValueData old = null;
     if (values == null || values.size() == 0)
@@ -1130 +1135 @@
     {
       if (parameterType == null) throw new InvalidUseOfNullException("parameterType");
-      parameterType.validate(name, values);
+      if (validate) parameterType.validate(name, values);
       ParameterValueData<?> parameterValue = parameterType.newParameterValueData();
       parameterValue.setLabel(label);

branches/2.4-stable/src/core/net/sf/basedb/core/ParameterValuesImpl.java

@@ -161 +161 @@
     if (writeProtected) 
     {
-      throw new PermissionDeniedException(Permission.WRITE, "Job parameter: "+name);
-    }
+      throw new PermissionDeniedException(Permission.WRITE, "Parameter: "+name);
+    }
+    if (name == null) throw new InvalidUseOfNullException("name");
+    if (type == null) throw new InvalidUseOfNullException("type[name=" + name + "]");
     if (value == null && type.getNotNull()) value = type.getDefaultValue();
+    type.validate(name, value);
     List<T> l = new ArrayList<T>(1);
     l.add(value);
@@ -176 +179 @@
     if (writeProtected) 
     {
-      throw new PermissionDeniedException(Permission.WRITE, "Job parameter: "+name);
-    }
+      throw new PermissionDeniedException(Permission.WRITE, "Parameter: "+name);
+    }
+    if (name == null) throw new InvalidUseOfNullException("name");
+    if (type == null) throw new InvalidUseOfNullException("type[name=" + name + "]");
     if ((values == null || values.size() == 0) && type.getNotNull() && type.getDefaultValue() != null)
     {
       values = Arrays.asList(type.getDefaultValue());
     }
+    type.validate(name, values);
     parameters.put(name, values);
     parameterTypes.put(name, type);
@@ -203 +209 @@
       if (pp == null)
       {
-        job.setParameterValuesInternal(name, null, null, parameterTypes.get(name), parameters.get(name));
+        job.setParameterValuesInternal(name, null, null,
+          parameterTypes.get(name), parameters.get(name), false);
       }
       else
       {
-        job.setParameterValuesInternal(name, pp.getLabel(), pp.getDescription(), parameterTypes.get(name), parameters.get(name));
+        job.setParameterValuesInternal(name, pp.getLabel(), pp.getDescription(), 
+          parameterTypes.get(name), parameters.get(name), false);
       }
     }
@@ -223 +231 @@
       if (pp == null)
       {
-        config.setParameterValues(name, null, null, parameterTypes.get(name), parameters.get(name));
+        config.setParameterValuesInternal(name, null, null, 
+          parameterTypes.get(name), parameters.get(name), false);
       }
       else
       {
-        config.setParameterValues(name, pp.getLabel(), pp.getDescription(), parameterTypes.get(name), parameters.get(name));
+        config.setParameterValuesInternal(name, pp.getLabel(), pp.getDescription(), 
+          parameterTypes.get(name), parameters.get(name), false);
       }
     }

branches/2.4-stable/src/core/net/sf/basedb/core/PluginConfiguration.java

@@ -428 +428 @@
     checkPermission(Permission.WRITE);
     if (name == null) throw new InvalidUseOfNullException("name");
-    
+    setParameterValuesInternal(name, label, description, parameterType, values, true);
+  }
+
+  /**
+    Set the values of a configuration parameter.
+    @param name The name of the configuration parameter
+    @param label The label of the parameter (optional)
+    @param description A description of the parameter (optional)
+    @param parameterType The type of the parameter
+    @param values A list containing the new values, null or empty to remove the 
+      configuration values
+    @param validate If validation by {@link ParameterType#validate(String, List)}
+      is needed or not
+    @throws PermissionDeniedException If the logged in user doesn't have
+      write permission
+    @throws InvalidDataException If name is null or the new value doesn't
+      validate against the parameter type
+    @throws BaseException If there is another error
+  */
+  void setParameterValuesInternal(String name, String label, String description, 
+    ParameterType<?> parameterType, List<?> values, boolean validate)
+    throws InvalidDataException, PermissionDeniedException, BaseException
+  {
+
     VersionedParameter param = new VersionedParameter(name, getNewParameterVersion());
-    
     if (values == null || values.size() == 0)
     {
@@ -438 +460 @@
     {
       if (parameterType == null) throw new InvalidUseOfNullException("parameterType");
-      parameterType.validate(name, values);
+      if (validate) parameterType.validate(name, values);
       ParameterValueData<?> parameterValue = parameterType.newParameterValueData();
       parameterValue.setLabel(label);
@@ -446 +468 @@
     }
   }
-
+  
   /**
     Copy all parameter values from another plugin configuration. This method