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 a930715..0b9c4bd 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/User.java +++ b/src/main/java/com/example/cosmos_serversb/entities/User.java @@ -1,7 +1,5 @@ package com.example.cosmos_serversb.entities; -import com.fasterxml.jackson.annotation.JsonIgnore; - import java.util.HashSet; import java.util.Set; @@ -14,7 +12,6 @@ } - public User(String name, String uId, String uri, String iconUri) { setuId(uId); setUri(uri); @@ -23,11 +20,6 @@ this.login = true; } - public static interface removeuIdAnduri{ - @JsonIgnore String getUId(); - @JsonIgnore String getUri(); - } - public String getuId() { return uId; } 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 b6738d3..c7248aa 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Users.java +++ b/src/main/java/com/example/cosmos_serversb/models/Users.java @@ -5,12 +5,10 @@ import javax.inject.Singleton; import com.example.cosmos_serversb.entities.*; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.boot.MetadataSources; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; @Singleton @@ -61,8 +59,9 @@ 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 ) { + /* + List userResult = session.createQuery( "from User" ).list(); + for ( User user : (List) userResult ) { System.out.println( "UserId (" + user.getuId() + ") : " + user.getUri() + ": " + user.getName()); }*/ session.getTransaction().commit(); @@ -85,12 +84,10 @@ break; } } - //ここの2行でUser.javaからUriとuIdを参照 User findUser = (User) session.load(User.class, uId); session.getTransaction().commit(); session.close(); - //表示するのはUriとuIdのみ - return null; + return findUser; } public static User getUserById(String uId) { @@ -100,11 +97,9 @@ List usersList = session.createQuery( "from User" ).list(); //uIdを比較し、一致した場合はNameとiconUriを返す。一致しない場合はbreak for ( User user : (List) usersList ) { - if (user.getuId() == uId) { + if (user.getuId().equals(uId)) { User findUser = (User) session.load(User.class, uId); - ObjectMapper mapper = new ObjectMapper(); -// User testUser = mapper.addMixIn(findUser,findUser.removeuIdAnduri); - return null; + return findUser; // System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri()); }else{ break; 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 32a54bb..b1ab75b 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java @@ -1,5 +1,6 @@ package com.example.cosmos_serversb.resources; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.stereotype.Component; @@ -12,6 +13,13 @@ @Path("/users") public class UsersRest { + + static interface RemoveuIdAndUri { + @JsonIgnore + String getUId(); + @JsonIgnore String getUri(); + } + @POST public String createUsers( @FormParam("name") String name, @@ -36,7 +44,7 @@ @Path("/{uId}") @PUT - public String putUsersInfo( + public String setUsersInfo( @PathParam("uId") String uId, @FormParam("token") String token, @FormParam("name") String name, diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index 140e4fa..5a3e6ae 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -33,7 +33,7 @@ create - +