[RocksJava] Incorporated changes for D30525

java/org/rocksdb/ColumnFamilyDescriptor.java

@@ -16,7 +16,8 @@ public class ColumnFamilyDescriptor {
    * options,</p>
    *
    * @param columnFamilyName name of column family.
-   * @deprecated will be removed in RocksDB 3.10.0. Use {}
+   * @deprecated will be removed in RocksDB 3.10.0. Use
+   * {@link #ColumnFamilyDescriptor(byte[])} instead.
    */
   @Deprecated
   public ColumnFamilyDescriptor(final String columnFamilyName){
@@ -41,7 +42,8 @@ public class ColumnFamilyDescriptor {
    * @param columnFamilyName name of column family.
    * @param columnFamilyOptions options to be used with
    *     column family.
-   * @deprecated will be removed in RocksDB 3.10.0. Use {}
+   * @deprecated will be removed in RocksDB 3.10.0. Use
+   * {@link #ColumnFamilyDescriptor(byte[], ColumnFamilyOptions)} instead.
    */
   @Deprecated
   public ColumnFamilyDescriptor(final String columnFamilyName,

java/rocksjni/rocksjni.cc

@@ -93,11 +93,11 @@ jobject
       jbyteArray byteArray = static_cast<jbyteArray>(env->CallObjectMethod(
           jcf_descriptor,
           rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod(
-          env)));
+              env)));
       // get CF Options
       jobject jcf_opt_obj = env->CallObjectMethod(jcf_descriptor,
           rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyOptionsMethod(
-          env));
+              env));
       rocksdb::ColumnFamilyOptions* cfOptions =
           rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj);
 
@@ -178,11 +178,11 @@ jobject Java_org_rocksdb_RocksDB_open__JLjava_lang_String_2Ljava_util_List_2I(
       jbyteArray byteArray = static_cast<jbyteArray>(env->CallObjectMethod(
           jcf_descriptor,
           rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod(
-          env)));
+              env)));
       // get CF Options
       jobject jcf_opt_obj = env->CallObjectMethod(jcf_descriptor,
           rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyOptionsMethod(
-          env));
+              env));
       rocksdb::ColumnFamilyOptions* cfOptions =
           rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj);
 
@@ -1189,11 +1189,11 @@ jlong Java_org_rocksdb_RocksDB_createColumnFamily(
   jbyteArray byteArray = static_cast<jbyteArray>(env->CallObjectMethod(
       jcf_descriptor,
       rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyNameMethod(
-      env)));
+          env)));
   // get CF Options
   jobject jcf_opt_obj = env->CallObjectMethod(jcf_descriptor,
       rocksdb::ColumnFamilyDescriptorJni::getColumnFamilyOptionsMethod(
-      env));
+          env));
   rocksdb::ColumnFamilyOptions* cfOptions =
       rocksdb::ColumnFamilyOptionsJni::getHandle(env, jcf_opt_obj);