diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Account.java b/src/main/java/org/ntlab/amaryllis/server/entities/Account.java new file mode 100644 index 0000000..9aef321 --- /dev/null +++ b/src/main/java/org/ntlab/amaryllis/server/entities/Account.java @@ -0,0 +1,24 @@ +package org.ntlab.amaryllis.server.entities; + +import java.util.ArrayList; + +public class Account { + private String uid; + private String name; + private String token; + private String password; + private String introduction; + private ArrayList followings; + private ArrayList followers; + private ArrayList history; + private ArrayList contributions; + public Account(String name,String password){ + this.name=name; + this.password=password; + followings=new ArrayList<>(); + followers=new ArrayList<>(); + history=new ArrayList<>(); + contributions=new ArrayList<>(); + } + +} diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java b/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java new file mode 100644 index 0000000..44bedc8 --- /dev/null +++ b/src/main/java/org/ntlab/amaryllis/server/models/Accounts.java @@ -0,0 +1,22 @@ +package org.ntlab.amaryllis.server.models; + +import org.ntlab.amaryllis.server.entities.Account; + +import java.util.ArrayList; + +public class Accounts { + private static Accounts theInstance=null; + private ArrayList accounts=new ArrayList(); + private Accounts(){ + + } + + public static Accounts getInstance(){ + if(theInstance==null){ + theInstance=new Accounts(); + } + + return theInstance; + } + +} diff --git a/src/main/java/org/ntlab/amaryllis/server/resources/Account.java b/src/main/java/org/ntlab/amaryllis/server/resources/Account.java deleted file mode 100644 index 97e7fa9..0000000 --- a/src/main/java/org/ntlab/amaryllis/server/resources/Account.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.ntlab.amaryllis.server.resources; - -import java.util.ArrayList; - -public class Account { - private String uid; - private String name; - private String token; - private String password; - private String introduction; - private ArrayList followings; - private ArrayList followers; - private ArrayList history; - private ArrayList contributions; - public Account(String name,String password){ - this.name=name; - this.password=password; - followings=new ArrayList<>(); - followers=new ArrayList<>(); - history=new ArrayList<>(); - contributions=new ArrayList<>(); - } - -} diff --git a/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java b/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java index 85c4b38..ef077d6 100644 --- a/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java +++ b/src/main/java/org/ntlab/amaryllis/server/resources/AccountsRest.java @@ -1,6 +1,7 @@ package org.ntlab.amaryllis.server.resources; +import org.ntlab.amaryllis.server.models.Accounts; import org.springframework.stereotype.Component; import com.fasterxml.jackson.databind.ObjectMapper; @@ -14,7 +15,7 @@ @Component @Path("/accounts") public class AccountsRest { - private ArrayList accounts; + private Accounts accounts=Accounts.getInstance(); @GET public String getAccounts(){ @@ -32,4 +33,5 @@ return json; } + } \ No newline at end of file