Merge pull request #2 from taboola/control-endpoint-is-sensitive-via-…

…property 1. Fix tests location 2. Control endpoint's isSensitive via property
taboola · Nov 25, 2020 · 0ff19fe · 0ff19fe
2 parents b05339f + b9e9db2
commit 0ff19fe
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/com/taboola/async_profiler/spring/AsyncProfilerEndPoint.java b/src/main/java/com/taboola/async_profiler/spring/AsyncProfilerEndPoint.java
@@ -14,9 +14,11 @@
 public class AsyncProfilerEndPoint implements MvcEndpoint {
 
     private final AsyncProfilerFacade asyncProfilerFacade;
+    private final boolean isSensitive;
 
-    public AsyncProfilerEndPoint(AsyncProfilerFacade asyncProfilerFacade) {
+    public AsyncProfilerEndPoint(AsyncProfilerFacade asyncProfilerFacade, boolean isSensitive) {
         this.asyncProfilerFacade = asyncProfilerFacade;
+        this.isSensitive = isSensitive;
     }
 
     @Override
@@ -26,7 +28,7 @@ public String getPath() {
 
     @Override
     public boolean isSensitive() {
-        return false;
+        return isSensitive;
     }
 
     @Override

diff --git a/src/main/java/com/taboola/async_profiler/spring/AsyncProfilerEndpointConfig.java b/src/main/java/com/taboola/async_profiler/spring/AsyncProfilerEndpointConfig.java
@@ -55,7 +55,8 @@ public AsyncProfilerFacade asyncProfilerFacade(AsyncProfilerSupplier asyncProfil
     }
 
     @Bean
-    public AsyncProfilerEndPoint asyncProfilerEndPoint(AsyncProfilerFacade asyncProfilerFacade) {
-        return new AsyncProfilerEndPoint(asyncProfilerFacade);
+    public AsyncProfilerEndPoint asyncProfilerEndPoint(AsyncProfilerFacade asyncProfilerFacade,
+                                                       @Value("${com.taboola.asyncprofiler.endpoint.sensitive:false}") boolean isSensitive) {
+        return new AsyncProfilerEndPoint(asyncProfilerFacade, isSensitive);
     }
 }
diff --git a/...ade/AsyncProfilerCommandsFactoryTest.java → ...ade/AsyncProfilerCommandsFactoryTest.java b/...ade/AsyncProfilerCommandsFactoryTest.java → ...ade/AsyncProfilerCommandsFactoryTest.java
diff --git a/...r/api/facade/AsyncProfilerFacadeTest.java → ...r/api/facade/AsyncProfilerFacadeTest.java b/...r/api/facade/AsyncProfilerFacadeTest.java → ...r/api/facade/AsyncProfilerFacadeTest.java
diff --git a/...ofiler/api/facade/ProfileRequestTest.java → ...ofiler/api/facade/ProfileRequestTest.java b/...ofiler/api/facade/ProfileRequestTest.java → ...ofiler/api/facade/ProfileRequestTest.java
diff --git a/...e/profiler/AsyncProfilerSupplierTest.java → ...e/profiler/AsyncProfilerSupplierTest.java b/...e/profiler/AsyncProfilerSupplierTest.java → ...e/profiler/AsyncProfilerSupplierTest.java
diff --git a/...cade/profiler/EmptyAsyncProfilerTest.java → ...cade/profiler/EmptyAsyncProfilerTest.java b/...cade/profiler/EmptyAsyncProfilerTest.java → ...cade/profiler/EmptyAsyncProfilerTest.java
diff --git a/...ler/spring/AsyncProfilerEndPointTest.java → ...ler/spring/AsyncProfilerEndPointTest.java b/...ler/spring/AsyncProfilerEndPointTest.java → ...ler/spring/AsyncProfilerEndPointTest.java
@@ -1,6 +1,8 @@
 package com.taboola.async_profiler.spring;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -27,7 +29,7 @@ public class AsyncProfilerEndPointTest {
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
-        asyncProfilerEndPoint = new AsyncProfilerEndPoint(asyncProfilerFacade);
+        asyncProfilerEndPoint = new AsyncProfilerEndPoint(asyncProfilerFacade, false);
     }
 
     @Test
@@ -59,4 +61,9 @@ public void testGetVersion() {
         assertEquals("1", asyncProfilerEndPoint.getVersion());
     }
 
+    @Test
+    public void testIsSensitive() {
+        assertFalse(new AsyncProfilerEndPoint(asyncProfilerFacade, false).isSensitive());
+        assertTrue(new AsyncProfilerEndPoint(asyncProfilerFacade, true).isSensitive());
+    }
 }