Fork: 0
nitta-lab-2018 / CactusServer
Browse code
Merge pull request #81 from nitta-lab-2018/StageModel
fuckin json!!!
InstancesRest3 collisionCorrection master
commit 21e45d7b2ffe3146ab9be9e773316e8cde042524
2 parents a0e8e12 + dd38d0a
ryo isitani authored on 28 Jun 2018
Patch
Unified Split
Showing 5 changed files
View
2
■■■■■
 src/main/java/cactusServer/entities/Account.java
 
import cactusServer.utils.RandomStringGenerator;
import net.arnx.jsonic.JSONHint;
 
public class Account extends Entity {
public class Account {
private String id, name, token, pass, uniqueID;
private boolean login = false;
 
public Account(String userID, String userName, String userPass, String uniqueID) {
View
40
■■■■■
 src/main/java/cactusServer/entities/URIAddressedAccount.java 0 → 100644
package cactusServer.entities;
 
import java.net.URI;
 
public class URIAddressedAccount{
private URI uri;
private Account account;
private URIAddressedAccount() {
// JSONDecode時の呼び出し用
}
public URIAddressedAccount(URI uri, Account body) {
setAccount(body);
setUri(uri);
}
public URIAddressedAccount(String str, Account body) {
setAccount(body);
setUri(URI.create(str));
}
public URI getUri() {
return uri;
}
 
public void setUri(URI uri) {
this.uri = uri;
}
 
public Account getAccount() {
return account;
}
 
public void setAccount(Account account) {
this.account = account;
}
 
}
View
31
■■■■■
 src/main/java/cactusServer/entities/URIAddressedEntity.java 100644 → 0
package cactusServer.entities;
 
import java.net.URI;
 
public class URIAddressedEntity extends AddressedEntity {
private URI uri;
private URIAddressedEntity() {
// JSONDecode時の呼び出し用
}
public URIAddressedEntity(URI uri, Entity body) {
super(body);
setUri(uri);
}
public URIAddressedEntity(String str, Entity body) {
super(body);
setUri(URI.create(str));
}
public URI getUri() {
return uri;
}
 
public void setUri(URI uri) {
this.uri = uri;
}
 
}
View
8
■■■■■
 src/main/java/cactusServer/models/Accounts.java
}
return theInstance;
}
 
public URIAddressedEntity createAcount(String userID, String userName, String userPass) {
public URIAddressedAccount createAcount(String userID, String userName, String userPass) {
if (!userIDSet.add(userID))
return null;
String uniqueID = RandomStringGenerator.generateUniqueString(12, RandomStringGenerator.ALPHA_NUMERIC,
uniqueIDSet);
uniqueIDSet.add(uniqueID);
Account newAccount = new Account(userID, userName, userPass, uniqueID);
accounts.add(newAccount);
return new URIAddressedEntity("/CactusServer/rest/accounts/" + uniqueID, newAccount);
return new URIAddressedAccount("/CactusServer/rest/accounts/" + uniqueID, newAccount);
}
 
public Account getAccountToken(String token) {
Account editAccount;
}
return null;
}
 
public URIAddressedEntity loginAccount(String userID, String userPass) {
public URIAddressedAccount loginAccount(String userID, String userPass) {
if (getAccountByID(userID) != null && getAccountByID(userID).getPass().equals(userPass)) {
Accounts.getInstance().getAccountByID(userID).setLogin(true);
Accounts.getInstance().getAccountByID(userID).formToken();
return new URIAddressedEntity(
return new URIAddressedAccount(
"/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID(),
Accounts.getInstance().getAccountByID(userID));
} else {
return null;
View
8
■■■■■
 src/main/java/cactusServer/resources/AccountsRest.java
@Path("/accounts")
public class AccountsRest {
@PUT
@Produces(MediaType.APPLICATION_JSON)
public URIAddressedEntity loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
URIAddressedEntity session = Accounts.getInstance().loginAccount(userID, userPass);
public URIAddressedAccount loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
URIAddressedAccount session = Accounts.getInstance().loginAccount(userID, userPass);
if (session != null) {
return session;
} else {
throw new WebApplicationException(400);
}
 
@POST
@Produces(MediaType.APPLICATION_JSON)
public URIAddressedEntity createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
public URIAddressedAccount createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
@FormParam("userPass") String userPass) {
URIAddressedEntity editAccount = Accounts.getInstance().createAcount(userID, userName, userPass);
URIAddressedAccount editAccount = Accounts.getInstance().createAcount(userID, userName, userPass);
if (editAccount != null) {
return editAccount;
} else {
throw new WebApplicationException(409);