fix merge issue; refactoring

spring-mvc-java/src/main/java/com/baeldung/model/Greeting.java

@@ -0,0 +1,22 @@
+package com.baeldung.model;
+
+public class Greeting {
+    private int id;
+    private String message;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}