improved app config

Accenture · Apr 19, 2024 · 4616080 · 4616080
1 parent 15ed2c9
commit 4616080
Show file tree

Hide file tree

Showing 62 changed files with 3,316 additions and 3,235 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+---
+## Version 3.0.10, 3/19/2024
+
+### Added
+
+Added "app-config-reader.yml" file in the resources folder so that you can override
+the default application configuration files.
+
+### Removed
+
+N/A
+
+### Changed
+
+1. Open sources library update (Spring Boot 3.2.4, Vertx 4.5.5)
+2. Improve AppConfigReader and ConfigReader to use the app-config-reader.yml file.
+
 ---
 ## Version 3.0.9, 2/9/2024
 
@@ -606,7 +623,7 @@ N/A
 1. "kafka.pubsub" is added as a cloud service
 2. File download example in the lambda-example project
 3. "trace.log.header" added to application.properties - when tracing is enabled, this inserts the trace-ID of the 
-   transaction in the log context. For more details, please refer to the [Developer Guide](/guides/CHAPTER-5.md)
+   transaction in the log context. For more details, please refer to the [Developer Guide](guides/CHAPTER-5.md)
 4. Add API to pub/sub engine to support creation of topic with partitions
 5. TypedLambdaFunction is added so that developer can predefine input and output classes in a service without casting
 

diff --git a/INCLUSIVITY.md b/INCLUSIVITY.md
@@ -1,14 +1,10 @@
-<img align="right" height="40" src="https://www.accenture.com/t20180820T081710Z__w__/us-en/_acnmedia/Accenture/Dev/Redesign/Acc_Logo_Black_Purple_RGB.png">  
-<br />
-<br />
-
 # <font size="12">**TECHNOLOGY INCLUSIVE <br />LANGUAGE GUIDEBOOK**</font>
 
 As an organization, Accenture believes in building an inclusive workplace and contributing to a world where equality thrives. Certain terms or expressions can unintentionally harm, perpetuate damaging stereotypes, and insult people. Inclusive language avoids bias, slang terms, and word choices which express derision of groups of people based on race, gender, sexuality, or socioeconomic status.  The Accenture North America Technology team created this guidebook to provide Accenture employees with a view into inclusive language and guidance for working to avoid its use—helping to ensure that we communicate with respect, dignity and fairness.
 
 **How to use this guide?**
 
-Accenture has over 514,000 employees from diverse backgrounds, who perform consulting and delivery work for an equally diverse set of clients and partners. When communicating with your colleagues and representing Accenture, consider the connotation, however unintended, of certain terms in your written and verbal communication. The guidelines are intended to help you recognize non-inclusive words and understand potential meanings that these words might convey. Our goal with these recommendations is not to require you to use specific words, but to ask you to take a moment to consider how your audience may be affected by the language you choose.
+As of 8/2023, Accenture has over 730,000 employees from diverse backgrounds, who perform consulting and delivery work for an equally diverse set of clients and partners. When communicating with your colleagues and representing Accenture, consider the connotation, however unintended, of certain terms in your written and verbal communication. The guidelines are intended to help you recognize non-inclusive words and understand potential meanings that these words might convey. Our goal with these recommendations is not to require you to use specific words, but to ask you to take a moment to consider how your audience may be affected by the language you choose.
 
 <table>
     <thead>

diff --git a/benchmark/benchmark-client/pom.xml b/benchmark/benchmark-client/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>benchmark-client</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.9</version>
+    <version>3.0.10</version>
     <name>Benchmark client</name>
 
     <parent>
@@ -21,7 +21,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <snakeyaml.version>2.2</snakeyaml.version>
         <hazelcast.version>5.3.6</hazelcast.version>
-        <kafka.version>3.6.1</kafka.version>
+        <kafka.version>3.7.0</kafka.version>
         <gson.version>2.10.1</gson.version>
         <netty.version>4.1.105.Final</netty.version>
         <slf4j.version>2.0.11</slf4j.version>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>platform-core</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <!-- select your cloud connector (hazelcast-connector or kafka-connector).
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>kafka-connector</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/benchmark/benchmark-client/src/main/resources/application.properties b/benchmark/benchmark-client/src/main/resources/application.properties
@@ -78,7 +78,7 @@ show.application.properties=server.port, cloud.connector
 # REST automation configuration files
 # (the first available will be used)
 #
