cleanups

Author: gtiwari333

common/src/main/java/gt/common/test/TestUtil.java

@@ -1,11 +1,8 @@
 package gt.common.test;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import tools.jackson.databind.ObjectMapper;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 
@@ -25,20 +22,4 @@ public static File fileFromClassPath(String name) {
             throw new IllegalArgumentException(e);
         }
     }
-
-//    public static byte[] convertObjectToJsonBytes(Object object)
-//        throws IOException {
-//        ObjectMapper mapper = new ObjectMapper();
-//        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-//
-//        return mapper.writeValueAsBytes(object);
-//    }
-
-//    public static byte[] createByteArray(int size, String data) {
-//        byte[] byteArray = new byte[size];
-//        for (int i = 0; i < size; i++) {
-//            byteArray[i] = Byte.parseByte(data, 2);
-//        }
-//        return byteArray;
-//    }
 }

content-checker/content-checker-service/src/main/resources/application.yml

@@ -25,4 +25,8 @@ management:
     health:
         jms:
             enabled: true
-    tracing.export.zipkin.endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
+    zipkin:
+        export:
+            tracing:
+                endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
+

email/email-service/pom.xml

@@ -92,7 +92,6 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers-junit-jupiter</artifactId>
-            <version>2.0.2</version>
         </dependency>
 
         <!-- test only dependencies -->

email/email-service/src/main/resources/application.yml

@@ -6,10 +6,17 @@ spring:
         port: ${MAILHOG_PORT:1025}
         username:
         password:
-
+    web:
+        error:
+            include-stacktrace: never
+            include-exception: true
+            include-binding-errors: always
+            include-message: always
+logging:
 server:
     port: 8085
-logging:
+
+
     level:
         org.springframework.web: INFO
         ROOT: WARN
@@ -19,14 +26,7 @@ management:
     tracing:
         sampling:
             probability: 1.0
-    tracing.export.zipkin.endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
-
-spring.web.error.include-binding-errors: always
-
-spring.web.error.include-exception: true
-
-spring.web.error.include-message: always
-
-spring.web.error.include-stacktrace: never
-
-
+    zipkin:
+        export:
+            tracing:
+                endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans

main-app/main-webapp/pom.xml

@@ -256,14 +256,12 @@
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers-junit-jupiter</artifactId>
             <scope>test</scope>
-            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers-mysql</artifactId>
             <optional>true</optional>
             <scope>test</scope>
-            <version>2.0.2</version>
         </dependency>
 
         <!-- query performance -->

main-app/main-webapp/src/main/resources/application.yml

@@ -104,9 +104,10 @@ management:
     tracing:
         sampling:
             probability: 1.0
+        zipkin:
+            export:
+                tracing:
+                    endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
     health:
         jms:
             enabled: true
-    tracing.export.zipkin.endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
-
-debug: true

main-app/report-service/src/main/resources/application.yml

@@ -25,4 +25,8 @@ management:
     tracing:
         sampling:
             probability: 1.0
-    tracing.export.zipkin.endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
+    zipkin:
+        export:
+            tracing:
+                endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
+

pom.xml

@@ -45,7 +45,7 @@
         <wro4j.version>2.1.1</wro4j.version>
         <archunit.version>1.3.0</archunit.version>
         <testcontainers-keycloak.version>3.4.0</testcontainers-keycloak.version>
-        <testcontainers.version>1.20.1</testcontainers.version>
+        <testcontainers.version>2.0.2</testcontainers.version>
         <commons-io.version>2.17.0</commons-io.version>
         <webjar-jquery.version>3.6.1</webjar-jquery.version>
         <webjar-bootstrap.version>5.0.1</webjar-bootstrap.version>

trend/trend-service/src/main/resources/application.yml

@@ -19,4 +19,8 @@ management:
     tracing:
         sampling:
             probability: 1.0
-    tracing.export.zipkin.endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
+    zipkin:
+        export:
+            tracing:
+                endpoint: http://${ZIPKIN_HOST:localhost}:${ZIPKIN_PORT:9411}/api/v2/spans
+