Skip to content

Commit 9a566b2

Browse files
author
Matt Howlett
committed
review changes
1 parent 9969d19 commit 9a566b2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/ConfigGen/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ internal static List<PropertySpecification> RemoveLegacyOrNotRelevant(List<Prope
3838
if (p.Name == "consume.callback.max.messages") { return false; }
3939
if (p.Name == "offset.store.path") { return false; }
4040
if (p.Name == "offset.store.sync.interval.ms") { return false; }
41-
if (p.Name == "enabled_events") { return false; }
4241
if (p.Name == "builtin.features") { return false; }
4342
if (p.Name == "produce.offset.report") { return false; }
4443
if (p.Name == "delivery.report.only.error") { return false; }
4544
if (p.Name == "topic.metadata.refresh.fast.cnt") { return false; }
4645
if (p.Name == "auto.commit.interval.ms" && !p.IsGlobal) { return false; }
4746
if (p.Name == "enable.auto.commit" && !p.IsGlobal) { return false; }
4847
if (p.Name == "auto.commit.enable" && !p.IsGlobal) { return false; }
48+
if (p.Name.Contains("_")) { return false; }
4949
return true;
5050
}).ToList();
5151

@@ -136,7 +136,7 @@ class PropertySpecification
136136
{
137137
public bool IsGlobal { get; set; }
138138
public string Name { get; set; }
139-
public string CPorA { get; set; }
139+
public string CPorA { get; set; } // Consumer, Producer or All.
140140
public string Range { get; set; }
141141
public string Default { get; set; }
142142
public string Description { get; set; }

src/Confluent.SchemaRegistry/CachedSchemaRegistryClient.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public CachedSchemaRegistryClient(IEnumerable<KeyValuePair<string, string>> conf
9595
{
9696
if (basicAuthInfo == "")
9797
{
98-
throw new ArgumentException($"CachedSchemaRegistryClient: {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthCredentialsSource} was set to 'USER_INFO', but no value was specified for {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthUserInfo}.");
98+
throw new ArgumentException($"CachedSchemaRegistryClient: {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthCredentialsSource} set to 'USER_INFO', but no value specified for {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthUserInfo}.");
9999
}
100100
var userPass = (basicAuthInfo).Split(':');
101101
if (userPass.Length != 2)
@@ -109,17 +109,17 @@ public CachedSchemaRegistryClient(IEnumerable<KeyValuePair<string, string>> conf
109109
{
110110
if (basicAuthInfo != "")
111111
{
112-
throw new ArgumentException($"CachedSchemaRegistryClient: {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthCredentialsSource} was set to 'SASL_INHERIT', but {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthUserInfo} as also specified.");
112+
throw new ArgumentException($"CachedSchemaRegistryClient: {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthCredentialsSource} set to 'SASL_INHERIT', but {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthUserInfo} as also specified.");
113113
}
114114
var saslUsername = config.FirstOrDefault(prop => prop.Key == "sasl.username");
115115
var saslPassword = config.FirstOrDefault(prop => prop.Key == "sasl.password");
116116
if (saslUsername.Value == null)
117117
{
118-
throw new ArgumentException($"CachedSchemaRegistryClient: {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthCredentialsSource} was set to 'SASL_INHERIT', but 'sasl.username' property was not specified.");
118+
throw new ArgumentException($"CachedSchemaRegistryClient: {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthCredentialsSource} set to 'SASL_INHERIT', but 'sasl.username' property not specified.");
119119
}
120120
if (saslPassword.Value == null)
121121
{
122-
throw new ArgumentException($"CachedSchemaRegistryClient: {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthCredentialsSource} was set to 'SASL_INHERIT', but 'sasl.password' property was not specified.");
122+
throw new ArgumentException($"CachedSchemaRegistryClient: {SchemaRegistryConfig.PropertyNames.SchemaRegistryBasicAuthCredentialsSource} set to 'SASL_INHERIT', but 'sasl.password' property not specified.");
123123
}
124124
username = Convert.ToString(saslUsername.Value);
125125
password = Convert.ToString(saslPassword.Value);

0 commit comments

Comments
 (0)