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..296aefc 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/Token.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/Token.java
@@ -1,9 +1,7 @@
 package com.example.cosmos_serversb.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
 
-@Data
 public class Token {
     public String token;
     @JsonIgnore
@@ -23,5 +21,12 @@
     public String getuId() {
         return uId;
     }
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
 
 }
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 0218046..0ee4c0b 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -10,7 +10,6 @@
 import lombok.Data;
 import com.example.cosmos_serversb.views.UsersView;
 
-@Data
 public class User {
     /**
     * USER用のクラス
@@ -69,6 +68,21 @@
         this.uId = uId;
     }
 
+    public String getFirstToken() {
+        return firstToken;
+    }
+
+    public void setFirstToken(String firstToken) {
+        this.firstToken = firstToken;
+    }
+    public String getToken() {
+        return firstToken;
+    }
+
+    public void setToken(String firstToken) {
+        this.firstToken = firstToken;
+    }
+
     public String getUri() {
         return uri;
     }
@@ -89,34 +103,20 @@
         return iconUri;
     }
 
-    public void setIconUri(String iconUri) {
-        this.iconUri = iconUri;
+    public void setGroups(Set<Group> groups) {
+        this.groups = groups;
     }
 
-    public boolean getLogin() {
-        return login;
-    }
-
-    public void setLogin(boolean login) {
-        this.login = login;
-    }
-
-//    public void setToken(Set token) {
-//        this.token = token;
-//    }
-//
-//    public String getToken() {
-//        return token;
-//    }
-
+    
     public Set<Group> getGroups() {
         return groups;
     }
 
-    public void setGroups(Set<Group> groups) {
-        this.groups = groups;
+    public void setIconUri(String iconUri) {
+        this.iconUri = iconUri;
     }
 
+
     public void addGroups(Group group){
         groups.add(group);
     }