chore: feedback

quarkusio · Nov 23, 2021 · 5726377 · 5726377
1 parent a1f0237
commit 5726377
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/extensions/apicurio-registry-avro/runtime/pom.xml b/extensions/apicurio-registry-avro/runtime/pom.xml
@@ -32,6 +32,7 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kubernetes-service-binding</artifactId>
         </dependency>
+
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
@@ -44,6 +45,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx</artifactId>
         </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+      </dependency>
     </dependencies>
 
     <build>

diff --git a/...e/src/main/java/io/quarkus/apicurio/registry/binding/ServiceRegistryBindingConverter.java b/...e/src/main/java/io/quarkus/apicurio/registry/binding/ServiceRegistryBindingConverter.java
@@ -7,6 +7,7 @@
 import java.util.Optional;
 import java.util.logging.Logger;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 
@@ -47,12 +48,12 @@ public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> service
 
             String prefix = channel;
 
-            String oAuthHost = binding.getProperties().get("oauthServerUrl");
-            if (oAuthHost == null) {
-                oAuthHost = binding.getProperties().get("oauthserverurl");
+            String oauthTokenUrl = binding.getProperties().get("oauthTokenUrl");
+            if (oauthTokenUrl == null) {
+                oauthTokenUrl = binding.getProperties().get("oauthtokenurl");
             }
-            if (oAuthHost != null) {
-                properties.put(prefix + "apicurio.auth.service.url", oAuthHost);
+            if (oauthTokenUrl != null) {
+                properties.put(prefix + "apicurio.auth.service.token.endpoint", oauthTokenUrl);
             }
 
             String clientId = binding.getProperties().get("clientId");
@@ -70,15 +71,6 @@ public Optional<ServiceBindingConfigSource> convert(List<ServiceBinding> service
             if (clientSecret != null) {
                 properties.put(prefix + "apicurio.auth.client.secret", clientSecret);
             }
-
-            String realm = binding.getProperties().get("oauthRealm");
-            if (realm == null) {
-                realm = binding.getProperties().get("oauthRealm");
-            }
-            if (clientSecret != null) {
-                properties.put(prefix + "apicurio.auth.realm", realm);
-            }
-
             if (registryUrl != null) {
                 properties.put(prefix + "apicurio.registry.url", registryUrl);
             }
@@ -93,11 +85,17 @@ private List<String> extractChannels(Config configIn) {
 
         for (String propertyName : configIn.getPropertyNames()) {
             if (propertyName.startsWith(INCOMING_PREFIX)) {
-                var channelName = propertyName.replace(INCOMING_PREFIX, "").split("\\.")[0];
-                list.add(INCOMING_PREFIX + channelName + ".");
+                var channelAndProp = StringUtils.substringAfter(propertyName, INCOMING_PREFIX);
+                //remove property
+                var channelName = StringUtils.substringBefore(channelAndProp, ".");
+                if (!StringUtils.isBlank(channelName))
+                    list.add(INCOMING_PREFIX + channelName + ".");
             } else if (propertyName.startsWith(OUTGOING_PREFIX)) {
-                var channelName = propertyName.replace(OUTGOING_PREFIX, "").split("\\.")[0];
-                list.add(OUTGOING_PREFIX + channelName + ".");
+                var channelAndProp = StringUtils.substringAfter(propertyName, OUTGOING_PREFIX);
+                //remove property
+                var channelName = StringUtils.substringBefore(channelAndProp, ".");
+                if (!StringUtils.isBlank(channelName))
+                    list.add(OUTGOING_PREFIX + channelName + ".");
             }
         }
         return list;