From commits-return-2564-archive-asf-public=cust-asf.ponee.io@metron.apache.org Thu Jan 25 15:05:30 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 08A9A18079A for ; Thu, 25 Jan 2018 15:05:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E3F5C160C13; Thu, 25 Jan 2018 14:05:29 +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 09AA5160C55 for ; Thu, 25 Jan 2018 15:05:28 +0100 (CET) Received: (qmail 12568 invoked by uid 500); 25 Jan 2018 14:05:28 -0000 Mailing-List: contact commits-help@metron.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@metron.apache.org Delivered-To: mailing list commits@metron.apache.org Received: (qmail 12487 invoked by uid 99); 25 Jan 2018 14:05:28 -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; Thu, 25 Jan 2018 14:05:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08767F1775; Thu, 25 Jan 2018 14:05:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: otto@apache.org To: commits@metron.apache.org Date: Thu, 25 Jan 2018 14:05:26 -0000 Message-Id: <332a0a05bcd046ffb4fad9c104f996f9@git.apache.org> In-Reply-To: <270ac6ec1ef5434c866c3fdc52238e48@git.apache.org> References: <270ac6ec1ef5434c866c3fdc52238e48@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/21] metron git commit: METRON-1390: Swagger UI for "Web Security Config" Controller needs request method (MohanDV via mmiklavc) closes apache/metron#889 METRON-1390: Swagger UI for "Web Security Config" Controller needs request method (MohanDV via mmiklavc) closes apache/metron#889 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/43243758 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/43243758 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/43243758 Branch: refs/heads/feature/METRON-1211-extensions-parsers-gradual Commit: 43243758cedee803ef610b74b4f42b4ec1d7a1c6 Parents: 6f869ae Author: MohanDV Authored: Thu Jan 11 07:56:55 2018 -0700 Committer: Michael Miklavcic Committed: Thu Jan 11 07:56:55 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/metron/rest/config/WebSecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/43243758/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java index 8310df1..36846de 100644 --- a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java +++ b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java @@ -33,6 +33,7 @@ import org.springframework.security.web.authentication.logout.HttpStatusReturnin import org.springframework.security.web.csrf.CookieCsrfTokenRepository; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import javax.sql.DataSource; import java.util.Arrays; @@ -47,7 +48,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Autowired private Environment environment; - @RequestMapping({"/login", "/logout", "/sensors", "/sensors*/**"}) + @RequestMapping(value = {"/login", "/logout", "/sensors", "/sensors*/**"}, method = RequestMethod.GET) public String handleNGRequests() { return "forward:/index.html"; }