Apply suggestions

Author: KodaiD

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWrapperIntegrationTest.java

@@ -279,16 +279,13 @@ public void deleteByPrefix_WithNonExistingPrefix_ShouldDoNothing() throws Except
 
   @Test
   public void close_ShouldNotThrowException() {
-    try {
-      // Arrange
+    // Arrange
+    Properties properties = getProperties(TEST_NAME);
+    ObjectStorageConfig objectStorageConfig =
+        ObjectStorageUtils.getObjectStorageConfig(new DatabaseConfig(properties));
+    ObjectStorageWrapper wrapper = ObjectStorageWrapperFactory.create(objectStorageConfig);
 
-      // Act Assert
-      assertThatCode(() -> wrapper.close()).doesNotThrowAnyException();
-    } finally {
-      Properties properties = getProperties(TEST_NAME);
-      ObjectStorageConfig objectStorageConfig =
-          ObjectStorageUtils.getObjectStorageConfig(new DatabaseConfig(properties));
-      wrapper = ObjectStorageWrapperFactory.create(objectStorageConfig);
-    }
+    // Act Assert
+    assertThatCode(wrapper::close).doesNotThrowAnyException();
   }
 }

core/src/main/java/com/scalar/db/storage/objectstorage/s3/S3Config.java

@@ -48,10 +48,12 @@ public S3Config(DatabaseConfig databaseConfig) {
       throw new IllegalArgumentException(CoreError.INVALID_CONTACT_POINTS.buildMessage());
     }
     String contactPoints = databaseConfig.getContactPoints().get(0);
-    int lastSlashIndex = contactPoints.lastIndexOf('/');
-    if (lastSlashIndex != -1 && lastSlashIndex < contactPoints.length() - 1) {
-      region = contactPoints.substring(0, lastSlashIndex);
-      bucket = contactPoints.substring(lastSlashIndex + 1);
+    String[] contactPointsParts = contactPoints.split("/");
+    if (contactPointsParts.length == 2
+        && !contactPointsParts[0].isEmpty()
+        && !contactPointsParts[1].isEmpty()) {
+      region = contactPointsParts[0];
+      bucket = contactPointsParts[1];
     } else {
       throw new IllegalArgumentException(
           "Invalid contact points format. Expected: S3_REGION/BUCKET_NAME");