Merge pull request #12 from psilberk/cicd-errors

Fixed errors returned by CI on JDK8

Author: psilberk

data/semantickernel-data-oracle/src/main/java/com/microsoft/semantickernel/data/jdbc/oracle/OracleVectorStoreQueryProvider.java

@@ -245,6 +245,7 @@ public void createCollection(String collectionName,
      * @param options the options
      */
     @Override
+    @SuppressFBWarnings("SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING") 
     public void upsertRecords(String collectionName,
         List<?> records,
         VectorStoreRecordDefinition recordDefinition,
@@ -422,6 +423,7 @@ private void setUpsertStatementValues(PreparedStatement upsertStatement, Object
      * @param <Record> the record type
      */
     @Override
+    @SuppressFBWarnings("SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING")
     public <Record> VectorSearchResults<Record> search(String collectionName, List<Float> vector,
         VectorSearchOptions options, VectorStoreRecordDefinition recordDefinition,
         VectorStoreRecordMapper<Record, ResultSet> mapper) {
@@ -558,8 +560,6 @@ private void setSearchParameter(PreparedStatement statement, int index, Class<?>
             // Use JSON string to set lists
             if (List.class.equals(type)) {
                 statement.setObject(index, objectMapper.writeValueAsString(value));
-                System.out.println(
-                    "Set values: " + objectMapper.writeValueAsString(value));
                 return;
             }
             // convert UUID to string
@@ -575,7 +575,6 @@ private void setSearchParameter(PreparedStatement statement, int index, Class<?>
                     OffsetDateTime offsetDateTime = (OffsetDateTime) value;
                     ((OraclePreparedStatement) statement).setTIMESTAMPTZ(index,
                         TIMESTAMPTZ.of(offsetDateTime));
-                    System.out.println("Set values: " + offsetDateTime);
                 }
                 return;
             }
@@ -587,7 +586,6 @@ private void setSearchParameter(PreparedStatement statement, int index, Class<?>
                     BigDecimal bigDecimal = (BigDecimal) value;
                     ((OraclePreparedStatement) statement).setBigDecimal(index,
                         bigDecimal);
-                    System.out.println("Set values: " + bigDecimal);
                 }
                 return;
             }
@@ -825,6 +823,7 @@ public Builder withPrefixForCollectionTables(String prefixForCollectionTables) {
          * @param objectMapper the object mapper
          * @return the builder
          */
+        @SuppressFBWarnings("EI_EXPOSE_REP2")
         public Builder withObjectMapper(
             ObjectMapper objectMapper) {
             this.objectMapper = objectMapper;

data/semantickernel-data-oracle/src/main/java/com/microsoft/semantickernel/data/jdbc/oracle/OracleVectorStoreRecordMapper.java

@@ -41,6 +41,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
+import java.util.HashMap;
 import java.util.UUID;
 import java.util.function.BiFunction;
 
@@ -91,7 +92,6 @@ public static class Builder<Record>
         private VectorStoreRecordDefinition vectorStoreRecordDefinition;
         private Map<Class<?>, String> supportedDataTypesMapping;
         private ObjectMapper objectMapper = new ObjectMapper();
-        private Map<Class<?>, String> annotatedTypeMapping;
 
         /**
          * Sets the record class.
@@ -137,12 +137,7 @@ public Builder<Record> withObjectMapper(ObjectMapper objectMapper) {
          */
         public Builder<Record> withSupportedDataTypesMapping(
             Map<Class<?>, String> supportedDataTypesMapping) {
-            this.supportedDataTypesMapping = supportedDataTypesMapping;
-            return this;
-        }
-
-        public Builder<Record> withAnnotatedTypeMapping(Map<Class<?>, String> annotatedTypeMapping) {
-            this.annotatedTypeMapping = annotatedTypeMapping;
+            this.supportedDataTypesMapping = new HashMap<>(supportedDataTypesMapping);
             return this;
         }
 

data/semantickernel-data-oracle/src/test/java/com/microsoft/semantickernel/data/jdbc/oracle/OracleVectorStoreExtendedTest.java

@@ -203,7 +203,6 @@ void testVectorDimensionMismatch() {
         DummyRecord d1 = new DummyRecord("id1", 4, 120d,  new float[]{});
         SKException ex = assertThrows(SKException.class,
             () -> collection.upsertBatchAsync(Arrays.asList(d1), null).block());
-        System.out.println(ex.getMessage());
         assertTrue(ex.getCause().getMessage().contains("ORA-51803"));
 
         // Vector dimension mismatch

data/semantickernel-data-oracle/src/test/java/com/microsoft/semantickernel/data/jdbc/oracle/OracleVectorStoreRecordCollectionTest.java

@@ -215,9 +215,6 @@ public void exactSearch(DistanceFunction distanceFunction, List<Double> expected
         assertNotNull(results);
         assertEquals(3, results.size());
         // The third hotel should be the most similar
-        System.out.println(results.get(0).getScore());
-        System.out.println(results.get(1).getScore());
-        System.out.println(results.get(2).getScore());
         assertEquals(hotels.get(2).getId(), results.get(0).getRecord().getId());
         assertEquals(expectedDistance.get(0).doubleValue(), results.get(0).getScore(), 0.0001d);
         assertEquals(hotels.get(0).getId(), results.get(1).getRecord().getId());