-rest.automation.yaml=file:/tmp/config/rest.yaml, classpath:/rest.yaml
+yaml.rest.automation=file:/tmp/config/rest.yaml, classpath:/rest.yaml
 
 #
 # If api.origin is present, it will override "Access-Control-Allow-Origin" in the CORS headers

diff --git a/benchmark/benchmark-server/pom.xml b/benchmark/benchmark-server/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>benchmark-server</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.9</version>
+    <version>3.0.10</version>
     <name>Benchmark server</name>
 
     <parent>
@@ -21,7 +21,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <snakeyaml.version>2.2</snakeyaml.version>
         <hazelcast.version>5.3.6</hazelcast.version>
-        <kafka.version>3.6.1</kafka.version>
+        <kafka.version>3.7.0</kafka.version>
         <gson.version>2.10.1</gson.version>
         <netty.version>4.1.105.Final</netty.version>
         <slf4j.version>2.0.11</slf4j.version>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>platform-core</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <!-- select your cloud connector (hazelcast-connector or kafka-connector).
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>kafka-connector</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/benchmark/benchmark-server/src/main/resources/application.properties b/benchmark/benchmark-server/src/main/resources/application.properties
@@ -77,7 +77,7 @@ show.application.properties=server.port, cloud.connector
 # REST automation configuration files
 # (the first available will be used)
 #
-rest.automation.yaml=file:/tmp/config/rest.yaml, classpath:/rest.yaml
+yaml.rest.automation=file:/tmp/config/rest.yaml, classpath:/rest.yaml
 
 #
 # If api.origin is present, it will override "Access-Control-Allow-Origin" in the CORS headers

diff --git a/connectors/adapters/hazelcast/hazelcast-connector/pom.xml b/connectors/adapters/hazelcast/hazelcast-connector/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>hazelcast-connector</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.9</version>
+    <version>3.0.10</version>
     <name>Cloud connector for Hazelcast cluster</name>
 
     <parent>
@@ -21,7 +21,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <snakeyaml.version>2.2</snakeyaml.version>
         <hazelcast.version>5.3.6</hazelcast.version>
-        <kafka.version>3.6.1</kafka.version>
+        <kafka.version>3.7.0</kafka.version>
         <gson.version>2.10.1</gson.version>
         <netty.version>4.1.105.Final</netty.version>
         <slf4j.version>2.0.11</slf4j.version>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>cloud-connector</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.hazelcast/hazelcast-client -->

diff --git a/connectors/adapters/hazelcast/hazelcast-presence/pom.xml b/connectors/adapters/hazelcast/hazelcast-presence/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.platformlambda</groupId>
     <artifactId>hazelcast-presence</artifactId>
     <packaging>jar</packaging>
-    <version>3.0.9</version>
+    <version>3.0.10</version>
     <name>Presence monitor for Hazelcast</name>
 
     <parent>
@@ -19,7 +19,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <snakeyaml.version>2.2</snakeyaml.version>
         <hazelcast.version>5.3.6</hazelcast.version>
