Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] replaced deprecated call with new call

This commit is contained in:
Robert von Burg 2020-08-18 16:39:56 +02:00
parent f1c1948398
commit 86794367eb
16 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementFromJsonVisitor.java
View File

@ -14,15 +14,15 @@ import li.strolch.privilege.model.UserState;
public class PrivilegeElementFromJsonVisitor {
public UserRep userRepFromJson(String string) {
return userRepFromJson(new JsonParser().parse(string).getAsJsonObject());
return userRepFromJson(JsonParser.parseString(string).getAsJsonObject());
}
public RoleRep roleRepFromJson(String string) {
return roleRepFromJson(new JsonParser().parse(string).getAsJsonObject());
return roleRepFromJson(JsonParser.parseString(string).getAsJsonObject());
}
public PrivilegeRep privilegeRepFromJson(String string) {
return privilegeRepFromJson(new JsonParser().parse(string).getAsJsonObject());
return privilegeRepFromJson(JsonParser.parseString(string).getAsJsonObject());
}
public RoleRep roleRepFromJson(JsonObject jsonObject) {

2
li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlActivityDao.java
View File

@ -87,7 +87,7 @@ public class PostgreSqlActivityDao extends PostgresqlDao<Activity> implements Ac
@Override
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);
}

2
li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java
View File

@ -104,7 +104,7 @@ public class PostgreSqlOrderDao extends PostgresqlDao<Order> implements OrderDao
@Override
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);
}

2
li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlResourceDao.java
View File

@ -87,7 +87,7 @@ public class PostgreSqlResourceDao extends PostgresqlDao<Resource> implements Re
@Override
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);
}

2
li.strolch.privilege/src/main/java/li/strolch/privilege/handler/JsonConfigLdapPrivilegeHandler.java
View File

