Merge branch '2.2'

# Conflicts:
#	hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java

hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java

@@ -63,11 +63,9 @@ public abstract class AbstractServiceImpl<Po, PK> implements GenericService<Po,
     public void tryValidPo(Po data) {
         Set<ConstraintViolation<Object>> set = validator.validate(data);
         ValidateResults results = new ValidateResults();
-        
-            for (ConstraintViolation<Object> violation : set) {
-                results.addResult(violation.getPropertyPath().toString(), violation.getMessage());
-            }
-        
+        for (ConstraintViolation<Object> violation : set) {
+            results.addResult(violation.getPropertyPath().toString(), violation.getMessage());
+        }
         if (!results.isSuccess())
             throw new ValidationException(results);
     }

hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/plan/QueryPlanServiceImpl.java

@@ -43,6 +43,6 @@ public class QueryPlanServiceImpl extends AbstractServiceImpl<QueryPlan, String>
 
     @Override
     public int update(QueryPlan data) {
-        return createUpdate(data).includes(name, config, sharing).exec();
+        return createUpdate(data).includes(name, config, sharing).where(id, data.getId()).exec();
     }
 }