From 9695f5082ad34a47f3551e778adaeff20c1704f5 Mon Sep 17 00:00:00 2001
From: atusa17 <alex.j.tusa@gmail.com>
Date: Wed, 20 Mar 2019 22:30:11 -0600
Subject: [PATCH] Merge branches 'PAN-15' and 'master' of
 https://github.com/atusa17/ptp into PAN-15

# Conflicts:
#	services/build.gradle
---
 .../main/java/edu/msudenver/tsp/services/UserService.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/src/main/java/edu/msudenver/tsp/services/UserService.java b/services/src/main/java/edu/msudenver/tsp/services/UserService.java
index 7382653..ffb78a5 100644
--- a/services/src/main/java/edu/msudenver/tsp/services/UserService.java
+++ b/services/src/main/java/edu/msudenver/tsp/services/UserService.java
@@ -70,7 +70,7 @@ public class UserService {
         try{
             final String auth = "";
             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),
                     typeToken,
                     connectionTimeoutMilliseconds,
@@ -105,7 +105,7 @@ public class UserService {
         try{
             final String auth = "";
             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),
                     typeToken,
                     connectionTimeoutMilliseconds,
@@ -136,7 +136,7 @@ public class UserService {
 
         try{
 
-            final boolean persistenceApiResponse = restService.delete(persistenceApiBaseUrl + "/accounts/id?id=" + id,
+            final boolean persistenceApiResponse = restService.delete(persistenceApiBaseUrl + "/accounts/" + id,
                     connectionTimeoutMilliseconds,
                     socketTimeoutMilliseconds, HttpStatus.NO_CONTENT );
             if(persistenceApiResponse){