diff --git a/pom.xml b/pom.xml index ede3e33..1318a2b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.eclipse.ecsp - 1.0.0 + 1.0.1 ro ro RO library for ECSP project @@ -181,6 +181,7 @@ ${project.basedir}/checkstyle.xml ${project.build.directory}/checkstyle-result.xml + 0.7.0 @@ -621,16 +622,6 @@ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - @@ -660,27 +651,19 @@ true - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} true - ossrh - https://oss.sonatype.org/ - true + central + true + published + https://central.sonatype.com/repository/maven-snapshots/ + false @@ -730,16 +713,6 @@ true - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - diff --git a/ro-api/pom.xml b/ro-api/pom.xml index 9c31d8b..c77cc11 100644 --- a/ro-api/pom.xml +++ b/ro-api/pom.xml @@ -6,10 +6,12 @@ org.eclipse.ecsp ro - 1.0.0 + 1.0.1 ro-api ro-api + ro library for ECSP project + https://github.com/eclipse-ecsp/ro UTF-8 org.eclipse.ecsp.platform.services.ro.Application diff --git a/ro-entities/pom.xml b/ro-entities/pom.xml index 7153cdb..e445a6b 100644 --- a/ro-entities/pom.xml +++ b/ro-entities/pom.xml @@ -5,10 +5,12 @@ org.eclipse.ecsp ro - 1.0.0 + 1.0.1 ro-entities ro-entities + ro library for ECSP project + https://github.com/eclipse-ecsp/ro UTF-8 diff --git a/ro-sp/pom.xml b/ro-sp/pom.xml index 3619cad..f192690 100644 --- a/ro-sp/pom.xml +++ b/ro-sp/pom.xml @@ -5,10 +5,12 @@ org.eclipse.ecsp ro - 1.0.0 + 1.0.1 ro-sp ro-sp + ro library for ECSP project + https://github.com/eclipse-ecsp/ro jar UTF-8 diff --git a/ro-sp/src/test/java/org/eclipse/ecsp/ro/dma/DefaultDMAShoulderTapResolverTest.java b/ro-sp/src/test/java/org/eclipse/ecsp/ro/dma/DefaultDMAShoulderTapResolverTest.java index 28a9199..966d296 100644 --- a/ro-sp/src/test/java/org/eclipse/ecsp/ro/dma/DefaultDMAShoulderTapResolverTest.java +++ b/ro-sp/src/test/java/org/eclipse/ecsp/ro/dma/DefaultDMAShoulderTapResolverTest.java @@ -15,7 +15,7 @@ class DefaultDMAShoulderTapResolverTest { private DefaultDMAShoulderTapResolver resolver; @BeforeEach - void setUp() throws Exception { + void setUp() { resolver = new DefaultDMAShoulderTapResolver(); } diff --git a/ro-sp/src/test/java/org/eclipse/ecsp/ro/processor/strategy/impl/rcpd/RCPDRequestProcessorTest.java b/ro-sp/src/test/java/org/eclipse/ecsp/ro/processor/strategy/impl/rcpd/RCPDRequestProcessorTest.java index 9e93e75..c8ad84b 100644 --- a/ro-sp/src/test/java/org/eclipse/ecsp/ro/processor/strategy/impl/rcpd/RCPDRequestProcessorTest.java +++ b/ro-sp/src/test/java/org/eclipse/ecsp/ro/processor/strategy/impl/rcpd/RCPDRequestProcessorTest.java @@ -16,7 +16,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.util.ReflectionTestUtils; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,7 +24,7 @@ * RCPDRequestProcessorTest - This class contains unit tests for the RCPDRequestProcessor. */ @ExtendWith(MockitoExtension.class) -public class RCPDRequestProcessorTest { +class RCPDRequestProcessorTest { // Mock dependencies using @Mock @Mock @@ -69,9 +68,9 @@ void testProcess() { IgniteEventImpl mockRcpdReqImpl = mock(IgniteEventImpl.class); when(rcpdEventHandler.processRCPDRequest( - eq(mockKey), - eq(mockValue), - eq(serviceUtil) + mockKey, + mockValue, + serviceUtil )).thenReturn(mockRcpdReqImpl); // Act diff --git a/ro-sp/src/test/java/org/eclipse/ecsp/ro/queue/AbstractQueueHandlerTest.java b/ro-sp/src/test/java/org/eclipse/ecsp/ro/queue/AbstractQueueHandlerTest.java index 07a9e17..8c1fcff 100644 --- a/ro-sp/src/test/java/org/eclipse/ecsp/ro/queue/AbstractQueueHandlerTest.java +++ b/ro-sp/src/test/java/org/eclipse/ecsp/ro/queue/AbstractQueueHandlerTest.java @@ -10,7 +10,6 @@ import org.eclipse.ecsp.key.IgniteKey; import org.eclipse.ecsp.nosqldao.Updates; import org.eclipse.ecsp.ro.RoDAOMongoImpl; -import org.eclipse.ecsp.ro.utils.TimeZoneUtils; import org.eclipse.ecsp.services.utils.ServiceUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/ro-sp/src/test/java/org/eclipse/ecsp/ro/queue/RequestQueueHandlerTest.java b/ro-sp/src/test/java/org/eclipse/ecsp/ro/queue/RequestQueueHandlerTest.java index d37398b..dcd9fb7 100644 --- a/ro-sp/src/test/java/org/eclipse/ecsp/ro/queue/RequestQueueHandlerTest.java +++ b/ro-sp/src/test/java/org/eclipse/ecsp/ro/queue/RequestQueueHandlerTest.java @@ -5,7 +5,6 @@ import org.eclipse.ecsp.entities.IgniteEvent; import org.eclipse.ecsp.key.IgniteKey; import org.eclipse.ecsp.ro.RoDAOMongoImpl; -import org.eclipse.ecsp.ro.utils.TimeZoneUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -18,7 +17,6 @@ import java.util.Iterator; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -105,6 +103,6 @@ void testProcess_withExpiredEvent_shouldUpdateStatusAndRemove() { requestQueueHandler.process(igniteKey, igniteEvent, context); // Should call updateEntityByROStatus - verify(roDAOMongoImpl, atLeastOnce()).getROEntityByFieldNameByRoReqIdExceptACV(eq("VIN1234"), eq("REQ-2")); + verify(roDAOMongoImpl, atLeastOnce()).getROEntityByFieldNameByRoReqIdExceptACV("VIN1234", "REQ-2"); } } \ No newline at end of file diff --git a/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/NotificationUtilTest.java b/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/NotificationUtilTest.java index 592d0ae..fb87cb9 100644 --- a/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/NotificationUtilTest.java +++ b/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/NotificationUtilTest.java @@ -24,7 +24,7 @@ /** * Test for {@link NotificationUtil} class. */ -public class NotificationUtilTest { +class NotificationUtilTest { @InjectMocks private NotificationUtil notificationUtil; @@ -51,7 +51,7 @@ public class NotificationUtilTest { * Initializes mocks and sets up the test environment before each test case. */ @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { MockitoAnnotations.openMocks(this); notificationUtil = new NotificationUtil(); @@ -73,7 +73,7 @@ private void setField(Object target, String fieldName, Object value) throws Exce } @Test - public void testSendRONotification_withValidInput_shouldForwardEvent() { + void testSendRONotification_withValidInput_shouldForwardEvent() { when(igniteEvent.getVehicleId()).thenReturn("veh123"); when(igniteEvent.getBizTransactionId()).thenReturn("biz123"); @@ -96,7 +96,7 @@ public void testSendRONotification_withValidInput_shouldForwardEvent() { } @Test - public void testSendRONotification_withNonWhitelistedOrigin_shouldNotSend() { + void testSendRONotification_withNonWhitelistedOrigin_shouldNotSend() { notificationUtil.sendRONotification( igniteKey, igniteEvent, @@ -110,7 +110,7 @@ public void testSendRONotification_withNonWhitelistedOrigin_shouldNotSend() { } @Test - public void testSendRONotification_withEmptyNotificationId_shouldSkip() { + void testSendRONotification_withEmptyNotificationId_shouldSkip() { when(response.getRoRequestId()).thenReturn("ro-req-1"); notificationUtil.sendRONotification( diff --git a/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/StockingRuleConfigUtilTest.java b/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/StockingRuleConfigUtilTest.java index 0c98f43..976db4e 100644 --- a/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/StockingRuleConfigUtilTest.java +++ b/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/StockingRuleConfigUtilTest.java @@ -59,7 +59,7 @@ public void getStockingRuleConfig() { } @Test - public void getStockingRuleConfig_withMissingKey() { + void getStockingRuleConfig_withMissingKey() { // Missing STOCKING_RULE_CONFIGURATIONOBJECT key Map input = new HashMap<>(); Map resultMap = StockingRuleConfigUtil.getStockingRuleConfig(input); @@ -67,14 +67,14 @@ public void getStockingRuleConfig_withMissingKey() { } @Test - public void getStockingRuleConfig_withNullInput() { + void getStockingRuleConfig_withNullInput() { // Null input Map resultMap = StockingRuleConfigUtil.getStockingRuleConfig(null); Assertions.assertTrue(resultMap == null || resultMap.isEmpty(), "Expected empty map when input is null"); } @Test - public void getStockingRuleConfig_withInvalidValue() { + void getStockingRuleConfig_withInvalidValue() { // Value that can't be converted to string Map input = new HashMap<>(); input.put(Constants.STOCKING_RULE_CONFIGURATIONOBJECT, new Object()); @@ -83,7 +83,7 @@ public void getStockingRuleConfig_withInvalidValue() { } @Test - public void getStockingRuleConfig_withMalformedJsonString() { + void getStockingRuleConfig_withMalformedJsonString() { // Manually passing malformed JSON string Map input = new HashMap<>(); input.put(Constants.STOCKING_RULE_CONFIGURATIONOBJECT, "{invalidJson: }"); diff --git a/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/TimeZoneUtilsTest.java b/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/TimeZoneUtilsTest.java index d155e8c..34fbd23 100644 --- a/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/TimeZoneUtilsTest.java +++ b/ro-sp/src/test/java/org/eclipse/ecsp/ro/utils/TimeZoneUtilsTest.java @@ -1,6 +1,5 @@ package org.eclipse.ecsp.ro.utils; -import org.eclipse.ecsp.ro.queue.DeviceMessageFailureQueueHandler; import org.junit.jupiter.api.Test; import java.time.ZoneId; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -10,17 +9,17 @@ /** * Test for {@link TimeZoneUtils} class. */ -public class TimeZoneUtilsTest { +class TimeZoneUtilsTest { - private static final double NYlat = 40.7128; + private static final double NY_LAT = 40.7128; - private static final double NYlongi = -74.0060; + private static final double NY_LONG = -74.0060; @Test - public void testGetZoneIdByLocation_validCoordinates() { + void testGetZoneIdByLocation_validCoordinates() { // Sample coordinates for New York City - double latitude = NYlat; - double longitude = NYlongi; + double latitude = NY_LAT; + double longitude = NY_LONG; ZoneId zoneId = TimeZoneUtils.getZoneIdByLocation(latitude, longitude); @@ -28,15 +27,15 @@ public void testGetZoneIdByLocation_validCoordinates() { System.out.println("Zone ID for NYC: " + zoneId); } - private static final double INVlat = -90.0; + private static final double INV_LAT = -90.0; - private static final double INVlongi = -180.0; + private static final double INV_LONG = -180.0; @Test - public void testGetZoneIdByLocation_invalidCoordinates() { + void testGetZoneIdByLocation_invalidCoordinates() { // Invalid coordinates in the middle of the ocean - double invlatitude = INVlat; - double invlongitude = INVlongi; + double invlatitude = INV_LAT; + double invlongitude = INV_LONG; ZoneId zoneId = TimeZoneUtils.getZoneIdByLocation(invlatitude, invlongitude); @@ -44,7 +43,7 @@ public void testGetZoneIdByLocation_invalidCoordinates() { } @Test - public void testGetUTCTimestamp_validInput() { + void testGetUTCTimestamp_validInput() { ZoneId zoneId = ZoneId.of("Asia/Kolkata"); String timeStr = "2025/06/08 10:30:00"; String pattern = "yyyy/MM/dd HH:mm:ss"; @@ -56,7 +55,7 @@ public void testGetUTCTimestamp_validInput() { } @Test - public void testGetCurrentUTCTimestamp() { + void testGetCurrentUTCTimestamp() { long currentUtc = TimeZoneUtils.getCurrentUTCTimestamp(); assertTrue(currentUtc > 0, "Current UTC timestamp should be greater than zero");