pk to id

talipkorkmaz · Jun 3, 2017 · 5a6a803 · 5a6a803
1 parent 672a429
commit 5a6a803
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...ude-mdd/src/main/java/com/restdude/mdd/controller/AbstractPersistableModelController.java b/...ude-mdd/src/main/java/com/restdude/mdd/controller/AbstractPersistableModelController.java
@@ -328,17 +328,17 @@ public JsonApiModelResourceDocument<T, PK> jsonApiGetById(@ApiParam(name = "id",
         return toDocument(super.findById(id));
     }
 
-    @RequestMapping(params = "pks", method = RequestMethod.GET)
+    @RequestMapping(params = "ids", method = RequestMethod.GET)
     @ApiOperation(value = "Search by ids", notes = "Find the set of resources matching the given identifiers.")
     @ModelDrivenPreAuth
-    public ModelResources<T> plainJsonGetByIds(@RequestParam(value = "pks[]") Set<PK> ids) {
+    public ModelResources<T> plainJsonGetByIds(@RequestParam(value = "ids[]") Set<PK> ids) {
         return this.toHateoasResources(super.findByIds(ids));
     }
 
-    @RequestMapping(params = "pks", method = RequestMethod.GET, consumes = HypermediaUtils.MIME_APPLICATION_VND_PLUS_JSON, produces = HypermediaUtils.MIME_APPLICATION_VND_PLUS_JSON)
+    @RequestMapping(params = "ids", method = RequestMethod.GET, consumes = HypermediaUtils.MIME_APPLICATION_VND_PLUS_JSON, produces = HypermediaUtils.MIME_APPLICATION_VND_PLUS_JSON)
     @ApiOperation(value = "Search by ids", notes = "Find the set of resources matching the given identifiers.")
     @ModelDrivenPreAuth
-    public JsonApiModelResourceCollectionDocument<T, PK> jsonApiGetByIds(@RequestParam(value = "pks[]") Set<PK> ids) {
+    public JsonApiModelResourceCollectionDocument<T, PK> jsonApiGetByIds(@RequestParam(value = "ids[]") Set<PK> ids) {
         return toDocument(super.findByIds(ids));
     }
 

diff --git a/...dude-mdd/src/main/java/com/restdude/mdd/model/AbstractEmbeddableManyToManyIdentifier.java b/...dude-mdd/src/main/java/com/restdude/mdd/model/AbstractEmbeddableManyToManyIdentifier.java
@@ -67,13 +67,13 @@ public abstract class AbstractEmbeddableManyToManyIdentifier<L extends Persistab
 
 
     @NotNull
-    @ApiModelProperty(required = true, example = "{id: '[pk]'}")
+    @ApiModelProperty(required = true, example = "{id: '[id]'}")
     @JoinColumn(name = "owner_id", nullable = false, updatable = false)
     @ManyToOne(optional = false)
     private L left;
 
     @NotNull
-    @ApiModelProperty(required = true, example = "{id: '[pk]'}")
+    @ApiModelProperty(required = true, example = "{id: '[id]'}")
     @JoinColumn(name = "friend_id", nullable = false, updatable = false)
     @ManyToOne(optional = false)
     private R right;

diff --git a/restdude-websocket/src/main/java/com/restdude/websocket/model/StompSession.java b/restdude-websocket/src/main/java/com/restdude/websocket/model/StompSession.java
@@ -61,7 +61,7 @@ public StompSession(String id) {
 
     @Override
     public String toString() {
-        return "StompSession [pk=" + this.getId() + ", user=" + user + "]";
+        return "StompSession [id=" + this.getId() + ", user=" + user + "]";
     }
 
     public User getUser() {