diff --git a/src/main/java/com/example/cosmos_serversb/entities/Password.java b/src/main/java/com/example/cosmos_serversb/entities/Password.java new file mode 100644 index 0000000..b98b679 --- /dev/null +++ b/src/main/java/com/example/cosmos_serversb/entities/Password.java @@ -0,0 +1,29 @@ +package com.example.cosmos_serversb.entities; + +public class Password { + public String pw,uId; + public Password(){ + + } + + public Password(String pw,String uId){ + setPw(pw); + setUId(uId); + } + + public void setUId(String uId) { + this.uId = uId; + } + + public String getUId() { + return uId; + } + + public void setPw(String pw) { + this.pw = pw; + } + + public String getPw() { + return pw; + } +} diff --git a/src/main/java/com/example/cosmos_serversb/entities/Token.java b/src/main/java/com/example/cosmos_serversb/entities/Token.java index 7b6cabb..dc6d4e7 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Token.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Token.java @@ -1,8 +1,29 @@ package com.example.cosmos_serversb.entities; public class Token { - public String token; - public Token(String token){ - this.token =token; + public String token,uId; + public Token(){ + + } + + public Token(String token,String uId){ + setToken(token); + setUid(uId); + } + + public void setToken(String token) { + this.token = token; + } + + public String getToken() { + return token; + } + + public void setUid(String uId) { + this.uId = uId; + } + + public String getUid() { + return uId; } } 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 df441c7..efefb2c 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/User.java +++ b/src/main/java/com/example/cosmos_serversb/entities/User.java @@ -1,25 +1,26 @@ package com.example.cosmos_serversb.entities; public class User { - public String uId, uri, name, pw, iconUri; + public String uId, uri, name, iconUri; public boolean login = true; - public User(){ + public User() { } - public User(String name, String uId, String uri, String pw, String iconUri) { + public User(String name, String uId, String uri, String iconUri) { setuId(uId); setUri(uri); setName(name); - setPw(pw); setIconUri(iconUri); + this.login = true; } public String getuId() { return uId; } + public void setuId(String uId) { this.uId = uId; } @@ -27,30 +28,31 @@ public String getUri() { return uri; } + public void setUri(String uri) { this.uri = uri; } + public String getName() { return name; } + public void setName(String name) { this.name = name; } - public String getPw() { - return pw; - } - public void setPw(String pw) { - this.pw = pw; - } + public String getIconUri() { return iconUri; } + public void setIconUri(String iconUri) { this.iconUri = iconUri; } + public boolean getLogin() { return login; } + public void setLogin(boolean login) { this.login = login; } 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 8ccc4c5..18a6cd2 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Users.java +++ b/src/main/java/com/example/cosmos_serversb/models/Users.java @@ -4,16 +4,19 @@ import javax.inject.Singleton; import com.example.cosmos_serversb.entities.*; +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 public class Users { private static Users theInstance = null; private static SessionFactory sessionFactory; - + private static String baseURI = "http://nitta-lab-www.is.konan-u.ac.jp/"; + private static String AppName = "cosmos"; public static void setUp() { // A SessionFactory is set up once for an application! final StandardServiceRegistry registry = new StandardServiceRegistryBuilder() @@ -50,10 +53,16 @@ return theInstance; } - public static String createToken(String uId) { + public static Token createToken(String uId) { //Tokenを作成しuIdと関連付けしDBに保存し作成したTokenを返す String token = UUID.randomUUID().toString(); - return token; + Token testToken =new Token(token, uId); + Session session = sessionFactory.openSession(); + session.beginTransaction(); + session.save(testToken); + session.getTransaction().commit(); + session.close(); + return testToken; } public static String createUId() { @@ -62,33 +71,32 @@ return uId; } - public static User createUser(String name, String pw, String iconImage) { - User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); -// testUser.token.add(getInstance().createToken(testUser.uId)); -// testUser.token.add(getInstance().createToken(testUser.uId)); + public static User createUser(String name, String iconImage) { + String uId = getInstance().createUId(); + String uri = baseURI + AppName +"/users/" +uId; + User testUser = new User("test", uId, uri, "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); + Session session = sessionFactory.openSession(); + session.beginTransaction(); + session.save(testUser); + session.getTransaction().commit(); + session.close(); return testUser; } public static User setUser(String uId, String name, String pw, String iconImage) { - User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); -// testUser.token.add(getInstance().createToken(testUser.uId)); -// testUser.token.add(getInstance().createToken(testUser.uId)); + User testUser = new User("test", getInstance().createUId(), "http://test.com", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); return testUser; } public static User getUserById(String uId) { //与えられたuIdのUser情報を返す - User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); -// testUser.token.add(getInstance().createToken(testUser.uId)); -// testUser.token.add(getInstance().createToken(testUser.uId)); + User testUser = new User("test", getInstance().createUId(), "http://test.com", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); return testUser; } public static User getUserByToken(String token) { //与えられたTokenに紐づくUser情報を返す - User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); -// testUser.token.add(getInstance().createToken(testUser.uId)); -// testUser.token.add(getInstance().createToken(testUser.uId)); + User testUser = new User("test", getInstance().createUId(), "http://test.com","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); return testUser; } @@ -97,7 +105,7 @@ } public static Token login(String uId) { - Token testtoken = new Token(getInstance().createToken(uId)); + Token testtoken = getInstance().createToken(uId); //tokenを作成後値を返す return testtoken;//testToken } 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 8c2ed74..497921f 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java @@ -18,11 +18,11 @@ @FormParam("pw") String pw, @FormParam("iconImage") String iconImage) throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); - String json = mapper.writeValueAsString(Users.getInstance().createUser(name, pw, iconImage)); + String json = mapper.writeValueAsString(Users.getInstance().createUser(name, iconImage)); return json; } - + @Path("/{uId}") @GET public String getUsersInfo( diff --git a/src/main/resources/Password.hbm.xml b/src/main/resources/Password.hbm.xml new file mode 100644 index 0000000..9ce3f87 --- /dev/null +++ b/src/main/resources/Password.hbm.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/Token.hbm.xml b/src/main/resources/Token.hbm.xml new file mode 100644 index 0000000..72bf3d8 --- /dev/null +++ b/src/main/resources/Token.hbm.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/User.hbm.xml b/src/main/resources/User.hbm.xml index 678506a..967e4d9 100644 --- a/src/main/resources/User.hbm.xml +++ b/src/main/resources/User.hbm.xml @@ -17,7 +17,6 @@ - diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index 8224135..5a3e6ae 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -36,7 +36,9 @@ - + + + \ No newline at end of file