Merge pull request #182 from PublicisSapient/feature/formatting-changes-15-1-0

formatting chnages

Author: gurdeep-singh-49

ai-data-processor/pom.xml

@@ -9,15 +9,19 @@
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
-@ComponentScan(basePackages = { "com.publicissapient", "com.knowhow.retro.notifications",
-		"com.knowhow.retro.aigatewayclient" })
-@EnableMongoRepositories(basePackages = { "com.publicissapient.**.repository" })
+@ComponentScan(
+		basePackages = {
+			"com.publicissapient",
+			"com.knowhow.retro.notifications",
+			"com.knowhow.retro.aigatewayclient"
+		})
+@EnableMongoRepositories(basePackages = {"com.publicissapient.**.repository"})
 @EnableBatchProcessing
 @EnableAsync
 @EnableScheduling
 public class AiDataProcessorApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(AiDataProcessorApplication.class, args);
-    }
-}
+	public static void main(String[] args) {
+		SpringApplication.run(AiDataProcessorApplication.class, args);
+	}
+}

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/AiDataProcessorApplication.java

@@ -49,25 +49,39 @@ public class KnowHOWClient {
 
 	private final WebClient knowHOWWebClient;
 
-	public KnowHOWClient(WebClient.Builder webClientBuilder, KnowHOWApiClientConfig knowHOWApiClientConfig) {
+	public KnowHOWClient(
+			WebClient.Builder webClientBuilder, KnowHOWApiClientConfig knowHOWApiClientConfig) {
 		this.knowHOWApiClientConfig = knowHOWApiClientConfig;
 
-		this.knowHOWWebClient = webClientBuilder.defaultHeader("X-Api-Key", knowHOWApiClientConfig.getApiKey())
-				.codecs(clientCodecConfigurer -> clientCodecConfigurer.defaultCodecs()
-						.maxInMemorySize(MAX_IN_MEMORY_SIZE_BYTE_COUNT))
-				.baseUrl(knowHOWApiClientConfig.getBaseUrl()).build();
-
-		this.semaphore = new Semaphore(knowHOWApiClientConfig.getRateLimiting().getMaxConcurrentCalls());
+		this.knowHOWWebClient =
+				webClientBuilder
+						.defaultHeader("X-Api-Key", knowHOWApiClientConfig.getApiKey())
+						.codecs(
+								clientCodecConfigurer ->
+										clientCodecConfigurer
+												.defaultCodecs()
+												.maxInMemorySize(MAX_IN_MEMORY_SIZE_BYTE_COUNT))
+						.baseUrl(knowHOWApiClientConfig.getBaseUrl())
+						.build();
+
+		this.semaphore =
+				new Semaphore(knowHOWApiClientConfig.getRateLimiting().getMaxConcurrentCalls());
 	}
 
 	public List<KpiElement> getKpiIntegrationValuesSync(Iterable<KpiRequest> kpiRequests) {
 		List<KpiElement> allResults = new ArrayList<>();
 
 		for (KpiRequest kpiRequest : kpiRequests) {
-			List<KpiElement> results = this.knowHOWWebClient.post()
-					.uri(this.knowHOWApiClientConfig.getKpiIntegrationValuesEndpointConfig().getPath())
-					.bodyValue(kpiRequest).retrieve().bodyToFlux(KpiElement.class).retryWhen(retrySpec()).collectList()
-					.block();
+			List<KpiElement> results =
+					this.knowHOWWebClient
+							.post()
+							.uri(this.knowHOWApiClientConfig.getKpiIntegrationValuesEndpointConfig().getPath())
+							.bodyValue(kpiRequest)
+							.retrieve()
+							.bodyToFlux(KpiElement.class)
+							.retryWhen(retrySpec())
+							.collectList()
+							.block();
 
 			if (CollectionUtils.isNotEmpty(results)) {
 				allResults.addAll(results);
@@ -81,10 +95,19 @@ public List<KpiElement> getKpiIntegrationValuesKanbanSync(Iterable<KpiRequest> k
 		List<KpiElement> allResults = new ArrayList<>();
 
 		for (KpiRequest kpiRequest : kpiRequests) {
-			List<KpiElement> results = this.knowHOWWebClient.post()
-					.uri(this.knowHOWApiClientConfig.getKpiIntegrationValuesKanbanEndpointConfig().getPath())
-					.bodyValue(kpiRequest).retrieve().bodyToFlux(KpiElement.class).retryWhen(retrySpec()).collectList()
-					.block();
+			List<KpiElement> results =
+					this.knowHOWWebClient
+							.post()
+							.uri(
+									this.knowHOWApiClientConfig
+											.getKpiIntegrationValuesKanbanEndpointConfig()
+											.getPath())
+							.bodyValue(kpiRequest)
+							.retrieve()
+							.bodyToFlux(KpiElement.class)
+							.retryWhen(retrySpec())
+							.collectList()
+							.block();
 
 			if (CollectionUtils.isNotEmpty(results)) {
 				allResults.addAll(results);
@@ -95,44 +118,79 @@ public List<KpiElement> getKpiIntegrationValuesKanbanSync(Iterable<KpiRequest> k
 	}
 
 	public List<KpiElement> getKpiIntegrationValuesAsync(List<KpiRequest> kpiRequests) {
-		return Flux.fromIterable(kpiRequests).publishOn(Schedulers.boundedElastic()).flatMap(kpiRequest -> {
-			try {
-				semaphore.acquire();
-				return this.knowHOWWebClient.post()
-						.uri(this.knowHOWApiClientConfig.getKpiIntegrationValuesEndpointConfig().getPath())
-						.bodyValue(kpiRequest).retrieve().bodyToFlux(KpiElement.class).retryWhen(retrySpec())
-						.collectList().doFinally(signalType -> semaphore.release());
-			} catch (InterruptedException e) {
-				log.error("Could not get kpi integration values for kpiRequest {}", kpiRequest);
-				Thread.currentThread().interrupt();
-				return Flux.error(e);
-			}
-		}).flatMapIterable(list -> list).collectList().block();
+		return Flux.fromIterable(kpiRequests)
+				.publishOn(Schedulers.boundedElastic())
+				.flatMap(
+						kpiRequest -> {
+							try {
+								semaphore.acquire();
+								return this.knowHOWWebClient
+										.post()
+										.uri(
+												this.knowHOWApiClientConfig
+														.getKpiIntegrationValuesEndpointConfig()
+														.getPath())
+										.bodyValue(kpiRequest)
+										.retrieve()
+										.bodyToFlux(KpiElement.class)
+										.retryWhen(retrySpec())
+										.collectList()
+										.doFinally(signalType -> semaphore.release());
+							} catch (InterruptedException e) {
+								log.error("Could not get kpi integration values for kpiRequest {}", kpiRequest);
+								Thread.currentThread().interrupt();
+								return Flux.error(e);
+							}
+						})
+				.flatMapIterable(list -> list)
+				.collectList()
+				.block();
 	}
 
 	public List<KpiElement> getKpiIntegrationValuesKanbanAsync(List<KpiRequest> kpiRequests) {
-		return Flux.fromIterable(kpiRequests).publishOn(Schedulers.boundedElastic()).flatMap(kpiRequest -> {
-			try {
-				semaphore.acquire();
-				return this.knowHOWWebClient.post()
-						.uri(this.knowHOWApiClientConfig.getKpiIntegrationValuesKanbanEndpointConfig().getPath())
-						.bodyValue(kpiRequest).retrieve().bodyToFlux(KpiElement.class).retryWhen(retrySpec())
-						.collectList().doFinally(signalType -> semaphore.release());
-			} catch (InterruptedException e) {
-				log.error("Could not get kpi integration values kanban for kpiRequest {}", kpiRequest);
-				Thread.currentThread().interrupt();
-				return Flux.error(e);
-			}
-		}).flatMapIterable(list -> list).collectList().block();
+		return Flux.fromIterable(kpiRequests)
+				.publishOn(Schedulers.boundedElastic())
+				.flatMap(
+						kpiRequest -> {
+							try {
+								semaphore.acquire();
+								return this.knowHOWWebClient
+										.post()
+										.uri(
+												this.knowHOWApiClientConfig
+														.getKpiIntegrationValuesKanbanEndpointConfig()
+														.getPath())
+										.bodyValue(kpiRequest)
+										.retrieve()
+										.bodyToFlux(KpiElement.class)
+										.retryWhen(retrySpec())
+										.collectList()
+										.doFinally(signalType -> semaphore.release());
+							} catch (InterruptedException e) {
+								log.error(
+										"Could not get kpi integration values kanban for kpiRequest {}", kpiRequest);
+								Thread.currentThread().interrupt();
+								return Flux.error(e);
+							}
+						})
+				.flatMapIterable(list -> list)
+				.collectList()
+				.block();
 	}
 
 	private RetryBackoffSpec retrySpec() {
-		return Retry
-				.backoff(knowHOWApiClientConfig.getRetryPolicy().getMaxAttempts(),
-						Duration.of(knowHOWApiClientConfig.getRetryPolicy().getMinBackoffDuration(),
+		return Retry.backoff(
+						knowHOWApiClientConfig.getRetryPolicy().getMaxAttempts(),
+						Duration.of(
+								knowHOWApiClientConfig.getRetryPolicy().getMinBackoffDuration(),
 								knowHOWApiClientConfig.getRetryPolicy().getMinBackoffTimeUnit().toChronoUnit()))
-				.filter(KnowHOWClient::shouldRetry).doBeforeRetry(retrySignal -> log.info("Retry #{} due to {}",
-						retrySignal.totalRetries(), retrySignal.failure().toString()));
+				.filter(KnowHOWClient::shouldRetry)
+				.doBeforeRetry(
+						retrySignal ->
+								log.info(
+										"Retry #{} due to {}",
+										retrySignal.totalRetries(),
+										retrySignal.failure().toString()));
 	}
 
 	private static boolean shouldRetry(Throwable throwable) {

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/client/customapi/KnowHOWClient.java

@@ -28,30 +28,30 @@
 @Configuration
 @ConfigurationProperties(prefix = "knowhow-api-config")
 public class KnowHOWApiClientConfig {
-    private String baseUrl;
-    private String apiKey;
+	private String baseUrl;
+	private String apiKey;
 
-    private final RateLimiting rateLimiting = new RateLimiting();
+	private final RateLimiting rateLimiting = new RateLimiting();
 
-    private final RetryPolicy retryPolicy = new RetryPolicy();
+	private final RetryPolicy retryPolicy = new RetryPolicy();
 
-    private final Map<String, EndpointConfig> endpoints = new HashMap<>();
+	private final Map<String, EndpointConfig> endpoints = new HashMap<>();
 
-    @Data
-    public static class RateLimiting {
-        private int maxConcurrentCalls;
-    }
+	@Data
+	public static class RateLimiting {
+		private int maxConcurrentCalls;
+	}
 
-    @Data
-    public static class EndpointConfig {
-        private String path;
-    }
+	@Data
+	public static class EndpointConfig {
+		private String path;
+	}
 
-    public EndpointConfig getKpiIntegrationValuesEndpointConfig() {
-        return this.endpoints.get("kpi-integration-values");
-    }
+	public EndpointConfig getKpiIntegrationValuesEndpointConfig() {
+		return this.endpoints.get("kpi-integration-values");
+	}
 
-    public EndpointConfig getKpiIntegrationValuesKanbanEndpointConfig() {
-        return this.endpoints.get("kpi-integration-values-kanban");
-    }
-}
+	public EndpointConfig getKpiIntegrationValuesKanbanEndpointConfig() {
+		return this.endpoints.get("kpi-integration-values-kanban");
+	}
+}

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/client/customapi/config/KnowHOWApiClientConfig.java

@@ -16,13 +16,13 @@
 
 package com.publicissapient.kpidashboard.client.customapi.config;
 
-import lombok.Data;
-
 import java.util.concurrent.TimeUnit;
 
+import lombok.Data;
+
 @Data
 public class RetryPolicy {
-    private int maxAttempts;
-    private int minBackoffDuration;
-    private TimeUnit minBackoffTimeUnit;
+	private int maxAttempts;
+	private int minBackoffDuration;
+	private TimeUnit minBackoffTimeUnit;
 }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/client/customapi/config/RetryPolicy.java

@@ -37,28 +37,37 @@
 @Slf4j
 public class TrendValuesListDeserializer extends JsonDeserializer<Object> {
 
-	private final ObjectMapper objectMapper = JsonMapper.builder()
-			.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).build();
+	private final ObjectMapper objectMapper =
+			JsonMapper.builder()
+					.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+					.build();
 
 	@Override
-	public Object deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException {
+	public Object deserialize(JsonParser jsonParser, DeserializationContext deserializationContext)
+			throws IOException {
 		List<?> trendValuesList = jsonParser.readValueAs(List.class);
 
 		List<DataCount> dataCountList = new ArrayList<>();
 		List<DataCountGroup> dataCountGroupList = new ArrayList<>();
 
 		if (CollectionUtils.isNotEmpty(trendValuesList)) {
 			LinkedHashMap<?, ?> linkedHashMap = (LinkedHashMap<?, ?>) trendValuesList.get(0);
-			if (linkedHashMap.containsKey("filter") || linkedHashMap.containsKey("filter1")
+			if (linkedHashMap.containsKey("filter")
+					|| linkedHashMap.containsKey("filter1")
 					|| linkedHashMap.containsKey("filter2")) {
-				dataCountGroupList = trendValuesList.stream().map(trendValue -> {
-					DataCountGroup dataCountGroup = objectMapper.convertValue(trendValue, DataCountGroup.class);
-					List<?> dataCountGroupValues = dataCountGroup.getValue();
-					if (CollectionUtils.isNotEmpty(dataCountGroupValues)) {
-						dataCountGroup.setValue(convertToDataCountList(dataCountGroupValues));
-					}
-					return dataCountGroup;
-				}).toList();
+				dataCountGroupList =
+						trendValuesList.stream()
+								.map(
+										trendValue -> {
+											DataCountGroup dataCountGroup =
+													objectMapper.convertValue(trendValue, DataCountGroup.class);
+											List<?> dataCountGroupValues = dataCountGroup.getValue();
+											if (CollectionUtils.isNotEmpty(dataCountGroupValues)) {
+												dataCountGroup.setValue(convertToDataCountList(dataCountGroupValues));
+											}
+											return dataCountGroup;
+										})
+								.toList();
 			} else {
 				dataCountList = convertToDataCountList(trendValuesList);
 			}
@@ -73,14 +82,21 @@ public Object deserialize(JsonParser jsonParser, DeserializationContext deserial
 	}
 
 	private List<DataCount> convertToDataCountList(List<?> trendValuesList) {
-		return trendValuesList.stream().map(trendValue -> {
-			DataCount dataCount = objectMapper.convertValue(trendValue, DataCount.class);
-			List<?> dataCountValues = (List<?>) dataCount.getValue();
-			if (CollectionUtils.isNotEmpty(dataCountValues)) {
-				dataCount.setValue(dataCountValues.stream()
-						.map(dataCountValue -> objectMapper.convertValue(dataCountValue, DataCount.class)).toList());
-			}
-			return dataCount;
-		}).toList();
+		return trendValuesList.stream()
+				.map(
+						trendValue -> {
+							DataCount dataCount = objectMapper.convertValue(trendValue, DataCount.class);
+							List<?> dataCountValues = (List<?>) dataCount.getValue();
+							if (CollectionUtils.isNotEmpty(dataCountValues)) {
+								dataCount.setValue(
+										dataCountValues.stream()
+												.map(
+														dataCountValue ->
+																objectMapper.convertValue(dataCountValue, DataCount.class))
+												.toList());
+							}
+							return dataCount;
+						})
+				.toList();
 	}
 }

ai-data-processor/src/main/java/com/publicissapient/kpidashboard/client/customapi/deserializer/TrendValuesListDeserializer.java

@@ -27,11 +27,11 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class IssueKpiModalValue {
 
-    @JsonProperty("Issue Id")
-    private String issueId;
+	@JsonProperty("Issue Id")
+	private String issueId;
 
-    private Integer issueBlockedTime;
-    private Integer issueWaitTime;
+	private Integer issueBlockedTime;
+	private Integer issueWaitTime;
 
-    private Map<String, Integer> categoryWiseDelay;
+	private Map<String, Integer> categoryWiseDelay;
 }