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 0ee896b..df441c7 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -1,21 +1,57 @@
 package com.example.cosmos_serversb.entities;
 
-import java.util.ArrayList;
-import java.util.List;
-
-
 public class User {
     public String uId, uri, name, pw, iconUri;
     public boolean login = true;
-    public List<String> token = new ArrayList<String>();
 
-    public User(String name, String uId,String uri,String pw,ArrayList token,String iconUri) {
-        this.name = name;
-        this.uId = uId;
-        this.uri=uri;
-        this.pw=pw;
-        this.token = new ArrayList<String>();//test
-        //this.iconImage=iconImage;
-        this.iconUri=iconUri;
+    public  User(){
+
     }
-}
+
+
+    public User(String name, String uId, String uri, String pw, String iconUri) {
+        setuId(uId);
+        setUri(uri);
+        setName(name);
+        setPw(pw);
+        setIconUri(iconUri);
+    }
+
+    public String getuId() {
+        return uId;
+    }
+    public void setuId(String uId) {
+        this.uId = uId;
+    }
+
+    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;
+    }
+}
\ No newline at end of file
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 02781c7..a3d0914 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -4,10 +4,40 @@
 import javax.inject.Singleton;
 
 import com.example.cosmos_serversb.entities.*;
+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;
+
+    public static void setUp() {
+        // A SessionFactory is set up once for an application!
+        final StandardServiceRegistry registry = new StandardServiceRegistryBuilder()
+                .configure() // configures settings from hibernate.cfg.xml
+                .build();
+        try {
+            sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory();
+        }
+        catch (Exception e) {
+            // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory
+            // so destroy it manually.
+            StandardServiceRegistryBuilder.destroy( registry );
+        }
+    }
+
+    public static void tearDown() {
+        try {
+            if (sessionFactory != null) {
+                sessionFactory.close();
+            }
+        } catch (Exception e) {
+            System.out.println("Exception!");
+        }
+    }
 
     private Users() {
     }
@@ -32,32 +62,32 @@
     }
 
     public static User createUser(String name, String pw, String iconImage) {
-        User testUser = new User("test", getInstance().createUId(), "http://test.com", "testpw", null, "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", "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));
         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", null, "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", "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));
         return testUser;
     }
 
     public static User getUserById(String uId) {
         //与えられたuIdのUser情報を返す
-        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "testpw", null, "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", "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));
         return testUser;
     }
 
     public static User getUserByToken(String token) {
         //与えられたTokenに紐づくUser情報を返す
-        User testUser = new User("test",  getInstance().createUId(), "http://test.com", "testpw", null, "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", "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));
         return testUser;
     }
 
@@ -75,7 +105,7 @@
         if(Users.getInstance().getUserByToken(token).uId == null) {
             return DeleteResult.FAILURE;
         }else{
-            Users.getInstance().getUserByToken(token).token.remove(Users.getInstance().getUserByToken(token).token.indexOf(token));
+//            Users.getInstance().getUserByToken(token).token.remove(Users.getInstance().getUserByToken(token).token.indexOf(token));
             return DeleteResult.SUCCESS;
         }
     }
diff --git a/src/main/resources/User.hbm.xml b/src/main/resources/User.hbm.xml
new file mode 100644
index 0000000..678506a
--- /dev/null
+++ b/src/main/resources/User.hbm.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="com.example.cosmos_serversb.entities">
+
+    <class name="User" table="USER">
+        <id name="uId" column="UID">
+        </id>
+        <property name="name" column="NAME"/>
+        <property name="uri" column="URI"/>
+        <property name="pw" column="PW"/>
+        <property name="iconUri" column="ICONURI"/>
+        <property name="login" column="LOGIN"/>
+    </class>
+
+</hibernate-mapping>
\ No newline at end of file