@ -54,7 +54,7 @@ public class JsonConfigLdapPrivilegeHandler extends BaseLdapPrivilegeHandler {
// parse the configuration file
JsonObject configJ;
try (FileReader reader = new FileReader(configFile)) {
configJ = new JsonParser().parse(reader).getAsJsonObject();
configJ = JsonParser.parseReader(reader).getAsJsonObject();
} catch (Exception e) {
throw new IllegalStateException("Failed to read config file " + configFile.getAbsolutePath(), e);
}

6
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
View File

@ -60,7 +60,7 @@ public class AuthenticationService {
@Produces(MediaType.APPLICATION_JSON)
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 {
@ -299,7 +299,7 @@ public class AuthenticationService {
public Response initiateChallenge(@Context HttpServletRequest request, String data) {
try {
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
String username = jsonObject.get("username").getAsString();
String usage = jsonObject.get("usage").getAsString();
@ -325,7 +325,7 @@ public class AuthenticationService {
try {
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
String username = jsonObject.get("username").getAsString();
String challenge = jsonObject.get("challenge").getAsString();

6
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/I18nService.java
View File

@ -45,7 +45,7 @@ public class I18nService {
JsonObject i18nJ;
try (FileReader in = new FileReader(i18nFile)) {
i18nJ = new JsonParser().parse(in).getAsJsonObject();
i18nJ = JsonParser.parseReader(in).getAsJsonObject();
} catch (IOException e) {
throw new IllegalStateException("Failed to read i18n file at " + i18nFile);
}
@ -69,7 +69,7 @@ public class I18nService {
JsonObject i18nJ;
try (FileReader in = new FileReader(i18nFile)) {
i18nJ = new JsonParser().parse(in).getAsJsonObject();
i18nJ = JsonParser.parseReader(in).getAsJsonObject();
} catch (IOException e) {
throw new IllegalStateException("Failed to read i18n file at " + i18nFile);
}
@ -87,7 +87,7 @@ public class I18nService {
if (!ctx.hasRole(ROLE_STROLCH_ADMIN))
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 i18nFile = new File(webPath, "/locales.json");

18
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/Inspector.java
View File

@ -795,7 +795,7 @@ public class Inspector {
StrolchRootElementArgument arg = new StrolchRootElementArgument();
// parse JSON string
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
Resource resource;
if (flat) {
@ -872,7 +872,7 @@ public class Inspector {
StrolchRootElementArgument arg = new StrolchRootElementArgument();
// parse JSON string
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
Order order;
if (flat) {
@ -949,7 +949,7 @@ public class Inspector {
StrolchRootElementArgument arg = new StrolchRootElementArgument();
// parse JSON string
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
Activity activity;
if (flat) {
@ -1066,7 +1066,7 @@ public class Inspector {
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
// parse from complete JSON
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
ResourceFromJsonVisitor visitor = new ResourceFromJsonVisitor();
Resource resource = visitor.visit(jsonObject);
@ -1145,7 +1145,7 @@ public class Inspector {
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
// parse from complete JSON
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
OrderFromJsonVisitor visitor = new OrderFromJsonVisitor();
Order order = visitor.visit(jsonObject);
@ -1226,7 +1226,7 @@ public class Inspector {
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
// parse from complete JSON
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
ActivityFromJsonVisitor visitor = new ActivityFromJsonVisitor();
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) {
// parse JSON string
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
Resource resource;
if (flat) {
@ -1510,7 +1510,7 @@ public class Inspector {
private Order parseNewOrderFromJson(Certificate cert, String realm, String type, String data, boolean flat) {
// parse JSON string
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
Order order;
if (flat) {
@ -1537,7 +1537,7 @@ public class Inspector {
private Activity parseNewActivityFromJson(Certificate cert, String realm, String type, String data, boolean flat) {
// parse JSON string
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
Activity activity;
if (flat) {

2
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ModelQuery.java
View File

@ -38,7 +38,7 @@ public class ModelQuery {
@QueryParam("flat") String flat, String data) {
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
QueryResponse queryResponse;
try (StrolchTransaction tx = openTx(cert, realmName)) {

4
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java
View File

@ -175,7 +175,7 @@ public class PrivilegeUsersService {
PrivilegeUpdateUserRolesService svc = new PrivilegeUpdateUserRolesService();
JsonServiceArgument arg = svc.getArgumentInstance();
arg.objectId = username;
arg.jsonElement = new JsonParser().parse(data);
arg.jsonElement = JsonParser.parseString(data);
PrivilegeUserResult svcResult = svcHandler.doService(cert, svc, arg);
return handleServiceResult(svcResult);
@ -276,7 +276,7 @@ public class PrivilegeUsersService {
try {
JsonObject jsonObject = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(data).getAsJsonObject();
String passwordEncoded = jsonObject.get("password").getAsString();
byte[] decode = Base64.getDecoder().decode(passwordEncoded);

12
li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java
View File

@ -100,7 +100,7 @@ public class ReportResource {
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
JsonObject localeJ = null;
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();
if (localesJ.has(cert.getLocale().toLanguageTag()))
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
@ -155,7 +155,7 @@ public class ReportResource {
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
JsonObject localeJ = null;
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();
if (localesJ.has(cert.getLocale().toLanguageTag()))
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
@ -216,7 +216,7 @@ public class ReportResource {
DBC.PRE.assertNotEmpty("report ID is required", id);
// 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 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));
JsonObject localeJ = null;
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();
if (localesJ.has(cert.getLocale().toLanguageTag()))
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
@ -345,7 +345,7 @@ public class ReportResource {
DBC.PRE.assertNotEmpty("report ID is required", id);
// 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 ?
getFiltersFromJson(jsonObject.get(PARAM_FILTER).getAsJsonArray()) :
@ -381,7 +381,7 @@ public class ReportResource {
File localesF = new File(request.getServletContext().getRealPath(LOCALES_JSON));
JsonObject localeJ = null;
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();
if (localesJ.has(cert.getLocale().toLanguageTag()))
localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();

4
li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/AbstractRestfulTest.java
View File

@ -112,7 +112,7 @@ public abstract class AbstractRestfulTest extends JerseyTest {
.post(entity);
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(64, loginResult.get("authToken").getAsString().length());
assertNull(loginResult.get("msg"));
@ -128,7 +128,7 @@ public abstract class AbstractRestfulTest extends JerseyTest {
.delete();
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());
}

6
li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/EnumTest.java
View File

@ -61,7 +61,7 @@ public class EnumTest extends AbstractRestfulTest {
assertEquals(Status.OK.getStatusCode(), result.getStatus());
String strolchEnumS = result.readEntity(String.class);
assertNotNull(strolchEnumS);
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
JsonObject strolchEnumJ = JsonParser.parseString(strolchEnumS).getAsJsonObject();
assertEquals("sex", strolchEnumJ.get("name").getAsString());
assertEquals(4, strolchEnumJ.get("values").getAsJsonArray().size());
}
@ -78,7 +78,7 @@ public class EnumTest extends AbstractRestfulTest {
assertEquals(Status.OK.getStatusCode(), result.getStatus());
String strolchEnumS = result.readEntity(String.class);
assertNotNull(strolchEnumS);
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
JsonObject strolchEnumJ = JsonParser.parseString(strolchEnumS).getAsJsonObject();
assertEquals("salutation", strolchEnumJ.get("name").getAsString());
assertEquals(3, strolchEnumJ.get("values").getAsJsonArray().size());
assertEquals("Mr",
@ -97,7 +97,7 @@ public class EnumTest extends AbstractRestfulTest {
assertEquals(Status.OK.getStatusCode(), result.getStatus());
String strolchEnumS = result.readEntity(String.class);
assertNotNull(strolchEnumS);
JsonObject strolchEnumJ = new JsonParser().parse(strolchEnumS).getAsJsonObject();
JsonObject strolchEnumJ = JsonParser.parseString(strolchEnumS).getAsJsonObject();
assertEquals("salutation", strolchEnumJ.get("name").getAsString());
assertEquals(3, strolchEnumJ.get("values").getAsJsonArray().size());
assertEquals("Herr", strolchEnumJ.get("values").getAsJsonArray().get(0).getAsJsonObject().get("value").

2
li.strolch.rest/src/test/java/li/strolch/rest/inspector/test/VersionQueryTest.java
View File

@ -62,7 +62,7 @@ public class VersionQueryTest extends AbstractRestfulTest {
assertEquals(Status.OK.getStatusCode(), result.getStatus());
String versionQueryResultS = result.readEntity(String.class);
JsonObject versionQueryResultJ = new JsonParser().parse(versionQueryResultS).getAsJsonObject();
JsonObject versionQueryResultJ = JsonParser.parseString(versionQueryResultS).getAsJsonObject();
if (versionQueryResultJ.has("errors")) {
JsonArray errorsJ = versionQueryResultJ.get("errors").getAsJsonArray();

4
li.strolch.website/www.strolch.li/tutorial-crud-book.html
View File

@ -298,7 +298,7 @@ public Response create(@Context HttpServletRequest request, String data) {
Certificate cert = (Certificate) request.getAttribute(StrolchRestfulConstants.STROLCH_CERTIFICATE);
// parse data to JSON
JsonObject jsonData = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonData = JsonParser.parseString(data).getAsJsonObject();
// instantiate the service with the argument
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);
// parse data to JSON
JsonObject jsonData = new JsonParser().parse(data).getAsJsonObject();
JsonObject jsonData = JsonParser.parseString(data).getAsJsonObject();
// instantiate the service with the argument
UpdateBookService svc = new UpdateBookService();

2
li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketClient.java
View File

@ -57,7 +57,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
@Override
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();
logger.info("Handling message " + msgType);