Move TestResource

trinodb · Jan 24, 2022 · aed9ce6 · aed9ce6
1 parent b31432c
commit aed9ce6
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java b/core/trino-main/src/test/java/io/trino/server/security/TestResourceSecurity.java
@@ -305,29 +305,6 @@ public void testPasswordAuthenticatorUserMapping()
         }
     }
 
-    @javax.ws.rs.Path("/identity")
-    public static class TestResource
-    {
-        private final HttpRequestSessionContextFactory sessionContextFactory;
-
-        @Inject
-        public TestResource(AccessControl accessControl)
-        {
-            this.sessionContextFactory = new HttpRequestSessionContextFactory(createTestMetadataManager(), ImmutableSet::of, accessControl);
-        }
-
-        @ResourceSecurity(AUTHENTICATED_USER)
-        @GET
-        public javax.ws.rs.core.Response echoToken(@Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
-        {
-            Identity identity = sessionContextFactory.extractAuthorizedIdentity(servletRequest, httpHeaders, Optional.empty());
-            return javax.ws.rs.core.Response.ok()
-                    .header("user", identity.getUser())
-                    .header("principal", identity.getPrincipal().map(Principal::getName).orElse(null))
-                    .build();
-        }
-    }
-
     @Test
     public void testPasswordAuthenticatorWithInsecureHttp()
             throws Exception
@@ -744,6 +721,29 @@ private static String getOauthToken(OkHttpClient client, String url)
         }
     }
 
+    @javax.ws.rs.Path("/identity")
+    public static class TestResource
+    {
+        private final HttpRequestSessionContextFactory sessionContextFactory;
+
+        @Inject
+        public TestResource(AccessControl accessControl)
+        {
+            this.sessionContextFactory = new HttpRequestSessionContextFactory(createTestMetadataManager(), ImmutableSet::of, accessControl);
+        }
+
+        @ResourceSecurity(AUTHENTICATED_USER)
+        @GET
+        public javax.ws.rs.core.Response echoToken(@Context HttpServletRequest servletRequest, @Context HttpHeaders httpHeaders)
+        {
+            Identity identity = sessionContextFactory.extractAuthorizedIdentity(servletRequest, httpHeaders, Optional.empty());
+            return javax.ws.rs.core.Response.ok()
+                    .header("user", identity.getUser())
+                    .header("principal", identity.getPrincipal().map(Principal::getName).orElse(null))
+                    .build();
+        }
+    }
+
     private void assertInsecureAuthentication(URI baseUri)
             throws IOException
     {