Commit def094b8 authored by Stephane Nicoll's avatar Stephane Nicoll

Advertize web endpoints as disabled by default

Following the rework on Security that expects web endpoints to be
disabled by default, this commit updates the metadata (including the
automatic generation) to reflect this decision.
parent c76c16d9
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"name": "endpoints.all.web.enabled", "name": "endpoints.all.web.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",
"description": "Enable all endpoints as Web endpoints.", "description": "Enable all endpoints as Web endpoints.",
"defaultValue": true "defaultValue": false
}, },
{ {
"name": "endpoints.configprops.keys-to-sanitize", "name": "endpoints.configprops.keys-to-sanitize",
......
...@@ -392,7 +392,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor ...@@ -392,7 +392,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
this.metadataCollector.add(ItemMetadata.newProperty( this.metadataCollector.add(ItemMetadata.newProperty(
endpointKey(endpointId + ".web"), "enabled", Boolean.class.getName(), endpointKey(endpointId + ".web"), "enabled", Boolean.class.getName(),
type, null, String.format("Expose the %s endpoint as a Web endpoint.", type, null, String.format("Expose the %s endpoint as a Web endpoint.",
endpointId), enabledByDefault, null)); endpointId), false, null));
} }
} }
......
...@@ -532,7 +532,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { ...@@ -532,7 +532,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
.fromSource(SimpleEndpoint.class)); .fromSource(SimpleEndpoint.class));
assertThat(metadata).has(enabledFlag("simple", true)); assertThat(metadata).has(enabledFlag("simple", true));
assertThat(metadata).has(jmxEnabledFlag("simple", true)); assertThat(metadata).has(jmxEnabledFlag("simple", true));
assertThat(metadata).has(webEnabledFlag("simple", true)); assertThat(metadata).has(webEnabledFlag("simple", false));
assertThat(metadata).has(cacheTtl("simple")); assertThat(metadata).has(cacheTtl("simple"));
assertThat(metadata.getItems()).hasSize(5); assertThat(metadata.getItems()).hasSize(5);
} }
...@@ -558,7 +558,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { ...@@ -558,7 +558,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
ofType(String.class).withDefaultValue("test")); ofType(String.class).withDefaultValue("test"));
assertThat(metadata).has(enabledFlag("customprops", true)); assertThat(metadata).has(enabledFlag("customprops", true));
assertThat(metadata).has(jmxEnabledFlag("customprops", true)); assertThat(metadata).has(jmxEnabledFlag("customprops", true));
assertThat(metadata).has(webEnabledFlag("customprops", true)); assertThat(metadata).has(webEnabledFlag("customprops", false));
assertThat(metadata).has(cacheTtl("customprops")); assertThat(metadata).has(cacheTtl("customprops"));
assertThat(metadata.getItems()).hasSize(6); assertThat(metadata.getItems()).hasSize(6);
} }
...@@ -580,7 +580,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { ...@@ -580,7 +580,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
assertThat(metadata).has(Metadata.withGroup("endpoints.web") assertThat(metadata).has(Metadata.withGroup("endpoints.web")
.fromSource(OnlyWebEndpoint.class)); .fromSource(OnlyWebEndpoint.class));
assertThat(metadata).has(enabledFlag("web", true)); assertThat(metadata).has(enabledFlag("web", true));
assertThat(metadata).has(webEnabledFlag("web", true)); assertThat(metadata).has(webEnabledFlag("web", false));
assertThat(metadata).has(cacheTtl("web")); assertThat(metadata).has(cacheTtl("web"));
assertThat(metadata.getItems()).hasSize(4); assertThat(metadata.getItems()).hasSize(4);
} }
...@@ -594,7 +594,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { ...@@ -594,7 +594,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
.fromSource(IncrementalEndpoint.class)); .fromSource(IncrementalEndpoint.class));
assertThat(metadata).has(enabledFlag("incremental", true)); assertThat(metadata).has(enabledFlag("incremental", true));
assertThat(metadata).has(jmxEnabledFlag("incremental", true)); assertThat(metadata).has(jmxEnabledFlag("incremental", true));
assertThat(metadata).has(webEnabledFlag("incremental", true)); assertThat(metadata).has(webEnabledFlag("incremental", false));
assertThat(metadata).has(cacheTtl("incremental")); assertThat(metadata).has(cacheTtl("incremental"));
assertThat(metadata.getItems()).hasSize(5); assertThat(metadata.getItems()).hasSize(5);
project.replaceText(IncrementalEndpoint.class, "id = \"incremental\"", project.replaceText(IncrementalEndpoint.class, "id = \"incremental\"",
...@@ -618,7 +618,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { ...@@ -618,7 +618,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
.fromSource(IncrementalEndpoint.class)); .fromSource(IncrementalEndpoint.class));
assertThat(metadata).has(enabledFlag("incremental", true)); assertThat(metadata).has(enabledFlag("incremental", true));
assertThat(metadata).has(jmxEnabledFlag("incremental", true)); assertThat(metadata).has(jmxEnabledFlag("incremental", true));
assertThat(metadata).has(webEnabledFlag("incremental", true)); assertThat(metadata).has(webEnabledFlag("incremental", false));
assertThat(metadata).has(cacheTtl("incremental")); assertThat(metadata).has(cacheTtl("incremental"));
assertThat(metadata.getItems()).hasSize(5); assertThat(metadata.getItems()).hasSize(5);
project.replaceText(IncrementalEndpoint.class, "id = \"incremental\"", project.replaceText(IncrementalEndpoint.class, "id = \"incremental\"",
...@@ -627,7 +627,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { ...@@ -627,7 +627,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
assertThat(metadata).has(Metadata.withGroup("endpoints.incremental") assertThat(metadata).has(Metadata.withGroup("endpoints.incremental")
.fromSource(IncrementalEndpoint.class)); .fromSource(IncrementalEndpoint.class));
assertThat(metadata).has(enabledFlag("incremental", true)); assertThat(metadata).has(enabledFlag("incremental", true));
assertThat(metadata).has(webEnabledFlag("incremental", true)); assertThat(metadata).has(webEnabledFlag("incremental", false));
assertThat(metadata).has(cacheTtl("incremental")); assertThat(metadata).has(cacheTtl("incremental"));
assertThat(metadata.getItems()).hasSize(4); assertThat(metadata.getItems()).hasSize(4);
} }
...@@ -650,7 +650,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { ...@@ -650,7 +650,7 @@ public class ConfigurationMetadataAnnotationProcessorTests {
.fromSource(IncrementalJmxEndpoint.class)); .fromSource(IncrementalJmxEndpoint.class));
assertThat(metadata).has(enabledFlag("incremental", true)); assertThat(metadata).has(enabledFlag("incremental", true));
assertThat(metadata).has(jmxEnabledFlag("incremental", true)); assertThat(metadata).has(jmxEnabledFlag("incremental", true));
assertThat(metadata).has(webEnabledFlag("incremental", true)); assertThat(metadata).has(webEnabledFlag("incremental", false));
assertThat(metadata).has(cacheTtl("incremental")); assertThat(metadata).has(cacheTtl("incremental"));
assertThat(metadata.getItems()).hasSize(5); assertThat(metadata.getItems()).hasSize(5);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment