[Minor] replaced deprecated call with new call
This commit is contained in:
parent
f1c1948398
commit
86794367eb
|
@ -14,15 +14,15 @@ import li.strolch.privilege.model.UserState;
|
||||||
public class PrivilegeElementFromJsonVisitor {
|
public class PrivilegeElementFromJsonVisitor {
|
||||||
|
|
||||||
public UserRep userRepFromJson(String string) {
|
public UserRep userRepFromJson(String string) {
|
||||||
return userRepFromJson(new JsonParser().parse(string).getAsJsonObject());
|
return userRepFromJson(JsonParser.parseString(string).getAsJsonObject());
|
||||||
}
|
}
|
||||||
|
|
||||||
public RoleRep roleRepFromJson(String string) {
|
public RoleRep roleRepFromJson(String string) {
|
||||||
return roleRepFromJson(new JsonParser().parse(string).getAsJsonObject());
|
return roleRepFromJson(JsonParser.parseString(string).getAsJsonObject());
|
||||||
}
|
}
|
||||||
|
|
||||||
public PrivilegeRep privilegeRepFromJson(String string) {
|
public PrivilegeRep privilegeRepFromJson(String string) {
|
||||||
return privilegeRepFromJson(new JsonParser().parse(string).getAsJsonObject());
|
return privilegeRepFromJson(JsonParser.parseString(string).getAsJsonObject());
|
||||||
}
|
}
|
||||||
|
|
||||||
public RoleRep roleRepFromJson(JsonObject jsonObject) {
|
public RoleRep roleRepFromJson(JsonObject jsonObject) {
|
||||||
|
|
|
@ -87,7 +87,7 @@ public class PostgreSqlActivityDao extends PostgresqlDao<Activity> implements Ac
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Activity parseFromJson(String id, String type, String json) {
|
protected Activity parseFromJson(String id, String type, String json) {
|
||||||
JsonObject jsonObject = new JsonParser().parse(json).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject();
|
||||||
return new ActivityFromJsonVisitor().visit(jsonObject);
|
return new ActivityFromJsonVisitor().visit(jsonObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ public class PostgreSqlOrderDao extends PostgresqlDao<Order> implements OrderDao
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Order parseFromJson(String id, String type, String json) {
|
protected Order parseFromJson(String id, String type, String json) {
|
||||||
JsonObject jsonObject = new JsonParser().parse(json).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject();
|
||||||
return new OrderFromJsonVisitor().visit(jsonObject);
|
return new OrderFromJsonVisitor().visit(jsonObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ public class PostgreSqlResourceDao extends PostgresqlDao<Resource> implements Re
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Resource parseFromJson(String id, String type, String json) {
|
protected Resource parseFromJson(String id, String type, String json) {
|
||||||
JsonObject jsonObject = new JsonParser().parse(json).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject();
|
||||||
return new ResourceFromJsonVisitor().visit(jsonObject);
|
return new ResourceFromJsonVisitor().visit(jsonObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
|
||||||
// parse the configuration file
|
// parse the configuration file
|
||||||
JsonObject configJ;
|
JsonObject configJ;
|
||||||
try (FileReader reader = new FileReader(configFile)) {
|
try (FileReader reader = new FileReader(configFile)) {
|
||||||
configJ = new JsonParser().parse(reader).getAsJsonObject();
|
configJ = JsonParser.parseReader(reader).getAsJsonObject();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new IllegalStateException("Failed to read config file " + configFile.getAbsolutePath(), e);
|
throw new IllegalStateException("Failed to read config file " + configFile.getAbsolutePath(), e);
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class AuthenticationService {
|
||||||
@Produces(MediaType.APPLICATION_JSON)
|
@Produces(MediaType.APPLICATION_JSON)
|
||||||
public Response authenticate(@Context HttpServletRequest request, @Context HttpHeaders headers, String data) {
|
public Response authenticate(@Context HttpServletRequest request, @Context HttpHeaders headers, String data) {
|
||||||
|
|
||||||
JsonObject login = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject login = JsonParser.parseString(data).getAsJsonObject();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
@ -299,7 +299,7 @@ public class AuthenticationService {
|
||||||
public Response initiateChallenge(@Context HttpServletRequest request, String data) {
|
public Response initiateChallenge(@Context HttpServletRequest request, String data) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
String username = jsonObject.get("username").getAsString();
|
String username = jsonObject.get("username").getAsString();
|
||||||
String usage = jsonObject.get("usage").getAsString();
|
String usage = jsonObject.get("usage").getAsString();
|
||||||
|
|
||||||
|
@ -325,7 +325,7 @@ public class AuthenticationService {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
String username = jsonObject.get("username").getAsString();
|
String username = jsonObject.get("username").getAsString();
|
||||||
String challenge = jsonObject.get("challenge").getAsString();
|
String challenge = jsonObject.get("challenge").getAsString();
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class I18nService {
|
||||||
|
|
||||||
JsonObject i18nJ;
|
JsonObject i18nJ;
|
||||||
try (FileReader in = new FileReader(i18nFile)) {
|
try (FileReader in = new FileReader(i18nFile)) {
|
||||||
i18nJ = new JsonParser().parse(in).getAsJsonObject();
|
i18nJ = JsonParser.parseReader(in).getAsJsonObject();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new IllegalStateException("Failed to read i18n file at " + i18nFile);
|
throw new IllegalStateException("Failed to read i18n file at " + i18nFile);
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,7 @@ public class I18nService {
|
||||||
|
|
||||||
JsonObject i18nJ;
|
JsonObject i18nJ;
|
||||||
try (FileReader in = new FileReader(i18nFile)) {
|
try (FileReader in = new FileReader(i18nFile)) {
|
||||||
i18nJ = new JsonParser().parse(in).getAsJsonObject();
|
i18nJ = JsonParser.parseReader(in).getAsJsonObject();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new IllegalStateException("Failed to read i18n file at " + i18nFile);
|
throw new IllegalStateException("Failed to read i18n file at " + i18nFile);
|
||||||
}
|
}
|
||||||
|
@ -87,7 +87,7 @@ public class I18nService {
|
||||||
if (!ctx.hasRole(ROLE_STROLCH_ADMIN))
|
if (!ctx.hasRole(ROLE_STROLCH_ADMIN))
|
||||||
ctx.validateAction(new SimpleRestrictable("I18n", Operation.UPDATE.getPrivilegePrefix()));
|
ctx.validateAction(new SimpleRestrictable("I18n", Operation.UPDATE.getPrivilegePrefix()));
|
||||||
|
|
||||||
JsonObject i18nJ = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject i18nJ = JsonParser.parseString(data).getAsJsonObject();
|
||||||
|
|
||||||
File webPath = new File(RestfulStrolchComponent.getInstance().getWebPath());
|
File webPath = new File(RestfulStrolchComponent.getInstance().getWebPath());
|
||||||
File i18nFile = new File(webPath, "/locales.json");
|
File i18nFile = new File(webPath, "/locales.json");
|
||||||
|
|
|
@ -795,7 +795,7 @@ public class Inspector {
|
||||||
StrolchRootElementArgument arg = new StrolchRootElementArgument();
|
StrolchRootElementArgument arg = new StrolchRootElementArgument();
|
||||||
|
|
||||||
// parse JSON string
|
// parse JSON string
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
Resource resource;
|
Resource resource;
|
||||||
if (flat) {
|
if (flat) {
|
||||||
|
|
||||||
|
@ -872,7 +872,7 @@ public class Inspector {
|
||||||
StrolchRootElementArgument arg = new StrolchRootElementArgument();
|
StrolchRootElementArgument arg = new StrolchRootElementArgument();
|
||||||
|
|
||||||
// parse JSON string
|
// parse JSON string
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
Order order;
|
Order order;
|
||||||
if (flat) {
|
if (flat) {
|
||||||
|
|
||||||
|
@ -949,7 +949,7 @@ public class Inspector {
|
||||||
StrolchRootElementArgument arg = new StrolchRootElementArgument();
|
StrolchRootElementArgument arg = new StrolchRootElementArgument();
|
||||||
|
|
||||||
// parse JSON string
|
// parse JSON string
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
Activity activity;
|
Activity activity;
|
||||||
if (flat) {
|
if (flat) {
|
||||||
|
|
||||||
|
@ -1066,7 +1066,7 @@ public class Inspector {
|
||||||
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
||||||
|
|
||||||
// parse from complete JSON
|
// parse from complete JSON
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
ResourceFromJsonVisitor visitor = new ResourceFromJsonVisitor();
|
ResourceFromJsonVisitor visitor = new ResourceFromJsonVisitor();
|
||||||
Resource resource = visitor.visit(jsonObject);
|
Resource resource = visitor.visit(jsonObject);
|
||||||
|
|
||||||
|
@ -1145,7 +1145,7 @@ public class Inspector {
|
||||||
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
||||||
|
|
||||||
// parse from complete JSON
|
// parse from complete JSON
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
OrderFromJsonVisitor visitor = new OrderFromJsonVisitor();
|
OrderFromJsonVisitor visitor = new OrderFromJsonVisitor();
|
||||||
Order order = visitor.visit(jsonObject);
|
Order order = visitor.visit(jsonObject);
|
||||||
|
|
||||||
|
@ -1226,7 +1226,7 @@ public class Inspector {
|
||||||
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
||||||
|
|
||||||
// parse from complete JSON
|
// parse from complete JSON
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
ActivityFromJsonVisitor visitor = new ActivityFromJsonVisitor();
|
ActivityFromJsonVisitor visitor = new ActivityFromJsonVisitor();
|
||||||
Activity activity = visitor.visit(jsonObject);
|
Activity activity = visitor.visit(jsonObject);
|
||||||
|
|
||||||
|
@ -1483,7 +1483,7 @@ public class Inspector {
|
||||||
private Resource parseNewResourceFromJson(Certificate cert, String realm, String type, String data, boolean flat) {
|
private Resource parseNewResourceFromJson(Certificate cert, String realm, String type, String data, boolean flat) {
|
||||||
|
|
||||||
// parse JSON string
|
// parse JSON string
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
Resource resource;
|
Resource resource;
|
||||||
if (flat) {
|
if (flat) {
|
||||||
|
|
||||||
|
@ -1510,7 +1510,7 @@ public class Inspector {
|
||||||
private Order parseNewOrderFromJson(Certificate cert, String realm, String type, String data, boolean flat) {
|
private Order parseNewOrderFromJson(Certificate cert, String realm, String type, String data, boolean flat) {
|
||||||
|
|
||||||
// parse JSON string
|
// parse JSON string
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
Order order;
|
Order order;
|
||||||
if (flat) {
|
if (flat) {
|
||||||
|
|
||||||
|
@ -1537,7 +1537,7 @@ public class Inspector {
|
||||||
private Activity parseNewActivityFromJson(Certificate cert, String realm, String type, String data, boolean flat) {
|
private Activity parseNewActivityFromJson(Certificate cert, String realm, String type, String data, boolean flat) {
|
||||||
|
|
||||||
// parse JSON string
|
// parse JSON string
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
Activity activity;
|
Activity activity;
|
||||||
if (flat) {
|
if (flat) {
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class ModelQuery {
|
||||||
@QueryParam("flat") String flat, String data) {
|
@QueryParam("flat") String flat, String data) {
|
||||||
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
||||||
|
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
|
|
||||||
QueryResponse queryResponse;
|
QueryResponse queryResponse;
|
||||||
try (StrolchTransaction tx = openTx(cert, realmName)) {
|
try (StrolchTransaction tx = openTx(cert, realmName)) {
|
||||||
|
|
|
@ -175,7 +175,7 @@ public class PrivilegeUsersService {
|
||||||
PrivilegeUpdateUserRolesService svc = new PrivilegeUpdateUserRolesService();
|
PrivilegeUpdateUserRolesService svc = new PrivilegeUpdateUserRolesService();
|
||||||
JsonServiceArgument arg = svc.getArgumentInstance();
|
JsonServiceArgument arg = svc.getArgumentInstance();
|
||||||
arg.objectId = username;
|
arg.objectId = username;
|
||||||
arg.jsonElement = new JsonParser().parse(data);
|
arg.jsonElement = JsonParser.parseString(data);
|
||||||
|
|
||||||
PrivilegeUserResult svcResult = svcHandler.doService(cert, svc, arg);
|
PrivilegeUserResult svcResult = svcHandler.doService(cert, svc, arg);
|
||||||
return handleServiceResult(svcResult);
|
return handleServiceResult(svcResult);
|
||||||
|
@ -276,7 +276,7 @@ public class PrivilegeUsersService {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
|
|
||||||
String passwordEncoded = jsonObject.get("password").getAsString();
|
String passwordEncoded = jsonObject.get("password").getAsString();
|
||||||
byte[] decode = Base64.getDecoder().decode(passwordEncoded);
|
byte[] decode = Base64.getDecoder().decode(passwordEncoded);
|
||||||
|
|
|
@ -100,7 +100,7 @@ public class ReportResource {
|
||||||
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
|
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
|
||||||
JsonObject localeJ = null;
|
JsonObject localeJ = null;
|
||||||
if (localesF.exists()) {
|
if (localesF.exists()) {
|
||||||
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
JsonObject localesJ = JsonParser.parseString(new String(Files.readAllBytes(localesF.toPath())))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
||||||
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
||||||
|
@ -155,7 +155,7 @@ public class ReportResource {
|
||||||
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
|
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
|
||||||
JsonObject localeJ = null;
|
JsonObject localeJ = null;
|
||||||
if (localesF.exists()) {
|
if (localesF.exists()) {
|
||||||
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
JsonObject localesJ = JsonParser.parseString(new String(Files.readAllBytes(localesF.toPath())))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
||||||
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
||||||
|
@ -216,7 +216,7 @@ public class ReportResource {
|
||||||
DBC.PRE.assertNotEmpty("report ID is required", id);
|
DBC.PRE.assertNotEmpty("report ID is required", id);
|
||||||
|
|
||||||
// get information from body
|
// get information from body
|
||||||
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
|
||||||
|
|
||||||
int offset = jsonObject.get(OFFSET) != null ? jsonObject.get(OFFSET).getAsInt() : 50;
|
int offset = jsonObject.get(OFFSET) != null ? jsonObject.get(OFFSET).getAsInt() : 50;
|
||||||
int limit = jsonObject.get(LIMIT) != null ? jsonObject.get(LIMIT).getAsInt() : 50;
|
int limit = jsonObject.get(LIMIT) != null ? jsonObject.get(LIMIT).getAsInt() : 50;
|
||||||
|
@ -254,7 +254,7 @@ public class ReportResource {
|
||||||
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
|
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
|
||||||
JsonObject localeJ = null;
|
JsonObject localeJ = null;
|
||||||
if (localesF.exists()) {
|
if (localesF.exists()) {
|
||||||
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
JsonObject localesJ = JsonParser.parseString(new String(Files.readAllBytes(localesF.toPath())))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
||||||
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
||||||
|
@ -345,7 +345,7 @@ public class ReportResource {
|
||||||
DBC.PRE.assertNotEmpty("report ID is required", id);
|
DBC.PRE.assertNotEmpty("report ID is required", id);
|
||||||
|
|
||||||
// get information from body
|
// get information from body
|
||||||
JsonObject jsonObject = StringHelper.isEmpty(data) ? null : new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonObject = StringHelper.isEmpty(data) ? null : JsonParser.parseString(data).getAsJsonObject();
|
||||||
|
|
||||||
MapOfSets<String, String> filters = jsonObject != null && jsonObject.get(PARAM_FILTER) != null ?
|
MapOfSets<String, String> filters = jsonObject != null && jsonObject.get(PARAM_FILTER) != null ?
|
||||||
getFiltersFromJson(jsonObject.get(PARAM_FILTER).getAsJsonArray()) :
|
getFiltersFromJson(jsonObject.get(PARAM_FILTER).getAsJsonArray()) :
|
||||||
|
@ -381,7 +381,7 @@ public class ReportResource {
|
||||||
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
|
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
|
||||||
JsonObject localeJ = null;
|
JsonObject localeJ = null;
|
||||||
if (localesF.exists()) {
|
if (localesF.exists()) {
|
||||||
JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
|
JsonObject localesJ = JsonParser.parseString(new String(Files.readAllBytes(localesF.toPath())))
|
||||||
.getAsJsonObject();
|
.getAsJsonObject();
|
||||||
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
if (localesJ.has(cert.getLocale().toLanguageTag()))
|
||||||
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
|
||||||
|
|
|
@ -112,7 +112,7 @@ public abstract class AbstractRestfulTest extends JerseyTest {
|
||||||
.post(entity);
|
.post(entity);
|
||||||
assertEquals(Response.Status.OK.getStatusCode(), result.getStatus());
|
assertEquals(Response.Status.OK.getStatusCode(), result.getStatus());
|
||||||
|
|
||||||
JsonObject loginResult = new JsonParser().parse(result.readEntity(String.class)).getAsJsonObject();
|
JsonObject loginResult = JsonParser.parseString(result.readEntity(String.class)).getAsJsonObject();
|
||||||
assertEquals("jill", loginResult.get("username").getAsString());
|
assertEquals("jill", loginResult.get("username").getAsString());
|
||||||
assertEquals(64, loginResult.get("authToken").getAsString().length());
|
assertEquals(64, loginResult.get("authToken").getAsString().length());
|
||||||
assertNull(loginResult.get("msg"));
|
assertNull(loginResult.get("msg"));
|
||||||
|
@ -128,7 +128,7 @@ public abstract class AbstractRestfulTest extends JerseyTest {
|
||||||
.delete();
|
.delete();
|
||||||
assertEquals(Response.Status.OK.getStatusCode(), result.getStatus());
|
assertEquals(Response.Status.OK.getStatusCode(), result.getStatus());
|
||||||
|
|
||||||
JsonObject logoutResult = new JsonParser().parse(result.readEntity(String.class)).getAsJsonObject();
|
JsonObject logoutResult = JsonParser.parseString(result.readEntity(String.class)).getAsJsonObject();
|
||||||
assertEquals("jill has been logged out.", logoutResult.get("msg").getAsString());
|
assertEquals("jill has been logged out.", logoutResult.get("msg").getAsString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ public class EnumTest extends AbstractRestfulTest {
|
||||||
assertEquals(Status.OK.getStatusCode(), result.getStatus());
|
assertEquals(Status.OK.getStatusCode(), result.getStatus());
|
||||||
String strolchEnumS = result.readEntity(String.class);
|
String strolchEnumS = result.readEntity(String.class);
|
||||||
assertNotNull(strolchEnumS);
|
assertNotNull(strolchEnumS);
|
||||||
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
|
JsonObject strolchEnumJ = JsonParser.parseString(strolchEnumS).getAsJsonObject();
|
||||||
assertEquals("sex", strolchEnumJ.get("name").getAsString());
|
assertEquals("sex", strolchEnumJ.get("name").getAsString());
|
||||||
assertEquals(4, strolchEnumJ.get("values").getAsJsonArray().size());
|
assertEquals(4, strolchEnumJ.get("values").getAsJsonArray().size());
|
||||||
}
|
}
|
||||||
|
@ -78,7 +78,7 @@ public class EnumTest extends AbstractRestfulTest {
|
||||||
assertEquals(Status.OK.getStatusCode(), result.getStatus());
|
assertEquals(Status.OK.getStatusCode(), result.getStatus());
|
||||||
String strolchEnumS = result.readEntity(String.class);
|
String strolchEnumS = result.readEntity(String.class);
|
||||||
assertNotNull(strolchEnumS);
|
assertNotNull(strolchEnumS);
|
||||||
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
|
JsonObject strolchEnumJ = JsonParser.parseString(strolchEnumS).getAsJsonObject();
|
||||||
assertEquals("salutation", strolchEnumJ.get("name").getAsString());
|
assertEquals("salutation", strolchEnumJ.get("name").getAsString());
|
||||||
assertEquals(3, strolchEnumJ.get("values").getAsJsonArray().size());
|
assertEquals(3, strolchEnumJ.get("values").getAsJsonArray().size());
|
||||||
assertEquals("Mr",
|
assertEquals("Mr",
|
||||||
|
@ -97,7 +97,7 @@ public class EnumTest extends AbstractRestfulTest {
|
||||||
assertEquals(Status.OK.getStatusCode(), result.getStatus());
|
assertEquals(Status.OK.getStatusCode(), result.getStatus());
|
||||||
String strolchEnumS = result.readEntity(String.class);
|
String strolchEnumS = result.readEntity(String.class);
|
||||||
assertNotNull(strolchEnumS);
|
assertNotNull(strolchEnumS);
|
||||||
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
|
JsonObject strolchEnumJ = JsonParser.parseString(strolchEnumS).getAsJsonObject();
|
||||||
assertEquals("salutation", strolchEnumJ.get("name").getAsString());
|
assertEquals("salutation", strolchEnumJ.get("name").getAsString());
|
||||||
assertEquals(3, strolchEnumJ.get("values").getAsJsonArray().size());
|
assertEquals(3, strolchEnumJ.get("values").getAsJsonArray().size());
|
||||||
assertEquals("Herr", strolchEnumJ.get("values").getAsJsonArray().get(0).getAsJsonObject().get("value").
|
assertEquals("Herr", strolchEnumJ.get("values").getAsJsonArray().get(0).getAsJsonObject().get("value").
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class VersionQueryTest extends AbstractRestfulTest {
|
||||||
assertEquals(Status.OK.getStatusCode(), result.getStatus());
|
assertEquals(Status.OK.getStatusCode(), result.getStatus());
|
||||||
String versionQueryResultS = result.readEntity(String.class);
|
String versionQueryResultS = result.readEntity(String.class);
|
||||||
|
|
||||||
JsonObject versionQueryResultJ = new JsonParser().parse(versionQueryResultS).getAsJsonObject();
|
JsonObject versionQueryResultJ = JsonParser.parseString(versionQueryResultS).getAsJsonObject();
|
||||||
|
|
||||||
if (versionQueryResultJ.has("errors")) {
|
if (versionQueryResultJ.has("errors")) {
|
||||||
JsonArray errorsJ = versionQueryResultJ.get("errors").getAsJsonArray();
|
JsonArray errorsJ = versionQueryResultJ.get("errors").getAsJsonArray();
|
||||||
|
|
|
@ -298,7 +298,7 @@ public Response create(@Context HttpServletRequest request, String data) {
|
||||||
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
||||||
|
|
||||||
// parse data to JSON
|
// parse data to JSON
|
||||||
JsonObject jsonData = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonData = JsonParser.parseString(data).getAsJsonObject();
|
||||||
|
|
||||||
// instantiate the service with the argument
|
// instantiate the service with the argument
|
||||||
CreateBookService svc = new CreateBookService();
|
CreateBookService svc = new CreateBookService();
|
||||||
|
@ -392,7 +392,7 @@ public Response update(@Context HttpServletRequest request, @PathParam("id") Str
|
||||||
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
|
||||||
|
|
||||||
// parse data to JSON
|
// parse data to JSON
|
||||||
JsonObject jsonData = new JsonParser().parse(data).getAsJsonObject();
|
JsonObject jsonData = JsonParser.parseString(data).getAsJsonObject();
|
||||||
|
|
||||||
// instantiate the service with the argument
|
// instantiate the service with the argument
|
||||||
UpdateBookService svc = new UpdateBookService();
|
UpdateBookService svc = new UpdateBookService();
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
|
||||||
@Override
|
@Override
|
||||||
public void onMessage(String message) {
|
public void onMessage(String message) {
|
||||||
|
|
||||||
JsonObject jsonObject = new JsonParser().parse(message).getAsJsonObject();
|
JsonObject jsonObject = JsonParser.parseString(message).getAsJsonObject();
|
||||||
String msgType = jsonObject.get(MSG_TYPE).getAsString();
|
String msgType = jsonObject.get(MSG_TYPE).getAsString();
|
||||||
logger.info("Handling message " + msgType);
|
logger.info("Handling message " + msgType);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue