Project update

- Remove public keyword from Beans;
- Rename docker-build.sh to build-docker-images.sh;
- Replace docker compose ps with docker ps -a.

Author: Ivan Franchin

README.adoc

@@ -87,7 +87,7 @@ docker compose up -d
 +
 [source]
 ----
-docker compose ps
+docker ps -a
 ----
 
 == Running Applications with Maven
@@ -146,7 +146,7 @@ Inside the `spring-cloud-stream-kafka-elasticsearch` root folder, run the follow
 +
 [source]
 ----
-./docker-build.sh
+./build-docker-images.sh
 ----
 
 === Application's Environment Variables

docker-build.sh build-docker-images.sh

@@ -23,7 +23,7 @@ public class NewsStream {
     private final CategoryService categoryService;
 
     @Bean
-    public Function<Message<NewsEvent>, Message<NewsEvent>> news() {
+    Function<Message<NewsEvent>, Message<NewsEvent>> news() {
         return message -> {
             NewsEvent newsEvent = message.getPayload();
             MessageHeaders messageHeaders = message.getHeaders();

categorizer-service/src/main/java/com/ivanfranchin/categorizerservice/bus/NewsStream.java

@@ -14,14 +14,14 @@
 public class SchemaRegistryConfig {
 
     @Bean
-    public SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.schema-registry-client.endpoint}") String endpoint) {
+    SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.schema-registry-client.endpoint}") String endpoint) {
         ConfluentSchemaRegistryClient client = new ConfluentSchemaRegistryClient();
         client.setEndpoint(endpoint);
         return client;
     }
 
     @Bean
-    public MessageConverter avroSchemaMessageConverter() {
+    MessageConverter avroSchemaMessageConverter() {
         return new AvroSchemaMessageConverter(MimeType.valueOf("application/*+avro"), new AvroSchemaServiceManagerImpl());
     }
 }

categorizer-service/src/main/java/com/ivanfranchin/categorizerservice/config/SchemaRegistryConfig.java

@@ -26,7 +26,7 @@ public class NewsStream {
     private final NewsMapper newsMapper;
 
     @Bean
-    public Function<Message<NewsEvent>, Message<NewsEvent>> news() {
+    Function<Message<NewsEvent>, Message<NewsEvent>> news() {
         return message -> {
             NewsEvent newsEvent = message.getPayload();
             MessageHeaders messageHeaders = message.getHeaders();

collector-service/src/main/java/com/ivanfranchin/collectorservice/bus/NewsStream.java

@@ -14,14 +14,14 @@
 public class SchemaRegistryConfig {
 
     @Bean
-    public SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.schema-registry-client.endpoint}") String endpoint) {
+    SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.schema-registry-client.endpoint}") String endpoint) {
         ConfluentSchemaRegistryClient client = new ConfluentSchemaRegistryClient();
         client.setEndpoint(endpoint);
         return client;
     }
 
     @Bean
-    public MessageConverter avroSchemaMessageConverter() {
+    MessageConverter avroSchemaMessageConverter() {
         return new AvroSchemaMessageConverter(MimeType.valueOf("application/*+avro"), new AvroSchemaServiceManagerImpl());
     }
 }

collector-service/src/main/java/com/ivanfranchin/collectorservice/config/SchemaRegistryConfig.java

@@ -24,7 +24,7 @@ public class NewsStream {
     private final SimpMessagingTemplate simpMessagingTemplate;
 
     @Bean
-    public Consumer<Message<NewsEvent>> news() {
+    Consumer<Message<NewsEvent>> news() {
         return message -> {
             NewsEvent newsEvent = message.getPayload();
             MessageHeaders messageHeaders = message.getHeaders();

news-client/src/main/java/com/ivanfranchin/newsclient/bus/NewsStream.java

@@ -14,14 +14,14 @@
 public class SchemaRegistryConfig {
 
     @Bean
-    public SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.schema-registry-client.endpoint}") String endpoint) {
+    SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.schema-registry-client.endpoint}") String endpoint) {
         ConfluentSchemaRegistryClient client = new ConfluentSchemaRegistryClient();
         client.setEndpoint(endpoint);
         return client;
     }
 
     @Bean
-    public MessageConverter avroSchemaMessageConverter() {
+    MessageConverter avroSchemaMessageConverter() {
         return new AvroSchemaMessageConverter(MimeType.valueOf("application/*+avro"), new AvroSchemaServiceManagerImpl());
     }
 }

news-client/src/main/java/com/ivanfranchin/newsclient/config/SchemaRegistryConfig.java

@@ -14,7 +14,7 @@
 public class ErrorAttributesConfig {
 
     @Bean
-    public ErrorAttributes errorAttributes() {
+    ErrorAttributes errorAttributes() {
         return new DefaultErrorAttributes() {
             @Override
             public Map<String, Object> getErrorAttributes(WebRequest webRequest, ErrorAttributeOptions options) {

producer-api/src/main/java/com/ivanfranchin/producerapi/config/ErrorAttributesConfig.java

@@ -14,14 +14,14 @@
 public class SchemaRegistryConfig {
 
     @Bean
-    public SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.schema-registry-client.endpoint}") String endpoint) {
+    SchemaRegistryClient schemaRegistryClient(@Value("${spring.cloud.schema-registry-client.endpoint}") String endpoint) {
         ConfluentSchemaRegistryClient client = new ConfluentSchemaRegistryClient();
         client.setEndpoint(endpoint);
         return client;
     }
 
     @Bean
-    public MessageConverter avroSchemaMessageConverter() {
+    MessageConverter avroSchemaMessageConverter() {
         return new AvroSchemaMessageConverter(MimeType.valueOf("application/*+avro"), new AvroSchemaServiceManagerImpl());
     }
 }

producer-api/src/main/java/com/ivanfranchin/producerapi/config/SchemaRegistryConfig.java

@@ -15,17 +15,17 @@ public class SwaggerConfig {
     private String applicationName;
 
     @Bean
-    public OpenAPI customOpenAPI() {
+    OpenAPI customOpenAPI() {
         return new OpenAPI().components(new Components()).info(new Info().title(applicationName));
     }
 
     @Bean
-    public GroupedOpenApi customApi() {
+    GroupedOpenApi customApi() {
         return GroupedOpenApi.builder().group("api").pathsToMatch("/api/**").build();
     }
 
     @Bean
-    public GroupedOpenApi actuatorApi() {
+    GroupedOpenApi actuatorApi() {
         return GroupedOpenApi.builder().group("actuator").pathsToMatch("/actuator/**").build();
     }
 }

producer-api/src/main/java/com/ivanfranchin/producerapi/config/SwaggerConfig.java

@@ -14,7 +14,7 @@
 public class ErrorAttributesConfig {
 
     @Bean
-    public ErrorAttributes errorAttributes() {
+    ErrorAttributes errorAttributes() {
         return new DefaultErrorAttributes() {
             @Override
             public Map<String, Object> getErrorAttributes(WebRequest webRequest, ErrorAttributeOptions options) {

publisher-api/src/main/java/com/ivanfranchin/publisherapi/config/ErrorAttributesConfig.java

@@ -15,17 +15,17 @@ public class SwaggerConfig {
     private String applicationName;
 
     @Bean
-    public OpenAPI customOpenAPI() {
+    OpenAPI customOpenAPI() {
         return new OpenAPI().components(new Components()).info(new Info().title(applicationName));
     }
 
     @Bean
-    public GroupedOpenApi customApi() {
+    GroupedOpenApi customApi() {
         return GroupedOpenApi.builder().group("api").pathsToMatch("/api/**").build();
     }
 
     @Bean
-    public GroupedOpenApi actuatorApi() {
+    GroupedOpenApi actuatorApi() {
         return GroupedOpenApi.builder().group("actuator").pathsToMatch("/actuator/**").build();
     }
 }