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 6e5a120..62d6fbd 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/Token.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/Token.java
@@ -2,12 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
-
-@Data
 public class Token {
-    public String token;
-    @JsonIgnore
-    private String uId;
+    public String token,uId;
     public Token(){
 
     }
@@ -16,6 +12,15 @@
         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;
     }
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 714ca25..8525c92 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -10,23 +10,23 @@
 import lombok.Data;
 import com.example.cosmos_serversb.views.UsersView;
 
-@Data
+
 public class User {
     /**
-    * USER用のクラス
-    *
-    * @param uId string //LONGに変更
-    * @param uri String
-    * @param name String
-    * @param iconUri String iconの保存先
-    * @param login Boolean トークンが存在するか否か
-    * @param groups Set<Group> 所属するグループ
-    * @param tokens Set<Token> 所持するトークン
-    * @param firstToken String 初期トークン
-    * 
-    * TODO: Tokenのデータベース接続
-    * TODO: ダミートークン削除
-    */
+     * USER用のクラス
+     *
+     * @param uId string //LONGに変更
+     * @param uri String
+     * @param name String
+     * @param iconUri String iconの保存先
+     * @param login Boolean トークンが存在するか否か
+     * @param groups Set<Group> 所属するグループ
+     * @param tokens Set<Token> 所持するトークン
+     * @param firstToken String 初期トークン
+     * <p>
+     * TODO: Tokenのデータベース接続
+     * TODO: ダミートークン削除
+     */
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @JsonProperty("token")
     public String firstToken;//初期トークン
@@ -39,28 +39,30 @@
     @JsonView(UsersView.getUsersView.class)
     public String iconUri;
     @JsonIgnore
+
     public boolean login = true;
-    @JsonIgnore
-    public Set<Group> groups = new HashSet<>();
-    @JsonIgnore
-    public Set<Token> tokens = new HashSet<>();
+    public Set<Group> groups = new HashSet<>();//HashSetでいいのかな？
+    //仕様ではStringを返すため
+    //public Set<Token> tokens = new HashSet<>();
     //public Set<String> tokens = new HashSet<>();
-    @JsonIgnore
+    public String token;
     private String dummyToken = "a9965652-c2ec-4a0d-a78a-b457e8b2deca";
 
     public User() {
 
     }
+
     public User(String name, String uId, String uri, String iconUri) {
         setuId(uId);
         setUri(uri);
         setName(name);
         setIconUri(iconUri);
-        setFirstToken(dummyToken);
+        setToken(this.dummyToken);
         //addToken(this.dummyToken);
         this.login = true;
     }
 
+
     public String getuId() {
         return uId;
     }
@@ -69,7 +71,47 @@
         this.uId = uId;
     }
 
-    public void addGroups(Group group){
+    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 getIconUri() {
+        return iconUri;
+    }
+
+    public void setIconUri(String iconUri) {
+        this.iconUri = iconUri;
+    }
+
+    public String getToken() {
+        return firstToken;
+    }
+
+    public void setToken(String firstToken) {
+        this.firstToken = firstToken;
+    }
+
+    public Set<Group> getGroups() {
+        return groups;
+    }
+
+    public void setGroups(Set<Group> groups) {
+        this.groups = groups;
+    }
+
+    public void addGroups(Group group) {
         groups.add(group);
     }
-}
\ No newline at end of file
+}