diff --git a/sources/src/main/java/com/google/solutions/jitaccess/web/RuntimeEnvironment.java b/sources/src/main/java/com/google/solutions/jitaccess/web/RuntimeEnvironment.java index 7863a2c63..b5ebef68f 100644 --- a/sources/src/main/java/com/google/solutions/jitaccess/web/RuntimeEnvironment.java +++ b/sources/src/main/java/com/google/solutions/jitaccess/web/RuntimeEnvironment.java @@ -41,6 +41,7 @@ import com.google.solutions.jitaccess.core.notifications.MailNotificationService; import com.google.solutions.jitaccess.core.notifications.NotificationService; import com.google.solutions.jitaccess.core.notifications.PubSubNotificationService; +import com.google.solutions.jitaccess.web.rest.ApiResource; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; import jakarta.ws.rs.core.UriBuilder; diff --git a/sources/src/main/java/com/google/solutions/jitaccess/web/XsrfRequestFilter.java b/sources/src/main/java/com/google/solutions/jitaccess/web/XsrfRequestFilter.java index cca0debc0..c37820f2f 100644 --- a/sources/src/main/java/com/google/solutions/jitaccess/web/XsrfRequestFilter.java +++ b/sources/src/main/java/com/google/solutions/jitaccess/web/XsrfRequestFilter.java @@ -22,6 +22,7 @@ package com.google.solutions.jitaccess.web; import com.google.solutions.jitaccess.core.AccessDeniedException; +import com.google.solutions.jitaccess.web.rest.ExceptionMappers; import jakarta.annotation.Priority; import jakarta.enterprise.context.Dependent; import jakarta.ws.rs.Priorities; diff --git a/sources/src/main/java/com/google/solutions/jitaccess/web/ApiResource.java b/sources/src/main/java/com/google/solutions/jitaccess/web/rest/ApiResource.java similarity index 99% rename from sources/src/main/java/com/google/solutions/jitaccess/web/ApiResource.java rename to sources/src/main/java/com/google/solutions/jitaccess/web/rest/ApiResource.java index b155a7575..aa86c19a9 100644 --- a/sources/src/main/java/com/google/solutions/jitaccess/web/ApiResource.java +++ b/sources/src/main/java/com/google/solutions/jitaccess/web/rest/ApiResource.java @@ -19,12 +19,16 @@ // under the License. // -package com.google.solutions.jitaccess.web; +package com.google.solutions.jitaccess.web.rest; import com.google.common.base.Preconditions; import com.google.solutions.jitaccess.core.*; import com.google.solutions.jitaccess.core.entitlements.*; import com.google.solutions.jitaccess.core.notifications.NotificationService; +import com.google.solutions.jitaccess.web.LogAdapter; +import com.google.solutions.jitaccess.web.LogEvents; +import com.google.solutions.jitaccess.web.RuntimeEnvironment; +import com.google.solutions.jitaccess.web.TokenObfuscator; import com.google.solutions.jitaccess.web.auth.UserPrincipal; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Instance; diff --git a/sources/src/main/java/com/google/solutions/jitaccess/web/ExceptionMappers.java b/sources/src/main/java/com/google/solutions/jitaccess/web/rest/ExceptionMappers.java similarity index 99% rename from sources/src/main/java/com/google/solutions/jitaccess/web/ExceptionMappers.java rename to sources/src/main/java/com/google/solutions/jitaccess/web/rest/ExceptionMappers.java index afd92f402..f49ed80dc 100644 --- a/sources/src/main/java/com/google/solutions/jitaccess/web/ExceptionMappers.java +++ b/sources/src/main/java/com/google/solutions/jitaccess/web/rest/ExceptionMappers.java @@ -19,7 +19,7 @@ // under the License. // -package com.google.solutions.jitaccess.web; +package com.google.solutions.jitaccess.web.rest; import com.google.solutions.jitaccess.core.AccessDeniedException; import com.google.solutions.jitaccess.core.NotAuthenticatedException; diff --git a/sources/src/test/java/com/google/solutions/jitaccess/web/RestDispatcher.java b/sources/src/test/java/com/google/solutions/jitaccess/web/rest/RestDispatcher.java similarity index 97% rename from sources/src/test/java/com/google/solutions/jitaccess/web/RestDispatcher.java rename to sources/src/test/java/com/google/solutions/jitaccess/web/rest/RestDispatcher.java index 81f762301..56fa25b3e 100644 --- a/sources/src/test/java/com/google/solutions/jitaccess/web/RestDispatcher.java +++ b/sources/src/test/java/com/google/solutions/jitaccess/web/rest/RestDispatcher.java @@ -19,12 +19,13 @@ // under the License. // -package com.google.solutions.jitaccess.web; +package com.google.solutions.jitaccess.web.rest; import com.google.gson.Gson; import com.google.solutions.jitaccess.web.auth.DeviceInfo; import com.google.solutions.jitaccess.core.UserId; import com.google.solutions.jitaccess.web.auth.UserPrincipal; +import com.google.solutions.jitaccess.web.rest.ExceptionMappers; import org.jboss.resteasy.core.SynchronousDispatcher; import org.jboss.resteasy.core.SynchronousExecutionContext; import org.jboss.resteasy.mock.MockDispatcherFactory; diff --git a/sources/src/test/java/com/google/solutions/jitaccess/web/TestApiResource.java b/sources/src/test/java/com/google/solutions/jitaccess/web/rest/TestApiResource.java similarity index 99% rename from sources/src/test/java/com/google/solutions/jitaccess/web/TestApiResource.java rename to sources/src/test/java/com/google/solutions/jitaccess/web/rest/TestApiResource.java index da87398ee..532a74220 100644 --- a/sources/src/test/java/com/google/solutions/jitaccess/web/TestApiResource.java +++ b/sources/src/test/java/com/google/solutions/jitaccess/web/rest/TestApiResource.java @@ -19,13 +19,16 @@ // under the License. // -package com.google.solutions.jitaccess.web; +package com.google.solutions.jitaccess.web.rest; import com.google.auth.oauth2.TokenVerifier; import com.google.solutions.jitaccess.core.AccessDeniedException; import com.google.solutions.jitaccess.core.entitlements.ProjectRole; import com.google.solutions.jitaccess.core.entitlements.RoleBinding; import com.google.solutions.jitaccess.core.UserId; +import com.google.solutions.jitaccess.web.LogAdapter; +import com.google.solutions.jitaccess.web.RuntimeEnvironment; +import com.google.solutions.jitaccess.web.TokenObfuscator; import jakarta.enterprise.inject.Instance; import com.google.solutions.jitaccess.core.ProjectId; import com.google.solutions.jitaccess.core.entitlements.ActivationTokenService;