Fix checkstyle warnings in netconf simulator

Issue-ID: INT-1517
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I518c4863563217db746ccb5082aef7727a175bc7

4 files changed, 17 insertions, 17 deletions

diff --git a/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/MessageDTO.java b/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/Message.java
index 4311cd6..9a7debc 100644
--- a/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/MessageDTO.java
+++ b/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/Message.java
@@ -25,7 +25,7 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-class MessageDTO {
+class Message {
     private long timestamp;
     private String configuration;
 }
diff --git a/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/StoreController.java b/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/StoreController.java
index 2a196d9..d4414ee 100644
--- a/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/StoreController.java
+++ b/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/StoreController.java
@@ -47,12 +47,12 @@ public class StoreController {
     }
 
     @GetMapping("cm-history")
-    public List<MessageDTO> getAllConfigurationChanges() {
+    public List<Message> getAllConfigurationChanges() {
         return service.getAllMessages();
     }
 
     @GetMapping("/less")
-    public List<MessageDTO> less(@RequestParam(value = "offset", required = false, defaultValue = "${spring.kafka.default-offset}") long offset) {
+    public List<Message> less(@RequestParam(value = "offset", required = false, defaultValue = "${spring.kafka.default-offset}") long offset) {
         return service.getLastMessages(offset);
     }
 
diff --git a/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/StoreService.java b/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/StoreService.java
index 5fddff5..1b99220 100644
--- a/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/StoreService.java
+++ b/netconfsimulator/src/main/java/org/onap/netconfsimulator/kafka/StoreService.java
@@ -7,9 +7,9 @@
  * 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.
@@ -48,33 +48,33 @@ public class StoreService {
         this.consumerFactory = consumerFactory;
     }
 
-    List<MessageDTO> getAllMessages() {
-        List<MessageDTO> messages = new ArrayList<>();
-        String clientID = Long.toString(Instant.now().getEpochSecond());
-        try (Consumer<String, String> consumer = consumerFactory.createConsumer(clientID, clientID)) {
+    List<Message> getAllMessages() {
+        List<Message> messages = new ArrayList<>();
+        String clientId = Long.toString(Instant.now().getEpochSecond());
+        try (Consumer<String, String> consumer = consumerFactory.createConsumer(clientId, clientId)) {
             consumer.subscribe(TOPICS_TO_SUBSCRIBE);
             ConsumerRecords<String, String> consumerRecords = consumer.poll(CONSUMING_DURATION_IN_MS);
             consumerRecords.forEach(
                 consumerRecord ->
-                    messages.add(new MessageDTO(consumerRecord.timestamp(), consumerRecord.value())));
+                    messages.add(new Message(consumerRecord.timestamp(), consumerRecord.value())));
             log.debug(String.format("consumed %d messages", consumerRecords.count()));
-            }
+        }
         return messages;
     }
 
-    List<MessageDTO> getLastMessages(long offset) {
-        List<MessageDTO> messages = new ArrayList<>();
+    List<Message> getLastMessages(long offset) {
+        List<Message> messages = new ArrayList<>();
         try (Consumer<String, String> consumer = createConsumer(offset)) {
             ConsumerRecords<String, String> consumerRecords = consumer.poll(CONSUMING_DURATION_IN_MS);
             consumerRecords.forEach(consumerRecord ->
-                    messages.add(new MessageDTO(consumerRecord.timestamp(), consumerRecord.value())));
+                messages.add(new Message(consumerRecord.timestamp(), consumerRecord.value())));
         }
         return messages;
     }
 
     private Consumer<String, String> createConsumer(long offsetFromLastIndex) {
-        String clientID = Long.toString(Instant.now().getEpochSecond());
-        Consumer<String, String> consumer = consumerFactory.createConsumer(clientID, clientID);
+        String clientId = Long.toString(Instant.now().getEpochSecond());
+        Consumer<String, String> consumer = consumerFactory.createConsumer(clientId, clientId);
         consumer.subscribe(TOPICS_TO_SUBSCRIBE);
         seekConsumerTo(consumer, offsetFromLastIndex);
         return consumer;
diff --git a/netconfsimulator/src/main/java/org/onap/netconfsimulator/netconfcore/configuration/NetconfConfigurationTO.java b/netconfsimulator/src/main/java/org/onap/netconfsimulator/netconfcore/configuration/NetconfConfiguration.java
index e43ff69..51f31ae 100644
--- a/netconfsimulator/src/main/java/org/onap/netconfsimulator/netconfcore/configuration/NetconfConfigurationTO.java
+++ b/netconfsimulator/src/main/java/org/onap/netconfsimulator/netconfcore/configuration/NetconfConfiguration.java
@@ -25,7 +25,7 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public class NetconfConfigurationTO {
+public class NetconfConfiguration {
 
     private String configuration;