From 73e0056bc849b3271943895a3d86f1acec3d6b22 Mon Sep 17 00:00:00 2001 From: johnnyaug Date: Thu, 7 Sep 2023 18:20:57 +0300 Subject: [PATCH] cr fix --- .../io/lakefs/iceberg/LakeFSReporter.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/src/main/java/io/lakefs/iceberg/LakeFSReporter.java b/src/main/java/io/lakefs/iceberg/LakeFSReporter.java index acdbb41..31ecaba 100644 --- a/src/main/java/io/lakefs/iceberg/LakeFSReporter.java +++ b/src/main/java/io/lakefs/iceberg/LakeFSReporter.java @@ -1,8 +1,8 @@ package io.lakefs.iceberg; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.collect.ImmutableMap; +import java.net.URI; +import java.util.Base64; +import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; @@ -14,10 +14,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; -import java.util.Base64; -import java.util.HashMap; -import java.util.Map; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.ImmutableMap; public class LakeFSReporter { private URI lakeFSEndpoint; @@ -41,7 +40,7 @@ public void logOp(String op) { SimpleHttpRequest request = generateRequest(reportMap); httpClient.execute(request, null); } catch (Throwable ignored) { - logger.warn("Failed to report operation", ignored); + logger.warn("Failed to report operation", ignored); } } @@ -55,15 +54,9 @@ private SimpleHttpRequest generateRequest(Map body) throws JsonP } private String prepareRequestBody(Map requestMap) throws JsonProcessingException { - Map[]> statisticsRequest = new HashMap[]>() { - { - put("events", new Map[]{requestMap}); - } - }; - ObjectMapper objectMapper = new ObjectMapper(); - return objectMapper.writeValueAsString(statisticsRequest); + return new ObjectMapper().writeValueAsString(ImmutableMap.of("events", new Map[] { requestMap })); } - + private String generateBasicAuthHeader(Configuration hadoopConfig) { String key = hadoopConfig.get("fs.s3a.access.key"); String secret = hadoopConfig.get("fs.s3a.secret.key");