Issue eclipse#162 align with standards for MP Config property names

njr-11 · Jun 6, 2019 · 2c93e18 · 2c93e18
1 parent 7c7ac85
commit 2c93e18
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/api/src/main/java/org/eclipse/microprofile/context/ManagedExecutor.java b/api/src/main/java/org/eclipse/microprofile/context/ManagedExecutor.java
@@ -188,7 +188,7 @@ public interface Builder {
          * by the specification that defines the context type or by a related
          * MicroProfile specification.</p>
          *
-         * <p>The MicroProfile Config property, <code>ManagedExecutor/cleared</code>,
+         * <p>The MicroProfile Config property, <code>mp.context.ManagedExecutor.cleared</code>,
          * establishes a default that is used if no value is otherwise specified.
          * The value of the MicroProfile Config property can be the empty string
          * or a comma separated list of context type constant values.</p>
@@ -212,7 +212,7 @@ public interface Builder {
          * by the specification that defines the context type or by a related
          * MicroProfile specification.</p>
          *
-         * <p>The MicroProfile Config property, <code>ManagedExecutor/propagated</code>,
+         * <p>The MicroProfile Config property, <code>mp.context.ManagedExecutor.propagated</code>,
          * establishes a default that is used if no value is otherwise specified.
          * The value of the MicroProfile Config property can be the empty string
          * or a comma separated list of context type constant values.</p>
@@ -237,7 +237,7 @@ public interface Builder {
          * <p>The default value of <code>-1</code> indicates no upper bound,
          * although practically, resource constraints of the system will apply.
          * You can switch the default by specifying the MicroProfile Config
-         * property, <code>ManagedExecutor/maxAsync</code>.</p>
+         * property, <code>mp.context.ManagedExecutor.maxAsync</code>.</p>
          *
          * @param max upper bound on async completion stage actions and executor tasks.
          * @return the same builder instance upon which this method is invoked.
@@ -253,7 +253,7 @@ public interface Builder {
          * <p>The default value of <code>-1</code> indicates no upper bound,
          * although practically, resource constraints of the system will apply.
          * You can switch the default by specifying the MicroProfile Config
-         * property, <code>ManagedExecutor/maxQueued</code>.</p>
+         * property, <code>mp.context.ManagedExecutor.maxQueued</code>.</p>
          *
          * @param max upper bound on async actions and tasks that can be queued.
          * @return the same builder instance upon which this method is invoked.

diff --git a/api/src/main/java/org/eclipse/microprofile/context/ThreadContext.java b/api/src/main/java/org/eclipse/microprofile/context/ThreadContext.java
@@ -132,7 +132,7 @@ interface Builder {
          * by the specification that defines the context type or by a related
          * MicroProfile specification.</p>
          *
-         * <p>The MicroProfile Config property, <code>ThreadContext/cleared</code>,
+         * <p>The MicroProfile Config property, <code>mp.context.ThreadContext.cleared</code>,
          * establishes a default that is used if no value is otherwise specified.
          * The value of the MicroProfile Config property can be the empty string
          * or a comma separated list of context type constant values.</p>
@@ -156,7 +156,7 @@ interface Builder {
          * by the specification that defines the context type or by a related
          * MicroProfile specification.</p>
          *
-         * <p>The MicroProfile Config property, <code>ThreadContext/propagated</code>,
+         * <p>The MicroProfile Config property, <code>mp.context.ThreadContext.propagated</code>,
          * establishes a default that is used if no value is otherwise specified.
          * The value of the MicroProfile Config property can be the empty string
          * or a comma separated list of context type constant values.</p>
@@ -183,7 +183,7 @@ interface Builder {
          * by the specification that defines the context type or by a related
          * MicroProfile specification.</p>
          *
-         * <p>The MicroProfile Config property, <code>ThreadContext/unchanged</code>,
+         * <p>The MicroProfile Config property, <code>mp.context.ThreadContext.unchanged</code>,
          * establishes a default that is used if no value is otherwise specified.
          * The value of the MicroProfile Config property can be the empty string
          * or a comma separated list of context type constant values. If a default

diff --git a/spec/src/main/asciidoc/mpconfig.asciidoc b/spec/src/main/asciidoc/mpconfig.asciidoc
@@ -23,10 +23,10 @@ For example, you could specify MicroProfile Config properties as follows to esta
 
 [source, text]
 ----
-ManagedExecutor/propagated=Remaining
-ManagedExecutor/cleared=Transaction
-ManagedExecutor/maxAsync=10
-ManagedExecutor/maxQueued=-1
+mp.context.ManagedExecutor.propagated=Remaining
+mp.context.ManagedExecutor.cleared=Transaction
+mp.context.ManagedExecutor.maxAsync=10
+mp.context.ManagedExecutor.maxQueued=-1
 ----
 
 With these defaults in place, the application can create a `ManagedExecutor` instance without specifying some of the configuration attributes,
@@ -42,9 +42,9 @@ As another example, the following MicroProfile Config properties establish defau
 
 [source, text]
 ----
-ThreadContext/propagated=
-ThreadContext/cleared=Security,Transaction
-ThreadContext/unchanged=Remaining
+mp.context.ThreadContext.propagated=
+mp.context.ThreadContext.cleared=Security,Transaction
+mp.context.ThreadContext.unchanged=Remaining
 ----
 
 With these defaults in place, the application can create a `ThreadContext` instance without specifying some of the configuration attributes,

diff --git a/spec/src/main/asciidoc/overview.asciidoc b/spec/src/main/asciidoc/overview.asciidoc
@@ -122,13 +122,13 @@ MicroProfile Config properties can be used to specify defaults for configuration
 Here is an example that includes all of the available attributes that can be defaulted:
 
 ----
-ManagedExecutor/propagated=Security,Application
-ManagedExecutor/cleared=Remaining
-ManagedExecutor/maxAsync=10
-ManagedExecutor/maxQueued=-1
-
-ThreadContext/propagated=
-ThreadContext/cleared=Security,Transaction
-ThreadContext/unchanged=Remaining
+mp.context.ManagedExecutor.propagated=Security,Application
+mp.context.ManagedExecutor.cleared=Remaining
+mp.context.ManagedExecutor.maxAsync=10
+mp.context.ManagedExecutor.maxQueued=-1
+
+mp.context.ThreadContext.propagated=
+mp.context.ThreadContext.cleared=Security,Transaction
+mp.context.ThreadContext.unchanged=Remaining
 ----
 
diff --git a/tck/src/main/java/org/eclipse/microprofile/context/tck/MPConfigTest.java b/tck/src/main/java/org/eclipse/microprofile/context/tck/MPConfigTest.java
@@ -100,13 +100,13 @@ public static WebArchive createDeployment() {
                 .addClass(MPConfigTest.class)
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
                 .addAsWebInfResource(new StringAsset(
-                                "ManagedExecutor/maxAsync=1\n" +
-                                        "ManagedExecutor/maxQueued=4\n" +
-                                        "ManagedExecutor/propagated=Label,ThreadPriority\n" +
-                                        "ManagedExecutor/cleared=Remaining\n" +
-                                        "ThreadContext/cleared=Buffer\n" +
-                                        "ThreadContext/propagated=\n" +
-                                        "ThreadContext/unchanged=Remaining"),
+                                "mp.context.ManagedExecutor.maxAsync=1\n" +
+                                        "mp.context.ManagedExecutor.maxQueued=4\n" +
+                                        "mp.context.ManagedExecutor.propagated=Label,ThreadPriority\n" +
+                                        "mp.context.ManagedExecutor.cleared=Remaining\n" +
+                                        "mp.context.ThreadContext.cleared=Buffer\n" +
+                                        "mp.context.ThreadContext.propagated=\n" +
+                                        "mp.context.ThreadContext.unchanged=Remaining"),
                         "classes/META-INF/microprofile-config.properties")
                 .addAsLibraries(fakeContextProviders);
     }