Avoid exceptions in PostgresqlObjectId lookup.

We now fully rely onto the OID cache in PostgresqlObjectId instead of falling back to a valueOf(…) lookup that causes an exception.

[resolves pgjdbc#420]

Signed-off-by: Mark Paluch <[email protected]>

Author: mp911de

src/main/java/io/r2dbc/postgresql/codec/PostgresqlObjectId.java

@@ -390,7 +390,7 @@ public enum PostgresqlObjectId implements Type, PostgresTypeIdentifier {
      */
     XML_ARRAY(143);
 
-    public static final int OID_CACHE_SIZE = 4096;
+    public static final int OID_CACHE_SIZE = 3810; // JSON_ARRAY is currently the highest one
 
     private static final PostgresqlObjectId[] CACHE = new PostgresqlObjectId[OID_CACHE_SIZE];
 
@@ -435,12 +435,7 @@ public static boolean isValid(int objectId) {
             return oid != null;
         }
 
-        try {
-            valueOf(objectId);
-            return true;
-        } catch (Exception e) {
-            return false;
-        }
+        return false;
     }
 
     /**
@@ -452,22 +447,17 @@ public static boolean isValid(int objectId) {
      */
     public static PostgresqlObjectId valueOf(int objectId) {
 
-        if (objectId >= 0 && objectId < OID_CACHE_SIZE) {
-            PostgresqlObjectId oid = CACHE[objectId];
-
-            if (oid == null) {
-                throw new IllegalArgumentException(String.format("%d is not a valid object id", objectId));
-            }
+        PostgresqlObjectId oid = null;
 
-            return oid;
+        if (objectId >= 0 && objectId < OID_CACHE_SIZE) {
+            oid = CACHE[objectId];
         }
 
-        for (PostgresqlObjectId type : values()) {
-            if (type.objectId == objectId) {
-                return type;
-            }
+        if (oid == null) {
+            throw new IllegalArgumentException(String.format("%d is not a valid object id", objectId));
         }
-        throw new IllegalArgumentException(String.format("%d is not a valid object id", objectId));
+
+        return oid;
     }
 
     /**

src/test/java/io/r2dbc/postgresql/codec/PostgresqlObjectIdUnitTests.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.r2dbc.postgresql.codec;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+
+/**
+ * Unit tests for {@link PostgresqlObjectId}.
+ */
+class PostgresqlObjectIdUnitTests {
+
+    @ParameterizedTest
+    @EnumSource(PostgresqlObjectId.class)
+    void shouldReportValidOidForWellKnownOids(PostgresqlObjectId oid) {
+        assertThat(PostgresqlObjectId.isValid(oid.getObjectId())).isTrue();
+        assertThat(PostgresqlObjectId.valueOf(oid.getObjectId())).isEqualTo(oid);
+    }
+
+    @ParameterizedTest
+    @ValueSource(ints = {-1, 1, 4096})
+    void shouldReportInvalidOid(int oid) {
+        assertThat(PostgresqlObjectId.isValid(oid)).isFalse();
+        assertThatIllegalArgumentException().isThrownBy(() -> PostgresqlObjectId.valueOf(oid));
+    }
+
+}