diff --git a/.idea/misc.xml b/.idea/misc.xml index a2598f9..4ff842e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,10 @@ + + + + + diff --git a/src/main/java/com/example/cosmos_serversb/entities/User.java b/src/main/java/com/example/cosmos_serversb/entities/User.java index 0b9c4bd..d2dd33f 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/User.java +++ b/src/main/java/com/example/cosmos_serversb/entities/User.java @@ -11,7 +11,6 @@ public User() { } - public User(String name, String uId, String uri, String iconUri) { setuId(uId); setUri(uri); diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java index 5a8f745..bc79d3c 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Users.java +++ b/src/main/java/com/example/cosmos_serversb/models/Users.java @@ -5,8 +5,6 @@ import javax.inject.Singleton; import com.example.cosmos_serversb.entities.*; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -57,12 +55,6 @@ createToken(uId); User testUser = new User(name, uId, uri, iconImage);//名前、uId、ユーザーuri、パスワード、アイコンイメージを保存 session.save(testUser); - //出力 - /* - List userResult = session.createQuery( "from User" ).list(); - for ( User user : (List) userResult ) { - System.out.println( "UserId (" + user.getuId() + ") : " + user.getUri() + ": " + user.getName()); - }*/ return testUser; } @@ -91,8 +83,8 @@ for ( User user : (List) usersList ) { if (user.getuId().equals(uId)) { User findUser = (User) session.load(User.class, uId); +// System.out.println(mapper.valueToTree(findUser).toString()); return findUser; -// System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri()); } } //一致しない場合は返す必要がないのでnull diff --git a/src/main/java/com/example/cosmos_serversb/models/UsersMain.java b/src/main/java/com/example/cosmos_serversb/models/UsersMain.java index ea61319..d348a90 100644 --- a/src/main/java/com/example/cosmos_serversb/models/UsersMain.java +++ b/src/main/java/com/example/cosmos_serversb/models/UsersMain.java @@ -3,9 +3,11 @@ //このメインクラスを実行すると、Hibernateのテストが行えます。 public class UsersMain { public static void main(String args[]){ - Users.getInstance().createUser("test1","test1","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); + /* + Users.createUser("test1","test1","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); Users.login("1234","test1"); - //Users.setUser("1234","test3","test3","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); - // Users.getUserById("1234"); + Users.setUser("1234","test3","test3","http://localhost:8080/iconImage/"); + Users.getUserById("1234"); + */ } } diff --git a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java index a117ab5..99362f6 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java @@ -14,11 +14,16 @@ @Path("/users") public class UsersRest { - static interface RemoveuIdAndUri { - @JsonIgnore String getUId(); + public interface RemoveuIdAndUri { + @JsonIgnore String getuId(); @JsonIgnore String getUri(); } + public interface RemoveNameAndIconUri { + @JsonIgnore String getName(); + @JsonIgnore String getIconUri(); + } + @POST public String createUsers(@FormParam("name") String name, @FormParam("pw") String pw, @FormParam("iconImage") String iconImage) throws JsonProcessingException { SessionManager.getInstance().getSession(); @@ -34,8 +39,8 @@ SessionManager.getInstance().getSession(); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(Users.getInstance().getUserById(uId)); + mapper.addMixIn(json.getClass(),RemoveuIdAndUri.class); SessionManager.getInstance().closeSession(); - return json; } @@ -45,8 +50,8 @@ SessionManager.getInstance().getSession(); ObjectMapper mapper = new ObjectMapper(); String json = mapper.writeValueAsString(Users.getInstance().setUser(uId, name, pw, iconImage)); + mapper.addMixIn(json.getClass(),RemoveNameAndIconUri.class); SessionManager.getInstance().closeSession(); - return json; }