Refresh Java samples to support Gradle 7 (#75)

    Update build.gradle files to support Gradle 7
    Small code cleanups

Author: mimaison

kafka-java-console-sample/build.gradle

@@ -20,7 +20,6 @@
 plugins {
   id 'application'
   id 'java'
-  id 'com.github.johnrengelman.shadow' version '4.0.2'
   id 'eclipse'
 }
 
@@ -36,81 +35,18 @@ repositories {
 }
 
 dependencies {
-  compile 'org.apache.kafka:kafka-clients:2.4.+'
-  compile 'log4j:log4j:1.2.17'
-  compile 'org.slf4j:slf4j-log4j12:1.7.25'
-  compile 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
-}
-
-task downloadDependencies(type: Exec) {
-  configurations.testRuntime.files
-  commandLine 'echo', 'Downloaded all dependencies'
-}
-
-// Compile source code
-compileJava {
-    doFirst {
-        copy {
-            from configurations.runtime
-            into 'lib'
-        }
-    }
-
-    source = 'src'
-    options.encoding = 'ISO-8859-1'
+  implementation 'org.apache.kafka:kafka-clients:2.7.+'
+  implementation 'log4j:log4j:1.2.17'
+  implementation 'org.slf4j:slf4j-log4j12:1.7.25'
+  implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.+'
 }
 
 jar {
-    from "resources/log4j.properties"
-    
-    doLast {
-        copy {
-            from 'resources'
-            into 'build/libs/resources'
-        }
-    
-        copy {
-            from 'lib'
-            into 'build/libs/lib'
-        }
-    }
-    
-    // Provide Main-Class so the JAR executes properly, along with the required classpath data.
-    manifest {
-        attributes('Main-Class': mainClassName,
-        'Class-Path': configurations.runtime.files.collect { './lib/' + it.name }.join(' '))
-    }
-}
-
-// Save JAR in build directory.
-uploadArchives {
-    repositories {
-        flatDir {
-            dirs 'build'
-        }
-    }
-}
-
-['Zip', 'Tar'].each { suffix ->
-    "dist$suffix" {
-        def basePath = baseName + '-' + version
-
-        from('resources') {
-            into { basePath + '/resources' }
-            exclude 'log4j.properties'
-        }
-
-        from('resources') {
-            into { basePath + '/lib' }
-            include 'log4j.properties'
-        }
-    }
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  manifest {
+    attributes('Main-Class': mainClassName)
+  }
+  from {
+    configurations.compileClasspath.filter{ it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }
+  }
 }
-
-sourceSets {
-    main {
-        java {
-            srcDirs = ["src/main/java", "src/main/resources"]
-        }
-    }
-}

kafka-java-console-sample/docs/Docker_Local.md

@@ -21,7 +21,6 @@ To build and run the sample, you must have the done the following:
     ```shell
     export VCAP_SERVICES='{
         "instance_id": "...",
-        "mqlight_lookup_url": "...",
         "api_key": "...",
         "kafka_admin_url": "....",
         "kafka_rest_url": "...",

kafka-java-console-sample/src/main/java/com/eventstreams/samples/ConsumerRunnable.java

@@ -76,13 +76,13 @@ public void run() {
                     }
 
                 } catch (final WakeupException e) {
-                    logger.warn("Consumer closing - caught exception: {}", e);
+                    logger.warn("Consumer closing - caught exception: {}", e, e);
                 } catch (final KafkaException e) {
                     logger.error("Sleeping for 5s - Consumer has caught: {}", e, e);
                     try {
                         Thread.sleep(5000); // Longer sleep before retrying
                     } catch (InterruptedException e1) {
-                        logger.warn("Consumer closing - caught exception: {}", e);
+                        logger.warn("Consumer closing - caught exception: {}", e, e);
                     }
                 }
             }

kafka-java-console-sample/src/main/java/com/eventstreams/samples/EventStreamsConsoleSample.java

@@ -240,7 +240,6 @@ static final Map<String, Object> getProducerConfigs(String bootstrapServers, Str
         configs.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
         configs.put(ProducerConfig.CLIENT_ID_CONFIG, "kafka-java-console-sample-producer");
         configs.put(ProducerConfig.ACKS_CONFIG, "all");
-        configs.put(ProducerConfig.CLIENT_DNS_LOOKUP_CONFIG,"use_all_dns_ips");
         configs.putAll(getCommonConfigs(bootstrapServers, apikey));
         return configs;
     }
@@ -252,7 +251,6 @@ static final Map<String, Object> getConsumerConfigs(String bootstrapServers, Str
         configs.put(ConsumerConfig.CLIENT_ID_CONFIG, "kafka-java-console-sample-consumer");
         configs.put(ConsumerConfig.GROUP_ID_CONFIG, "kafka-java-console-sample-group");
         configs.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "latest");
-        configs.put(ConsumerConfig.CLIENT_DNS_LOOKUP_CONFIG,"use_all_dns_ips");
         configs.putAll(getCommonConfigs(bootstrapServers, apikey));
         return configs;
     }
@@ -263,16 +261,12 @@ static final Map<String, Object> getCommonConfigs(String boostrapServers, String
         configs.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, "SASL_SSL");
         configs.put(SaslConfigs.SASL_MECHANISM, "PLAIN");
         configs.put(SaslConfigs.SASL_JAAS_CONFIG, "org.apache.kafka.common.security.plain.PlainLoginModule required username=\"token\" password=\"" + apikey + "\";");
-        configs.put(SslConfigs.SSL_PROTOCOL_CONFIG, "TLSv1.2");
-        configs.put(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG, "TLSv1.2");
-        configs.put(SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG, "HTTPS");
         return configs;
     }
 
     static final Properties getAdminConfigs(String bootstrapServers, String apikey) {
         Properties configs = new Properties();
         configs.put(ConsumerConfig.CLIENT_ID_CONFIG, "kafka-java-console-sample-admin");
-        configs.put(AdminClientConfig.CLIENT_DNS_LOOKUP_CONFIG, "use_all_dns_ips");
         configs.putAll(getCommonConfigs(bootstrapServers, apikey));
         return configs;
     }

kafka-java-console-sample/src/main/java/com/eventstreams/samples/ProducerRunnable.java

@@ -91,13 +91,13 @@ public void run() {
                     Thread.sleep(2000L); 
 
                 } catch (final InterruptedException e) {
-                    logger.warn("Producer closing - caught exception: {}", e);
+                    logger.warn("Producer closing - caught exception: {}", e, e);
                 } catch (final Exception e) {
                     logger.error("Sleeping for 5s - Producer has caught : {}", e, e);
                     try {
                         Thread.sleep(5000L); // Longer sleep before retrying
                     } catch (InterruptedException e1) {
-                        logger.warn("Producer closing - caught exception: {}", e);
+                        logger.warn("Producer closing - caught exception: {}", e, e);
                     }
                 }
             }

kafka-java-console-sample/src/main/resources/.gitignore

@@ -1,5 +1,5 @@
 # IBM Event Streams for IBM Cloud Kafka Java console sample application
-This Java console application demonstrates how to connect to [IBM Event Streams for IBM Cloud](https://cloud.ibm.com/docs/services/EventStreams?topic=eventstreams-getting_started), send and receive messages using the [Kafka](https://kafka.apache.org) Java API, and using the a third party Avro Serializer and Deserializer for the schema registry. It also shows how to create topics using the Kafka Admin API.
+This Java console application demonstrates how to connect to [IBM Event Streams for IBM Cloud](https://cloud.ibm.com/docs/services/EventStreams?topic=eventstreams-getting_started), send and receive messages using the [Kafka](https://kafka.apache.org) Java API, and using a third party Avro Serializer and Deserializer for the schema registry. It also shows how to create topics using the Kafka Admin API.
 
 It can be run locally on your machine or deployed into [IBM Cloud](https://cloud.ibm.com/).
 

kafka-java-console-schema-sample/README.md

@@ -41,16 +41,16 @@ repositories {
 }
 
 dependencies {
-  compile 'org.apache.kafka:kafka-clients:2.4.+'
-  compile 'log4j:log4j:1.2.17'
-  compile 'org.slf4j:slf4j-log4j12:1.7.25'
-  compile 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
-  compile 'io.confluent:kafka-avro-serializer:5.3.1'
-  compile "org.apache.avro:avro:1.10.0"
+  implementation 'org.apache.kafka:kafka-clients:2.7.+'
+  implementation 'log4j:log4j:1.2.17'
+  implementation 'org.slf4j:slf4j-log4j12:1.7.25'
+  implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.+'
+  implementation 'io.confluent:kafka-avro-serializer:5.3.+'
+  implementation 'org.apache.avro:avro:1.10.+'
 }
 
 task downloadDependencies(type: Exec) {
-  configurations.testRuntime.files
+  configurations.testRuntimeClasspath.files
   commandLine 'echo', 'Downloaded all dependencies'
 }
 
@@ -69,7 +69,7 @@ avro {
 compileJava {
     doFirst {
         copy {
-            from configurations.runtime
+            from configurations.runtimeClasspath
             into 'lib'
         }
     }
@@ -96,32 +96,7 @@ jar {
     // Provide Main-Class so the JAR executes properly, along with the required classpath data.
     manifest {
         attributes('Main-Class': mainClassName,
-        'Class-Path': configurations.runtime.files.collect { './lib/' + it.name }.join(' '))
-    }
-}
-
-// Save JAR in build directory.
-uploadArchives {
-    repositories {
-        flatDir {
-            dirs 'build'
-        }
-    }
-}
-
-['Zip', 'Tar'].each { suffix ->
-    "dist$suffix" {
-        def basePath = baseName + '-' + version
-
-        from('resources') {
-            into { basePath + '/resources' }
-            exclude 'log4j.properties'
-        }
-
-        from('resources') {
-            into { basePath + '/lib' }
-            include 'log4j.properties'
-        }
+        'Class-Path': configurations.runtimeClasspath.files.collect { './lib/' + it.name }.join(' '))
     }
 }
 

kafka-java-console-schema-sample/build.gradle

@@ -12,7 +12,7 @@ To build and run the sample, you must have the done the following:
 
 1. Build the container image from the `Dockerfile`:
     ```shell
-    docker build -t java-console-sample .
+    docker build -t java-console-schema-sample .
     ```
 
 2. Export the Event Streams for IBM Cloud instance credentials:
@@ -21,7 +21,6 @@ To build and run the sample, you must have the done the following:
     ```shell
     export VCAP_SERVICES='{
         "instance_id": "...",
-        "mqlight_lookup_url": "...",
         "api_key": "...",
         "kafka_admin_url": "....",
         "kafka_rest_url": "...",
@@ -35,7 +34,7 @@ To build and run the sample, you must have the done the following:
 
 3. Run the container image
     ```shell
-    docker run -e VCAP_SERVICES="$VCAP_SERVICES" java-console-sample
+    docker run -e VCAP_SERVICES="$VCAP_SERVICES" java-console-schema-sample
     ```
 
 ## Further references

kafka-java-console-schema-sample/docs/Docker_Local.md

@@ -1,7 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        jcenter()
+        mavenCentral()
         maven {
             name "JCenter Gradle Plugins"
             url  "https://dl.bintray.com/gradle/gradle-plugins"