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 5D8E6200D5B for ; Wed, 13 Dec 2017 17:23:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5C227160C23; Wed, 13 Dec 2017 16:23:19 +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 A30F7160C16 for ; Wed, 13 Dec 2017 17:23:18 +0100 (CET) Received: (qmail 77487 invoked by uid 500); 13 Dec 2017 16:23:17 -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 77478 invoked by uid 99); 13 Dec 2017 16:23:17 -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, 13 Dec 2017 16:23:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BD081DFFD9; Wed, 13 Dec 2017 16:23:17 +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 Message-Id: <10424c6a070e4dc9973b362ee0de472e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: metron git commit: METRON-1343 Swagger UI for User Controller needs request method (MohanDV via ottobackwards) closes apache/metron#862 Date: Wed, 13 Dec 2017 16:23:17 +0000 (UTC) archived-at: Wed, 13 Dec 2017 16:23:19 -0000 Repository: metron Updated Branches: refs/heads/master 37587689e -> 6ca08b9f5 METRON-1343 Swagger UI for User Controller needs request method (MohanDV via ottobackwards) closes apache/metron#862 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/6ca08b9f Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/6ca08b9f Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/6ca08b9f Branch: refs/heads/master Commit: 6ca08b9f598b649d60c6b6468164a374b7f6f555 Parents: 3758768 Author: MohanDV Authored: Wed Dec 13 10:55:04 2017 -0500 Committer: otto Committed: Wed Dec 13 10:55:04 2017 -0500 ---------------------------------------------------------------------- .../java/org/apache/metron/rest/controller/UserController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/6ca08b9f/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/controller/UserController.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/controller/UserController.java b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/controller/UserController.java index 594b51f..6bca938 100644 --- a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/controller/UserController.java +++ b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/controller/UserController.java @@ -20,6 +20,7 @@ package org.apache.metron.rest.controller; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import java.security.Principal; @@ -29,7 +30,7 @@ public class UserController { @ApiOperation(value = "Retrieves the current user") @ApiResponse(message = "Current user", code = 200) - @RequestMapping("/api/v1/user") + @RequestMapping(value = "/api/v1/user", method = RequestMethod.GET) public String user(Principal user) { return user.getName(); }