Merge pull request #169 from nitta-lab-2018/obj

Fork: 0

nitta-lab-2018 / CactusServer

Browse code Merge pull request #169 from nitta-lab-2018/obj マージします. master
commit fa13338af2fef1f814724294a338f80854ec2d28 2 parents 017cbe5 + a0985e2 ryo isitani authored on 20 Nov 2018

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          10 ■■■■■
          src/main/java/cactusServer/resources/AccountsRest.java
 	@Path("/{uniqueID}")
	// @Produces(MediaType.APPLICATION_JSON)
	@Produces(MediaType.TEXT_PLAIN)
	public String deleteAccount(@PathParam("uniqueID") String uniqueID) {
		if (Accounts.getInstance().getAccountByuniqueID(uniqueID) != null) {
			return JSON.encode(Accounts.getInstance().deleteAccount(uniqueID));
		} else {
			throw new WebApplicationException(400);
		}
		return JSON.encode(Accounts.getInstance().deleteAccount(uniqueID));
	}
 
	@GET
	// @Produces(MediaType.APPLICATION_JSON)
 	@Path("/{uniqueID}")
 	// @Produces(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.TEXT_PLAIN)
 	public String deleteAccount(@PathParam("uniqueID") String uniqueID) {
+		if (Accounts.getInstance().getAccountByuniqueID(uniqueID) != null) {
+			return JSON.encode(Accounts.getInstance().deleteAccount(uniqueID));
+		} else {
+			throw new WebApplicationException(400);
+		}
+		return JSON.encode(Accounts.getInstance().deleteAccount(uniqueID));
 	}
 	@GET
 	// @Produces(MediaType.APPLICATION_JSON)

Show line notes below