[Major] Renamed REST classes to have Resource suffix

This commit is contained in:
Robert von Burg 2023-11-21 10:20:07 +01:00
parent 52ae1574f4
commit 68a13d0e77
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
14 changed files with 34 additions and 37 deletions

View File

@ -34,25 +34,25 @@ public class StrolchRestfulClasses {
Set<Class<?>> restfulClasses = new HashSet<>();
restfulClasses.add(AuthenticationService.class);
restfulClasses.add(AuthenticationResource.class);
restfulClasses.add(StrolchJobsResource.class);
restfulClasses.add(ReportResource.class);
restfulClasses.add(ControlResource.class);
restfulClasses.add(Inspector.class);
restfulClasses.add(I18nService.class);
restfulClasses.add(VersionQuery.class);
restfulClasses.add(ModelQuery.class);
restfulClasses.add(EnumQuery.class);
restfulClasses.add(Languages.class);
restfulClasses.add(InspectorResource.class);
restfulClasses.add(I18nResource.class);
restfulClasses.add(VersionResource.class);
restfulClasses.add(ModelResource.class);
restfulClasses.add(EnumResource.class);
restfulClasses.add(LanguagesResource.class);
restfulClasses.add(OperationsLogResource.class);
restfulClasses.add(AgentResource.class);
// privilege
restfulClasses.add(PrivilegeUsersService.class);
restfulClasses.add(PrivilegeRolesService.class);
restfulClasses.add(PrivilegePoliciesService.class);
restfulClasses.add(UserSessionsService.class);
restfulClasses.add(AuditsService.class);
restfulClasses.add(PrivilegeUsersResource.class);
restfulClasses.add(PrivilegeRolesResource.class);
restfulClasses.add(PrivilegePoliciesResource.class);
restfulClasses.add(UserSessionsResource.class);
restfulClasses.add(AuditsResource.class);
Set<Class<?>> providerClasses = new HashSet<>();
providerClasses.add(StrolchRestfulExceptionMapper.class);

View File

@ -31,7 +31,7 @@ import li.strolch.rest.RestfulStrolchComponent;
import li.strolch.rest.StrolchRestfulConstants;
@Path("strolch/audits")
public class AuditsService {
public class AuditsResource {
private static String getContext() {
StackTraceElement element = new Throwable().getStackTrace()[1];

View File

@ -53,9 +53,9 @@ import org.slf4j.LoggerFactory;
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@Path("strolch/authentication")
public class AuthenticationService {
public class AuthenticationResource {
private static final Logger logger = LoggerFactory.getLogger(AuthenticationService.class);
private static final Logger logger = LoggerFactory.getLogger(AuthenticationResource.class);
@POST
@Consumes(MediaType.APPLICATION_JSON)

View File

@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@Path("strolch/enums")
public class EnumQuery {
public class EnumResource {
private static final Logger logger = LoggerFactory.getLogger(EnumQuery.class);
private static final Logger logger = LoggerFactory.getLogger(EnumResource.class);
@GET
@Produces(MediaType.APPLICATION_JSON)

View File

@ -27,9 +27,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Path("strolch/i18n")
public class I18nService {
public class I18nResource {
private static final Logger logger = LoggerFactory.getLogger(I18nService.class);
private static final Logger logger = LoggerFactory.getLogger(I18nResource.class);
@GET
@Path("data")

View File

@ -71,7 +71,6 @@ import java.util.Set;
import static java.util.Collections.emptySet;
import static java.util.Collections.sort;
import static li.strolch.model.StrolchModelConstants.ROLE_STROLCH_ADMIN;
import static li.strolch.rest.StrolchRestfulConstants.MSG;
import static li.strolch.rest.StrolchRestfulConstants.STROLCH_CERTIFICATE;
import static li.strolch.rest.helper.ResponseUtil.toResponse;
@ -87,14 +86,14 @@ import static li.strolch.utils.helper.ExceptionHelper.getCallerMethodNoClass;
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@Path("strolch/inspector")
public class Inspector {
public class InspectorResource {
private static final Logger logger = LoggerFactory.getLogger(Inspector.class);
private static final Logger logger = LoggerFactory.getLogger(InspectorResource.class);
private static Certificate validateCertificate(HttpServletRequest request) {
Certificate cert = (Certificate) request.getAttribute(STROLCH_CERTIFICATE);
RestfulStrolchComponent rest = RestfulStrolchComponent.getInstance();
rest.validate(cert).validateAction(Inspector.class.getSimpleName(), getCallerMethodNoClass(2));
rest.validate(cert).validateAction(InspectorResource.class.getSimpleName(), getCallerMethodNoClass(2));
return cert;
}

View File

@ -18,9 +18,9 @@ import java.util.Set;
import static li.strolch.utils.helper.ExceptionHelper.getRootCauseMessage;
@Path("strolch/languages")
public class Languages {
public class LanguagesResource {
private static final Logger logger = LoggerFactory.getLogger(Languages.class);
private static final Logger logger = LoggerFactory.getLogger(LanguagesResource.class);
@GET
@Path("supported")

View File

@ -20,7 +20,7 @@ import li.strolch.soql.core.QueryRequest;
import li.strolch.soql.core.QueryResponse;
@Path("strolch/model")
public class ModelQuery {
public class ModelResource {
private static String getContext() {
StackTraceElement element = new Throwable().getStackTrace()[2];

View File

@ -40,7 +40,7 @@ import li.strolch.rest.StrolchRestfulConstants;
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@Path("strolch/privilege/policies")
public class PrivilegePoliciesService {
public class PrivilegePoliciesResource {
// private static final Logger logger = LoggerFactory.getLogger(PrivilegePoliciesService.class);

View File

@ -41,7 +41,7 @@ import static li.strolch.privilege.handler.PrivilegeHandler.PRIVILEGE_GET_ROLE;
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@Path("strolch/privilege/roles")
public class PrivilegeRolesService {
public class PrivilegeRolesResource {
private PrivilegeHandler getPrivilegeHandler() {
ComponentContainer container = RestfulStrolchComponent.getInstance().getContainer();

View File

@ -61,9 +61,9 @@ import static li.strolch.search.SearchBuilder.buildSimpleValueSearch;
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@Path("strolch/privilege/users")
public class PrivilegeUsersService {
public class PrivilegeUsersResource {
private static final Logger logger = LoggerFactory.getLogger(PrivilegeUsersService.class);
private static final Logger logger = LoggerFactory.getLogger(PrivilegeUsersResource.class);
private PrivilegeHandler getPrivilegeHandler() {
ComponentContainer container = RestfulStrolchComponent.getInstance().getContainer();

View File

@ -47,9 +47,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Path("strolch/sessions")
public class UserSessionsService {
public class UserSessionsResource {
private static final Logger logger = LoggerFactory.getLogger(UserSessionsService.class);
private static final Logger logger = LoggerFactory.getLogger(UserSessionsResource.class);
private static String getContext() {
StackTraceElement element = new Throwable().getStackTrace()[1];

View File

@ -26,11 +26,9 @@ import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import li.strolch.agent.api.StrolchAgent;
import li.strolch.agent.api.VersionQueryResult;
import li.strolch.model.StrolchModelConstants;
import li.strolch.privilege.model.Certificate;
import li.strolch.rest.RestfulStrolchComponent;
import li.strolch.rest.StrolchRestfulConstants;
@ -39,7 +37,7 @@ import li.strolch.rest.StrolchRestfulConstants;
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@Path("strolch/version")
public class VersionQuery {
public class VersionResource {
@GET
@Produces(MediaType.APPLICATION_JSON)

View File

@ -32,7 +32,7 @@ import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import li.strolch.rest.StrolchRestfulClasses;
import li.strolch.rest.endpoint.Inspector;
import li.strolch.rest.endpoint.InspectorResource;
import li.strolch.rest.filters.AuthenticationRequestFilter;
import li.strolch.testbase.runtime.RuntimeMock;
import org.glassfish.grizzly.http.server.HttpServer;
@ -171,7 +171,7 @@ public abstract class AbstractRestfulTest extends JerseyTest {
try {
this.server = GrizzlyWebContainerFactory.create(baseUri,
Collections.singletonMap("jersey.config.server.provider.packages",
Inspector.class.getPackage().getName() + ";"
InspectorResource.class.getPackage().getName() + ";"
+ AuthenticationRequestFilter.class.getPackage().getName()));
} catch (ProcessingException | IOException e) {
throw new TestContainerException(e);