diff --git a/src/main/java/com/example/cosmos_serversb/entities/Group.java b/src/main/java/com/example/cosmos_serversb/entities/Group.java index 47ac114..6ad2e98 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Group.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java @@ -3,7 +3,7 @@ import com.example.cosmos_serversb.models.SessionManager; import com.example.cosmos_serversb.models.Users; -import com.sun.corba.se.impl.orbutil.graph.Graph; +//import com.sun.corba.se.impl.orbutil.graph.Graph; import org.hibernate.Session; import java.util.ArrayList; diff --git a/src/main/java/com/example/cosmos_serversb/entities/Request.java b/src/main/java/com/example/cosmos_serversb/entities/Request.java index 4da04c6..af44d36 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/Request.java +++ b/src/main/java/com/example/cosmos_serversb/entities/Request.java @@ -1,9 +1,12 @@ //このクラスは仮です package com.example.cosmos_serversb.entities; +import java.util.Date; + public class Request { private String rId; - private String uri, date, IssuerUid, product, deadline; + private String uri, IssuerUid, product; + private Date date, deadline; private int location;// YahooローカルサーチAPIの業種コード private boolean done = false; @@ -11,7 +14,7 @@ } - public Request(String rId, String uri, String date, String IssuerUid, String product, String deadline, int location){ + public Request(String rId, String uri, Date date, String IssuerUid, String product, Date deadline, int location){ setrId(rId); setUri(uri); setDate(date); @@ -30,7 +33,6 @@ return rId; } - private void setUri(String uri){ this.uri = uri; } @@ -39,11 +41,11 @@ return uri; } - private void setDate(String date){ + private void setDate(Date date){ this.date = date; } - public String getDate() { + public Date getDate() { return date; } @@ -63,11 +65,11 @@ this.product = product; } - public String getDeadline() { + public Date getDeadline() { return deadline; } - public void setDeadline(String deadline) { + public void setDeadline(Date deadline) { this.deadline = deadline; } diff --git a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java index 3d53ca4..b807883 100644 --- a/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java +++ b/src/main/java/com/example/cosmos_serversb/jsons/GroupJson.java @@ -63,7 +63,7 @@ this.members = members; } - public ArrayList getRequest() { + public ArrayList getRequests() { return requests; } diff --git a/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java b/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java index 50e4f9f..92e07a7 100644 --- a/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java +++ b/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java @@ -29,7 +29,7 @@ import java.util.Set; import com.example.cosmos_serversb.resources.UsersRest; -import com.sun.org.apache.xerces.internal.util.SynchronizedSymbolTable; +//import com.sun.org.apache.xerces.internal.util.SynchronizedSymbolTable; import hibernateTest.entities.Event; import hibernateTest.entities.Group; import hibernateTest.entities.Request;