Fixed Job.name validation

Signed-off-by: coduz <alberto.codutti@eurotech.com>
eclipse · Jan 27, 2020 · 7e913e2 · 7e913e2
1 parent 778aef8
commit 7e913e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...odule/job/src/main/java/org/eclipse/kapua/app/console/module/job/client/JobAddDialog.java b/...odule/job/src/main/java/org/eclipse/kapua/app/console/module/job/client/JobAddDialog.java
@@ -53,10 +53,11 @@ public void createBody() {
 
         name = new KapuaTextField<String>();
         name.setAllowBlank(false);
+        name.setMinLength(3);
         name.setMaxLength(255);
         name.setName("name");
         name.setFieldLabel("* " + JOB_MSGS.dialogAddFieldName());
-        name.setValidator(new TextFieldValidator(name, FieldType.NAME));
+        name.setValidator(new TextFieldValidator(name, FieldType.NAME_SPACE));
         name.setToolTip(JOB_MSGS.dialogAddFieldNameTooltip());
         jobFormPanel.add(name);
 
@@ -74,7 +75,7 @@ public void createBody() {
     public void validateJob() {
         if (name.getValue() == null) {
             ConsoleInfo.display("Error", CONSOLE_MSGS.allFieldsRequired());
-        } 
+        }
     }
 
     @Override

diff --git a/...ice/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobServiceImpl.java b/...ice/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobServiceImpl.java
@@ -75,7 +75,7 @@ public Job create(JobCreator creator) throws KapuaException {
         // Argument validation
         ArgumentValidator.notNull(creator, "jobCreator");
         ArgumentValidator.notNull(creator.getScopeId(), "jobCreator.scopeId");
-        ArgumentValidator.notNull(creator.getName(), "jobCreator.name");
+        ArgumentValidator.validateEntityName(creator.getName(), "jobCreator.name");
 
         //
         // Check access
@@ -106,7 +106,7 @@ public Job update(Job job) throws KapuaException {
         // Argument Validation
         ArgumentValidator.notNull(job, "job");
         ArgumentValidator.notNull(job.getScopeId(), "job.scopeId");
-        ArgumentValidator.notNull(job.getName(), "job.name");
+        ArgumentValidator.validateEntityName(job.getName(), "job.name");
 
         //
         // Check access
@@ -195,7 +195,7 @@ public void deleteForced(KapuaId scopeId, KapuaId jobId) throws KapuaException {
 
     //
     // Private methods
-        //
+    //
 
     /**
      * Deletes the {@link Job} like {@link #delete(KapuaId, KapuaId)}.
@@ -249,7 +249,7 @@ private void deleteInternal(KapuaId scopeId, KapuaId jobId, boolean forced) thro
         //
         // Do delete
         try {
-        KapuaSecurityUtils.doPrivileged(() -> jobEngineService.cleanJobData(scopeId, jobId));
+            KapuaSecurityUtils.doPrivileged(() -> jobEngineService.cleanJobData(scopeId, jobId));
         } catch (Exception e) {
             if (forced) {
                 LOG.warn("Error while cleaning Job data. Ignoring exception since delete is forced! Error: {}", e.getMessage());