[accumulo] branch main updated: Fix property JSON strings (#2109)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 763cf4f  Fix property JSON strings (#2109)
763cf4f is described below

commit 763cf4fae5d93aff96a06458f98dfe7296b5b882
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Fri May 14 14:10:01 2021 -0400

    Fix property JSON strings (#2109)
    
    * Apply replaceAll for quotes on all parts of the default JSON values in
    Property.java. Closes #2105
---
 .../main/java/org/apache/accumulo/core/conf/Property.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 30b9ce1..1b14a8c 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -442,8 +442,8 @@ public enum Property {
       "The maximum number of files a compaction will open"),
   TSERV_COMPACTION_SERVICE_ROOT_EXECUTORS(
       "tserver.compaction.major.service.root.planner.opts.executors",
-      "[{'name':'small','maxSize':'32M','numThreads':1},"
-          + "{'name':'huge','numThreads':1}]".replaceAll("'", "\""),
+      
("[{'name':'small','maxSize':'32M','numThreads':1},{'name':'huge','numThreads':1}]")
+          .replaceAll("'", "\""),
       PropertyType.STRING,
       "See {% jlink -f 
org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner %} "),
   
TSERV_COMPACTION_SERVICE_META_PLANNER("tserver.compaction.major.service.meta.planner",
@@ -458,8 +458,8 @@ public enum Property {
       "The maximum number of files a compaction will open"),
   TSERV_COMPACTION_SERVICE_META_EXECUTORS(
       "tserver.compaction.major.service.meta.planner.opts.executors",
-      "[{'name':'small','maxSize':'32M','numThreads':2},"
-          + "{'name':'huge','numThreads':2}]".replaceAll("'", "\""),
+      
("[{'name':'small','maxSize':'32M','numThreads':2},{'name':'huge','numThreads':2}]")
+          .replaceAll("'", "\""),
       PropertyType.STRING,
       "See {% jlink -f 
org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner %} "),
   
TSERV_COMPACTION_SERVICE_DEFAULT_PLANNER("tserver.compaction.major.service.default.planner",
@@ -474,9 +474,8 @@ public enum Property {
       "The maximum number of files a compaction will open"),
   TSERV_COMPACTION_SERVICE_DEFAULT_EXECUTORS(
       "tserver.compaction.major.service.default.planner.opts.executors",
-      "[{'name':'small','maxSize':'32M','numThreads':2},"
-          + "{'name':'medium','maxSize':'128M','numThreads':2},"
-          + "{'name':'large','numThreads':2}]".replaceAll("'", "\""),
+      
("[{'name':'small','maxSize':'32M','numThreads':2},{'name':'medium','maxSize':'128M','numThreads':2},{'name':'large','numThreads':2}]")
+          .replaceAll("'", "\""),
       PropertyType.STRING,
       "See {% jlink -f 
org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner %} "),
   @Deprecated(since = "2.1.0", forRemoval = true)