Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7D6F2200BC1 for ; Wed, 2 Nov 2016 03:21:38 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7BD1A160B07; Wed, 2 Nov 2016 02:21:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9B12F160B02 for ; Wed, 2 Nov 2016 03:21:37 +0100 (CET) Received: (qmail 95030 invoked by uid 500); 2 Nov 2016 02:21:36 -0000 Mailing-List: contact commits-help@eagle.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@eagle.incubator.apache.org Delivered-To: mailing list commits@eagle.incubator.apache.org Received: (qmail 95021 invoked by uid 99); 2 Nov 2016 02:21:36 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2016 02:21:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 60CEA180BCC for ; Wed, 2 Nov 2016 02:21:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 96LAs5enGfPr for ; Wed, 2 Nov 2016 02:21:33 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 991915FC7C for ; Wed, 2 Nov 2016 02:21:32 +0000 (UTC) Received: (qmail 94996 invoked by uid 99); 2 Nov 2016 02:21:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Nov 2016 02:21:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0BBDE0FC4; Wed, 2 Nov 2016 02:21:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hao@apache.org To: commits@eagle.incubator.apache.org Message-Id: <0edc43add16a4751b68bb2c66a877b6b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-eagle git commit: [EAGLE-716][API] Forcefully Validate before saving policy into metadata Date: Wed, 2 Nov 2016 02:21:31 +0000 (UTC) archived-at: Wed, 02 Nov 2016 02:21:38 -0000 Repository: incubator-eagle Updated Branches: refs/heads/master 21fcd7333 -> 77524c7c4 [EAGLE-716][API] Forcefully Validate before saving policy into metadata https://issues.apache.org/jira/browse/EAGLE-716 [API] Forcefully Validate before saving policy into metadata when calling POST /policies Author: Hao Chen Closes #593 from haoch/validateBeforeCreatingPolicy. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/77524c7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/77524c7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/77524c7c Branch: refs/heads/master Commit: 77524c7c4f8e3a186bb1fb5c802b73a582585e5b Parents: 21fcd73 Author: Hao Chen Authored: Wed Nov 2 10:21:23 2016 +0800 Committer: Hao Chen Committed: Wed Nov 2 10:21:23 2016 +0800 ---------------------------------------------------------------------- .../metadata/resource/MetadataResource.java | 7 ++- .../eagle/alert/metadata/resource/OpResult.java | 21 +++++++ .../partials/alert/policyEdit/advancedMode.html | 58 +++++++++++--------- 3 files changed, 60 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/77524c7c/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java index 45ffa2d..2a2047f 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata-service/src/main/java/org/apache/eagle/service/metadata/resource/MetadataResource.java @@ -202,7 +202,12 @@ public class MetadataResource { @Path("/policies") @POST public OpResult addPolicy(PolicyDefinition policy) { - return dao.addPolicy(policy); + PolicyValidationResult validationResult = this.validatePolicy(policy); + if (validationResult.isSuccess()) { + return dao.addPolicy(policy); + } else { + return OpResult.fail(validationResult.getMessage()); + } } @Path("/policies/validate") http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/77524c7c/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/resource/OpResult.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/resource/OpResult.java b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/resource/OpResult.java index a43b064..9f5ce7f 100644 --- a/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/resource/OpResult.java +++ b/eagle-core/eagle-alert-parent/eagle-alert/alert-metadata-parent/alert-metadata/src/main/java/org/apache/eagle/alert/metadata/resource/OpResult.java @@ -26,4 +26,25 @@ public class OpResult { public static final int SUCCESS = 200; public static final int FAILURE = 500; + + public static OpResult of(int code, String messsage) { + OpResult opResult = new OpResult(); + opResult.code = code; + opResult.message = messsage; + return opResult; + } + + public static OpResult success(String messsage) { + OpResult opResult = new OpResult(); + opResult.code = SUCCESS; + opResult.message = messsage; + return opResult; + } + + public static OpResult fail(String messsage) { + OpResult opResult = new OpResult(); + opResult.code = FAILURE; + opResult.message = messsage; + return opResult; + } } http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/77524c7c/eagle-server/src/main/webapp/app/dev/partials/alert/policyEdit/advancedMode.html ---------------------------------------------------------------------- diff --git a/eagle-server/src/main/webapp/app/dev/partials/alert/policyEdit/advancedMode.html b/eagle-server/src/main/webapp/app/dev/partials/alert/policyEdit/advancedMode.html index 7c3d4f1..5097d33 100644 --- a/eagle-server/src/main/webapp/app/dev/partials/alert/policyEdit/advancedMode.html +++ b/eagle-server/src/main/webapp/app/dev/partials/alert/policyEdit/advancedMode.html @@ -82,37 +82,25 @@
-

Policy

+

Policy Editor

+ +
-
-
- - -
-
-
+
- - + +
-
-
- -
- -

{{definitionMessage}}

-
- - +
+ +
+ +

{{definitionMessage}}

+
+ + + + + +

No alert stream defined

+
    • -
  • No alert stream yet.
+ +

No alert publisher defined

+
  • @@ -165,11 +165,19 @@ {{publisher.properties[field]}}

    • -
  • No publisher yet.
  • + Add Publisher
+ +
+
+
+ + +
+
+
@@ -178,7 +186,7 @@