fix/periodic-sync: sep 2023

anuvu · Sep 6, 2023 · d337beb · d337beb
1 parent 5d77f56
commit d337beb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
         </repository>
     </repositories>
 
-    <dependencyManagement>
+    <!-- <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
@@ -60,7 +60,7 @@
                 <type>pom</type>
             </dependency>
         </dependencies>
-    </dependencyManagement>
+    </dependencyManagement> -->
 
     <dependencies>
     	<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
@@ -219,6 +219,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/src/main/java/kafdrop/controller/ClusterController.java b/src/main/java/kafdrop/controller/ClusterController.java
@@ -39,6 +39,7 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;

diff --git a/src/main/java/kafdrop/controller/QuotaController.java b/src/main/java/kafdrop/controller/QuotaController.java
@@ -1,8 +1,5 @@
 package kafdrop.controller;
 
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import kafdrop.model.KafkaQuotaVO;
 import kafdrop.service.KafkaMonitor;
 import org.slf4j.Logger;
@@ -15,6 +12,10 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+
 import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -61,10 +62,10 @@ public String quotas(Model model) {
         return "quota-overview";
     }
 
-    @ApiOperation(value = "getAllQuotas", notes = "Get list of all quotas")
-    @ApiResponses(value = {
-            @ApiResponse(code = 200, message = "Success", response = String.class, responseContainer = "List")
-    })
+    @Operation(description = "Get list of all quotas")
+    // @ApiResponses(value = {
+    //         @ApiResponse(statusCode = 200, message = "Success", response = String.class, responseContainer = "List")
+    // })
     @RequestMapping(path = "/quotas", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     public @ResponseBody
     List<KafkaQuotaVO> getAllQuotas() {

diff --git a/src/test/java/kafdrop/KafdropTest.java b/src/test/java/kafdrop/KafdropTest.java
@@ -37,7 +37,7 @@ public void contextLoads() throws Exception {
   @Test
   public void getReturnsExpectedGutHubStarText() throws Exception {
     ResponseEntity<String> responseEntity = restTemplate
-      .getForEntity("http://localhost:" + port + "/", String.class);
+      .getForEntity("http://localhost:" + port + "/overview", String.class);
     assertEquals(OK, responseEntity.getStatusCode());
     assertThat(responseEntity.getBody().contains("Star Kafdrop on GitHub"));
   }