EPMRPP-90180 update dependencies (Instant time) (#61)

* EPMRPP-90180 update dependencies (Instant time)
reportportal · Apr 15, 2024 · 4702d9e · 4702d9e
1 parent b987544
commit 4702d9e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,10 +36,11 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:commons-dao:fa04c1f'
-        implementation 'com.github.reportportal:plugin-api:20ab960'
-        annotationProcessor 'com.github.reportportal:plugin-api:20ab960'
+        implementation 'com.github.reportportal:commons-dao:0703b75'
+        implementation 'com.github.reportportal:plugin-api:3ecb915657'
+        annotationProcessor 'com.github.reportportal:plugin-api:3ecb915657'
     }
+    implementation 'org.hibernate:hibernate-core:5.6.15.Final'
 
     compile 'com.squareup.okhttp:okhttp:2.7.5'
     compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
@@ -51,7 +52,7 @@ dependencies {
     implementation group: 'org.glassfish', name: 'javax.el', version: '3.0.0'
     implementation group: 'javax.el', name: 'javax.el-api', version: '3.0.0'
     implementation group: 'org.jooq', name: 'jooq', version: '3.14.4'
-    jooqRuntime 'org.postgresql:postgresql:42.2.13'
+    jooqRuntime 'org.postgresql:postgresql:42.7.3'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.6.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'

diff --git a/src/main/java/com/epam/reportportal/extension/azure/AzureExtension.java b/src/main/java/com/epam/reportportal/extension/azure/AzureExtension.java
@@ -63,6 +63,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -751,7 +752,8 @@ private List<AttachmentInfo> uploadAttachmentToAzure(PostTicketRQ ticketRQ) {
   private String getFormattedMessage(Log log) {
     StringBuilder messageBuilder = new StringBuilder();
     ofNullable(log.getLogTime()).ifPresent(logTime -> messageBuilder.append("Time: ")
-        .append(logTime.format(DateTimeFormatter.ofPattern("MM/dd/yyyy HH:mm:ss"))).append(", "));
+        .append(logTime.atOffset(ZoneOffset.UTC).toLocalDateTime()
+            .format(DateTimeFormatter.ofPattern("MM/dd/yyyy HH:mm:ss"))).append(", "));
     ofNullable(log.getLogLevel()).ifPresent(
         logLevel -> messageBuilder.append("Level: ").append(logLevel).append(", "));
     messageBuilder.append("<br>").append("Log: ").append(log.getLogMessage());

diff --git a/.../com/epam/reportportal/extension/azure/event/handler/plugin/PluginLoadedEventHandler.java b/.../com/epam/reportportal/extension/azure/event/handler/plugin/PluginLoadedEventHandler.java
@@ -9,6 +9,7 @@
 import com.epam.ta.reportportal.entity.integration.IntegrationParams;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -43,7 +44,7 @@ private void createIntegration(String name, IntegrationType integrationType) {
 			Integration integration = new Integration();
 			integration.setName(name);
 			integration.setType(integrationType);
-			integration.setCreationDate(LocalDateTime.now());
+			integration.setCreationDate(Instant.now());
 			integration.setEnabled(true);
 			integration.setCreator("SYSTEM");
 			integration.setParams(new IntegrationParams(new HashMap<>()));

diff --git a/src/test/java/com/epam/reportportal/extension/azure/AzureExtensionTest.java b/src/test/java/com/epam/reportportal/extension/azure/AzureExtensionTest.java
@@ -1,17 +1,35 @@
 package com.epam.reportportal.extension.azure;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
 import com.epam.reportportal.extension.IntegrationGroupEnum;
 import com.epam.reportportal.extension.PluginCommand;
 import com.epam.reportportal.extension.azure.command.connection.TestConnectionCommand;
 import com.epam.reportportal.extension.azure.rest.client.ApiException;
-import com.epam.reportportal.extension.azure.rest.client.api.*;
-import com.epam.reportportal.extension.azure.rest.client.model.workitem.*;
+import com.epam.reportportal.extension.azure.rest.client.api.ClassificationNodesApi;
+import com.epam.reportportal.extension.azure.rest.client.api.FieldsApi;
+import com.epam.reportportal.extension.azure.rest.client.api.WorkItemTypesApi;
+import com.epam.reportportal.extension.azure.rest.client.api.WorkItemTypesFieldApi;
+import com.epam.reportportal.extension.azure.rest.client.api.WorkItemsApi;
+import com.epam.reportportal.extension.azure.rest.client.model.workitem.WorkItem;
+import com.epam.reportportal.extension.azure.rest.client.model.workitem.WorkItemClassificationNode;
+import com.epam.reportportal.extension.azure.rest.client.model.workitem.WorkItemField;
+import com.epam.reportportal.extension.azure.rest.client.model.workitem.WorkItemType;
+import com.epam.reportportal.extension.azure.rest.client.model.workitem.WorkItemTypeFieldWithReferences;
 import com.epam.reportportal.model.externalsystem.AllowedValue;
 import com.epam.reportportal.model.externalsystem.PostFormField;
 import com.epam.reportportal.model.externalsystem.PostTicketRQ;
 import com.epam.reportportal.model.externalsystem.Ticket;
 import com.epam.ta.reportportal.binary.impl.AttachmentDataStoreService;
-import com.epam.ta.reportportal.dao.*;
+import com.epam.ta.reportportal.dao.IntegrationRepository;
+import com.epam.ta.reportportal.dao.IntegrationTypeRepository;
+import com.epam.ta.reportportal.dao.LaunchRepository;
+import com.epam.ta.reportportal.dao.LogRepository;
+import com.epam.ta.reportportal.dao.TestItemRepository;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.ta.reportportal.entity.integration.IntegrationParams;
 import com.epam.ta.reportportal.entity.integration.IntegrationType;
@@ -20,6 +38,14 @@
 import com.epam.ta.reportportal.entity.item.issue.IssueEntity;
 import com.epam.ta.reportportal.entity.project.Project;
 import com.epam.ta.reportportal.filesystem.DataEncoder;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.sql.DataSource;
 import org.jasypt.util.text.BasicTextEncryptor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -29,14 +55,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.context.ApplicationContext;
 
-import javax.sql.DataSource;
-import java.time.LocalDateTime;
-import java.util.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
 @ExtendWith(MockitoExtension.class)
 class AzureExtensionTest {
 
@@ -99,7 +117,7 @@ public void init(){
 		params.put("oauthAccessKey", "token");
 		IntegrationParams integrationParams = new IntegrationParams(params);
 		integration = new Integration(1L, new Project(1L, "ProjectName"), new IntegrationType(),
-				integrationParams, LocalDateTime.now());
+				integrationParams, Instant.now());
 		workItem = new WorkItem();
 		workItem.setId(23);
 		workItem.setUrl("https://dev.azure.com/some/some/_workitems/edit/23");