Remove useless constant package

finos · Nov 12, 2024 · c463839 · c463839
1 parent 7883eab
commit c463839
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 20 deletions.
diff --git a/symphony-bdk-core/src/main/java/com/symphony/bdk/core/auth/impl/AuthSessionImpl.java b/symphony-bdk-core/src/main/java/com/symphony/bdk/core/auth/impl/AuthSessionImpl.java
@@ -3,7 +3,6 @@
 import com.symphony.bdk.core.auth.AuthSession;
 import com.symphony.bdk.core.auth.exception.AuthUnauthorizedException;
 import com.symphony.bdk.core.auth.jwt.JwtHelper;
-import com.symphony.bdk.core.service.version.constant.AgentVersions;
 import com.symphony.bdk.core.service.version.model.AgentVersion;
 import com.symphony.bdk.gen.api.model.Token;
 
@@ -132,6 +131,6 @@ protected  boolean isSkdSupported() {
    if (currentVersion.isEmpty()) {
      return  false;
    }
-   return currentVersion.get().isHigher(AgentVersions.AGENT_24_12);
+   return currentVersion.get().isHigher(AgentVersion.AGENT_24_12);
   }
 }
diff --git a/...ony-bdk-core/src/main/java/com/symphony/bdk/core/service/version/AgentVersionService.java b/...ony-bdk-core/src/main/java/com/symphony/bdk/core/service/version/AgentVersionService.java
@@ -44,11 +44,8 @@ private Optional<AgentVersion> parse(String versionString) {
 
     String maj = matcher.group(1);
     String min = matcher.group(2);
-    try {
-      return Optional.of(new AgentVersion(Integer.parseInt(maj), Integer.parseInt(min)));
-    } catch (NumberFormatException nbe) {
-      return Optional.empty();
-    }
+
+    return Optional.of(new AgentVersion(Integer.parseInt(maj), Integer.parseInt(min)));
   }
 
 

diff --git a/...-bdk-core/src/main/java/com/symphony/bdk/core/service/version/constant/AgentVersions.java b/...-bdk-core/src/main/java/com/symphony/bdk/core/service/version/constant/AgentVersions.java
diff --git a/...hony-bdk-core/src/main/java/com/symphony/bdk/core/service/version/model/AgentVersion.java b/...hony-bdk-core/src/main/java/com/symphony/bdk/core/service/version/model/AgentVersion.java
@@ -4,6 +4,8 @@
 
 @API(status = API.Status.INTERNAL)
 public class AgentVersion {
+  public static final AgentVersion AGENT_24_12 = new AgentVersion(24,12);
+
 
   private final int major;
   private final int minor;

diff --git a/symphony-bdk-core/src/test/java/com/symphony/bdk/core/auth/impl/AuthSessionImplTest.java b/symphony-bdk-core/src/test/java/com/symphony/bdk/core/auth/impl/AuthSessionImplTest.java
@@ -14,7 +14,6 @@
 import com.symphony.bdk.core.auth.JwtHelperTest;
 import com.symphony.bdk.core.auth.exception.AuthUnauthorizedException;
 import com.symphony.bdk.core.service.version.AgentVersionService;
-import com.symphony.bdk.core.service.version.constant.AgentVersions;
 import com.symphony.bdk.core.service.version.model.AgentVersion;
 import com.symphony.bdk.gen.api.model.Token;
 
@@ -170,7 +169,7 @@ void testRefresh_skd() throws AuthUnauthorizedException {
     when(auth.retrieveKeyManagerToken()).thenReturn(kmToken);
 
     when(auth.getAgentVersionService()).thenReturn(agentVersionService);
-    when(agentVersionService.retrieveAgentVersion()).thenReturn(Optional.of(AgentVersions.AGENT_24_12));
+    when(agentVersionService.retrieveAgentVersion()).thenReturn(Optional.of(AgentVersion.AGENT_24_12));
 
     final AuthSessionImpl session = new AuthSessionImpl(auth);
     session.refresh();

diff --git a/...bdk-core/src/test/java/com/symphony/bdk/core/service/version/AgentVersionServiceTest.java b/...bdk-core/src/test/java/com/symphony/bdk/core/service/version/AgentVersionServiceTest.java
@@ -1,6 +1,5 @@
 package com.symphony.bdk.core.service.version;
 
-import com.symphony.bdk.core.service.version.constant.AgentVersions;
 import com.symphony.bdk.core.service.version.model.AgentVersion;
 import com.symphony.bdk.core.test.MockApiClient;
 import com.symphony.bdk.gen.api.SignalsApi;

diff --git a/...-bdk-core/src/test/java/com/symphony/bdk/core/service/version/model/AgentVersionTest.java b/...-bdk-core/src/test/java/com/symphony/bdk/core/service/version/model/AgentVersionTest.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AgentVersionTest {
@@ -17,4 +18,10 @@ public void testHigherVersion() {
     assertTrue(agent_25_01.isHigher(agent_20_9));
     assertTrue(agent_25_01.isHigher(agent_24_12));
   }
+
+  @Test
+  public void testConstants() {
+    assertEquals(24, AgentVersion.AGENT_24_12.getMajor());
+    assertEquals(12, AgentVersion.AGENT_24_12.getMinor());
+  }
 }