diff --git a/src/main/java/org/ntlab/nemophila/models/shops/Shop.java b/src/main/java/org/ntlab/nemophila/models/shops/Shop.java index d233070..b2ee499 100644 --- a/src/main/java/org/ntlab/nemophila/models/shops/Shop.java +++ b/src/main/java/org/ntlab/nemophila/models/shops/Shop.java @@ -8,11 +8,11 @@ public class Shop { @JsonProperty("sid") private String id; - @JsonIgnore + @JsonProperty("name") private String name; - @JsonIgnore + @JsonProperty("longitude") private double longitude; - @JsonIgnore + @JsonProperty("latitude") private double latitude; @JsonProperty("posts") private ArrayList posts = new ArrayList<>(); diff --git a/src/main/java/org/ntlab/nemophila/resources/shops/ShopRest.java b/src/main/java/org/ntlab/nemophila/resources/shops/ShopRest.java index 03b0f24..445c51e 100644 --- a/src/main/java/org/ntlab/nemophila/resources/shops/ShopRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/shops/ShopRest.java @@ -7,6 +7,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collection; @@ -21,6 +22,7 @@ ShopManager sm = ShopManager.getInstance(); Shop shop = sm.getShop(sid); + if (shop != null) { return shop; }