From 5e44d53216590df40100b56983231830b3a0c1d0 Mon Sep 17 00:00:00 2001 From: Colin McDonald Date: Sun, 10 Jul 2016 15:48:51 -0400 Subject: [PATCH] Fix naming of some path parameters --- src/main/java/net/frozenorb/apiv3/APIv3.java | 2 +- .../java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java | 2 +- .../route/punishments/DELETEUsersIdActivePunishment.java | 4 ++-- .../frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java index 5698a3b..2824b5a 100644 --- a/src/main/java/net/frozenorb/apiv3/APIv3.java +++ b/src/main/java/net/frozenorb/apiv3/APIv3.java @@ -335,7 +335,7 @@ public final class APIv3 extends AbstractVerticle { http.post("/punishments").blockingHandler(new POSTPunishments(), false); //http.put("/punishments/:punishmentId").blockingHandler(new PUTPunishmentsId(), false); http.delete("/punishments/:punishmentId").blockingHandler(new DELETEPunishmentsId(), false); - http.delete("/users/:id/activePunishment").blockingHandler(new DELETEUsersIdActivePunishment(), false); + http.delete("/users/:userId/activePunishment").blockingHandler(new DELETEUsersIdActivePunishment(), false); http.get("/ranks/:rankId").handler(new GETRanksId()); http.get("/ranks").handler(new GETRanks()); diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java index 7d248fb..906a826 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java @@ -19,7 +19,7 @@ public final class DELETEIpBansId implements Handler { IpBan ipBan = SyncUtils.runBlocking(v -> IpBan.findById(ctx.request().getParam("ipBanId"), v)); if (ipBan == null) { - ErrorUtils.respondNotFound(ctx, "IpBan", ctx.request().getParam("id")); + ErrorUtils.respondNotFound(ctx, "IpBan", ctx.request().getParam("ipBanId")); return; } else if (!ipBan.isActive()) { ErrorUtils.respondInvalidInput(ctx, "Cannot remove an inactive ip ban."); diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java index 387c87d..dc73b3a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java @@ -19,10 +19,10 @@ import java.util.List; public final class DELETEUsersIdActivePunishment implements Handler { public void handle(RoutingContext ctx) { - User target = SyncUtils.runBlocking(v -> User.findById(ctx.request().getParam("id"), v)); + User target = SyncUtils.runBlocking(v -> User.findById(ctx.request().getParam("userId"), v)); if (target == null) { - ErrorUtils.respondNotFound(ctx, "User", ctx.request().getParam("id")); + ErrorUtils.respondNotFound(ctx, "User", ctx.request().getParam("userId")); return; } diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java index fc54fe3..e867e4c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java @@ -20,7 +20,7 @@ public final class POSTUsersIdConfirmPhone implements Handler { User user = SyncUtils.runBlocking(v -> User.findById(ctx.request().getParam("userId"), v)); if (user == null) { - ErrorUtils.respondNotFound(ctx, "User", ctx.request().getParam("id")); + ErrorUtils.respondNotFound(ctx, "User", ctx.request().getParam("userId")); return; }