-        <kafka.version>3.6.1</kafka.version>
+        <kafka.version>3.7.0</kafka.version>
         <gson.version>2.10.1</gson.version>
         <netty.version>4.1.105.Final</netty.version>
         <slf4j.version>2.0.11</slf4j.version>
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>service-monitor</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>hazelcast-connector</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/...ters/hazelcast/hazelcast-presence/src/main/java/org/platformlambda/hazelcast/MainApp.java b/...ters/hazelcast/hazelcast-presence/src/main/java/org/platformlambda/hazelcast/MainApp.java
@@ -1,40 +1,40 @@
-/*
-
-    Copyright 2018-2024 Accenture Technology
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
- */
-
-package org.platformlambda.hazelcast;
-
-import org.platformlambda.core.annotations.MainApplication;
-import org.platformlambda.core.models.EntryPoint;
-import org.platformlambda.core.system.AutoStart;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@MainApplication
-public class MainApp implements EntryPoint {
-    private static final Logger log = LoggerFactory.getLogger(MainApp.class);
-
-    public static void main(String[] args) {
-        AutoStart.main(args);
-    }
-
-    @Override
-    public void start(String[] args) {
-        log.info("Started");
-    }
-
-}
+/*
+
+    Copyright 2018-2024 Accenture Technology
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package org.platformlambda.hazelcast;
+
+import org.platformlambda.core.annotations.MainApplication;
+import org.platformlambda.core.models.EntryPoint;
+import org.platformlambda.core.system.AutoStart;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@MainApplication
+public class MainApp implements EntryPoint {
+    private static final Logger log = LoggerFactory.getLogger(MainApp.class);
+
+    public static void main(String[] args) {
+        AutoStart.main(args);
+    }
+
+    @Override
+    public void start(String[] args) {
+        log.info("Started");
+    }
+
+}
diff --git a/connectors/adapters/kafka/kafka-connector/pom.xml b/connectors/adapters/kafka/kafka-connector/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>kafka-connector</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.9</version>
+    <version>3.0.10</version>
     <name>Cloud connector for Kafka cluster</name>
 
     <parent>
@@ -21,7 +21,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <snakeyaml.version>2.2</snakeyaml.version>
         <hazelcast.version>5.3.6</hazelcast.version>
-        <kafka.version>3.6.1</kafka.version>
+        <kafka.version>3.7.0</kafka.version>
         <gson.version>2.10.1</gson.version>
         <netty.version>4.1.105.Final</netty.version>
         <slf4j.version>2.0.11</slf4j.version>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>cloud-connector</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <dependency>

diff --git a/...adapters/kafka/kafka-connector/src/main/java/org/platformlambda/kafka/KafkaConnector.java b/...adapters/kafka/kafka-connector/src/main/java/org/platformlambda/kafka/KafkaConnector.java
@@ -41,6 +41,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -73,8 +74,9 @@ public static synchronized Properties getKafkaProperties(String location) {
                 log.error("Unable to find kafka properties - {}", e.getMessage());
                 System.exit(-1);
             }
-            for (String k : config.getMap().keySet()) {
-                properties.setProperty(k, config.getProperty(k));
+            Map<String, Object> kv = config.getCompositeKeyValues();
+            for (String k : kv.keySet()) {
+                properties.setProperty(k, String.valueOf(kv.get(k)));
             }
             String brokerUrls = properties.getProperty(BROKER_URL);
             List<String> brokers = Utility.getInstance().split(brokerUrls, ",");

diff --git a/connectors/adapters/kafka/kafka-presence/pom.xml b/connectors/adapters/kafka/kafka-presence/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.platformlambda</groupId>
     <artifactId>kafka-presence</artifactId>
     <packaging>jar</packaging>
-    <version>3.0.9</version>
+    <version>3.0.10</version>
     <name>Presence monitor for Kafka</name>
 
     <parent>
@@ -19,7 +19,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <snakeyaml.version>2.2</snakeyaml.version>
         <hazelcast.version>5.3.6</hazelcast.version>
-        <kafka.version>3.6.1</kafka.version>
+        <kafka.version>3.7.0</kafka.version>
         <gson.version>2.10.1</gson.version>
         <netty.version>4.1.105.Final</netty.version>
         <slf4j.version>2.0.11</slf4j.version>
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>service-monitor</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>kafka-connector</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/junit/junit -->

diff --git a/connectors/adapters/kafka/kafka-standalone/pom.xml b/connectors/adapters/kafka/kafka-standalone/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>kafka-standalone</artifactId>
 
     <packaging>jar</packaging>
-    <version>3.0.9</version>
+    <version>3.0.10</version>
     <name>Standalone kafka system for dev</name>
 
     <parent>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.platformlambda</groupId>
             <artifactId>platform-core</artifactId>
-            <version>3.0.9</version>
+            <version>3.0.10</version>
         </dependency>
 
         <dependency>