diff --git a/java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java b/java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java index b85863c7e32..745882cd8f8 100644 --- a/java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java +++ b/java/src/main/java/org/rocksdb/ColumnFamilyDescriptor.java @@ -82,7 +82,7 @@ public boolean equals(final Object o) { return false; } - final ColumnFamilyDescriptor that = (ColumnFamilyDescriptor) o; + final ColumnFamilyDescriptor that = (ColumnFamilyDescriptor) o; // NOPMD - CloseResource return nativeHandle_ == that.getNativeHandle(); } diff --git a/java/src/main/java/org/rocksdb/OptimisticTransactionDB.java b/java/src/main/java/org/rocksdb/OptimisticTransactionDB.java index b936b555723..5de88b50a07 100644 --- a/java/src/main/java/org/rocksdb/OptimisticTransactionDB.java +++ b/java/src/main/java/org/rocksdb/OptimisticTransactionDB.java @@ -75,8 +75,8 @@ public static OptimisticTransactionDB open(final DBOptions dbOptions, final long[] cfDescriptorHandles = new long[columnFamilyDescriptors.size()]; for (int i = 0; i < columnFamilyDescriptors.size(); i++) { - final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors - .get(i); + final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors // NOPMD - CloseResource + .get(i); cfDescriptorHandles[i] = cfDescriptor.nativeHandle_; if (Arrays.equals(cfDescriptor.getName(), RocksDB.DEFAULT_COLUMN_FAMILY)) { defaultColumnFamilyIndex = i; diff --git a/java/src/main/java/org/rocksdb/OptionsUtil.java b/java/src/main/java/org/rocksdb/OptionsUtil.java index 642599205d6..27d36b074ec 100644 --- a/java/src/main/java/org/rocksdb/OptionsUtil.java +++ b/java/src/main/java/org/rocksdb/OptionsUtil.java @@ -87,9 +87,9 @@ public static String getLatestOptionsFileName(final String dbPath, final Env env return getLatestOptionsFileName(dbPath, env.nativeHandle_); } + @SuppressWarnings("PMD.CloseResource") private static void loadTableFormatConfig(final List cfDescs) { for (final ColumnFamilyDescriptor columnFamilyDescriptor : cfDescs) { - @SuppressWarnings("PMD.CloseResource") final ColumnFamilyOptions columnFamilyOptions = columnFamilyDescriptor.getOptions(); columnFamilyOptions.setFetchedTableFormatConfig( readTableFormatConfig(columnFamilyOptions.nativeHandle_)); diff --git a/java/src/main/java/org/rocksdb/RocksDB.java b/java/src/main/java/org/rocksdb/RocksDB.java index 5ecc924c0a6..c41bed5a345 100644 --- a/java/src/main/java/org/rocksdb/RocksDB.java +++ b/java/src/main/java/org/rocksdb/RocksDB.java @@ -309,8 +309,8 @@ public static RocksDB open(final DBOptions options, final String path, int defaultColumnFamilyIndex = -1; for (int i = 0; i < columnFamilyDescriptors.size(); i++) { - final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors - .get(i); + final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors // NOPMD - CloseResource + .get(i); cfDescriptors[i] = cfDescriptor.nativeHandle_; if (Arrays.equals(cfDescriptor.getName(), RocksDB.DEFAULT_COLUMN_FAMILY)) { @@ -501,8 +501,8 @@ public static RocksDB openReadOnly(final DBOptions options, final String path, int defaultColumnFamilyIndex = -1; for (int i = 0; i < columnFamilyDescriptors.size(); i++) { - final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors - .get(i); + final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors // NOPMD - CloseResource + .get(i); cfDescriptorHandles[i] = cfDescriptor.nativeHandle_; if (Arrays.equals(cfDescriptor.getName(), RocksDB.DEFAULT_COLUMN_FAMILY)) { defaultColumnFamilyIndex = i; @@ -607,7 +607,8 @@ public static RocksDB openAsSecondary(final DBOptions options, final String path final long[] cfDescriptorHandles = new long[columnFamilyDescriptors.size()]; for (int i = 0; i < columnFamilyDescriptors.size(); i++) { - final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors.get(i); + final ColumnFamilyDescriptor cfDescriptor = // NOPMD - CloseResource + columnFamilyDescriptors.get(i); cfDescriptorHandles[i] = cfDescriptor.nativeHandle_; } diff --git a/java/src/main/java/org/rocksdb/TransactionDB.java b/java/src/main/java/org/rocksdb/TransactionDB.java index a406dd380d1..9843686121d 100644 --- a/java/src/main/java/org/rocksdb/TransactionDB.java +++ b/java/src/main/java/org/rocksdb/TransactionDB.java @@ -82,8 +82,8 @@ public static TransactionDB open(final DBOptions dbOptions, final long[] cfDescriptorHandles = new long[columnFamilyDescriptors.size()]; for (int i = 0; i < columnFamilyDescriptors.size(); i++) { - final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors - .get(i); + final ColumnFamilyDescriptor cfDescriptor = columnFamilyDescriptors // NOPMD - CloseResource + .get(i); cfDescriptorHandles[i] = cfDescriptor.nativeHandle_; if (Arrays.equals(cfDescriptor.getName(), RocksDB.DEFAULT_COLUMN_FAMILY)) { defaultColumnFamilyIndex = i; diff --git a/java/src/main/java/org/rocksdb/TtlDB.java b/java/src/main/java/org/rocksdb/TtlDB.java index 6f76214f48b..31b89afd209 100644 --- a/java/src/main/java/org/rocksdb/TtlDB.java +++ b/java/src/main/java/org/rocksdb/TtlDB.java @@ -123,7 +123,7 @@ public static TtlDB open(final DBOptions options, final String db_path, int defaultColumnFamilyIndex = -1; final long[] cfDescriptorHandles = new long[columnFamilyDescriptors.size()]; for (int i = 0; i < columnFamilyDescriptors.size(); i++) { - final ColumnFamilyDescriptor cfDescriptor = + final ColumnFamilyDescriptor cfDescriptor = // NOPMD - CloseResource columnFamilyDescriptors.get(i); cfDescriptorHandles[i] = columnFamilyDescriptors.get(i).nativeHandle_; if (Arrays.equals(cfDescriptor.getName(), RocksDB.DEFAULT_COLUMN_FAMILY)) {