From 46a71c1b3a2f8c28b4a8b069bc61a07fe8cabd90 Mon Sep 17 00:00:00 2001
From: SirWayne <dennis.melzer@bosch-si.com>
Date: Wed, 10 Feb 2016 16:51:45 +0100
Subject: [PATCH] Use javax annotation for validation

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
---
 .../org/eclipse/hawkbit/repository/TargetManagement.java | 7 -------
 .../org/eclipse/hawkbit/repository/model/Target.java     | 4 ++++
 .../eclipse/hawkbit/repository/TargetManagementTest.java | 9 ++++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
index fb824dfae..e790d0a5e 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
@@ -27,10 +27,8 @@ import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.validation.ConstraintViolationException;
 import javax.validation.constraints.NotNull;
 
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.hawkbit.Constants;
 import org.eclipse.hawkbit.eventbus.event.TargetTagAssigmentResultEvent;
 import org.eclipse.hawkbit.executor.AfterTransactionCommitExecutor;
@@ -933,11 +931,6 @@ public class TargetManagement {
     public Target createTarget(@NotNull final Target target, @NotNull final TargetUpdateStatus status,
             final Long lastTargetQuery, final URI address) {
 
-        if (StringUtils.isEmpty(target.getControllerId())) {
-            throw new ConstraintViolationException("Empty string for controller id not allowed",
-                    Collections.emptySet());
-        }
-
         if (targetRepository.findByControllerId(target.getControllerId()) != null) {
             throw new EntityAlreadyExistsException(target.getControllerId());
         }
diff --git a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java
index 6de84ccaa..08e4fcecb 100644
--- a/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java
+++ b/hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java
@@ -32,6 +32,8 @@ import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 import org.eclipse.hawkbit.im.authentication.SpPermission;
 import org.eclipse.hawkbit.repository.model.helper.SecurityChecker;
@@ -74,6 +76,8 @@ public class Target extends NamedEntity implements Persistable<Long> {
     private static final long serialVersionUID = 1L;
 
     @Column(name = "controller_id", length = 64)
+    @Size(min = 1)
+    @NotNull
     private String controllerId;
 
     @Transient
diff --git a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TargetManagementTest.java b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TargetManagementTest.java
index 72f1951c6..3fe6a8738 100644
--- a/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TargetManagementTest.java
+++ b/hawkbit-repository/src/test/java/org/eclipse/hawkbit/repository/TargetManagementTest.java
@@ -68,13 +68,20 @@ public class TargetManagementTest extends AbstractIntegrationTest {
 
     @Test
     @Description("Verify that a target with empty controller id cannot be created")
-    public void createTarget() {
+    public void createTargetWithNoControllerId() {
         try {
             targetManagement.createTarget(new Target(""));
             fail("target with empty controller id should not be created");
         } catch (final ConstraintViolationException e) {
             // ok
         }
+
+        try {
+            targetManagement.createTarget(new Target(null));
+            fail("target with empty controller id should not be created");
+        } catch (final ConstraintViolationException e) {
+            // ok
+        }
     }
 
     @Test