Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'PAN-15' and 'master' of https://github.com/atusa17/ptp into PAN-15

Browse Source 
# Conflicts:
#	services/build.gradle
This commit is contained in:
atusa17
2019-03-20 22:30:11 -06:00
parent f5f959b453
commit 9695f5082a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/main/java/edu/msudenver/tsp/services/UserService.java
+3 -3
View File
@@ -70,7 +70,7 @@ public class UserService {
try{ try{
final String auth = ""; final String auth = "";
final TypeToken<Account> typeToken = new TypeToken<Account>(){}; final TypeToken<Account> typeToken = new TypeToken<Account>(){};
final Optional<Account> persistenceApiResponse = restService.patch(persistenceApiBaseUrl + "accounts/id?id=" + id, final Optional<Account> persistenceApiResponse = restService.patch(persistenceApiBaseUrl + "accounts/" + id,
new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create().toJson(account), new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create().toJson(account),
typeToken, typeToken,
connectionTimeoutMilliseconds, connectionTimeoutMilliseconds,
@@ -105,7 +105,7 @@ public class UserService {
try{ try{
final String auth = ""; final String auth = "";
final TypeToken<Account> typeToken = new TypeToken<Account>(){}; final TypeToken<Account> typeToken = new TypeToken<Account>(){};
final Optional<Account> persistenceApiResponse = restService.patch(persistenceApiBaseUrl + "accounts/id?id="+id, final Optional<Account> persistenceApiResponse = restService.patch(persistenceApiBaseUrl + "accounts/"+id,
new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create().toJson(account), new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create().toJson(account),
typeToken, typeToken,
connectionTimeoutMilliseconds, connectionTimeoutMilliseconds,
@@ -136,7 +136,7 @@ public class UserService {
try{ try{
final boolean persistenceApiResponse = restService.delete(persistenceApiBaseUrl + "/accounts/id?id=" + id, final boolean persistenceApiResponse = restService.delete(persistenceApiBaseUrl + "/accounts/" + id,
connectionTimeoutMilliseconds, connectionTimeoutMilliseconds,
socketTimeoutMilliseconds, HttpStatus.NO_CONTENT ); socketTimeoutMilliseconds, HttpStatus.NO_CONTENT );
if(persistenceApiResponse){ if(persistenceApiResponse){