diff --git a/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/CustomWebMvcConfigurationSupport.java b/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable.dottruncated/CustomWebMvcConfigurationSupport.java
similarity index 92%
rename from spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/CustomWebMvcConfigurationSupport.java
rename to spring-mvc-java-2/src/main/java/com/baeldung/pathvariable.dottruncated/CustomWebMvcConfigurationSupport.java
index 12c208c623..24d5a447ab 100644
--- a/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/CustomWebMvcConfigurationSupport.java
+++ b/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable.dottruncated/CustomWebMvcConfigurationSupport.java
@@ -1,4 +1,4 @@
-package com.baeldung.pathvariable;
+package com.baeldung.pathvariable.dottruncated;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
diff --git a/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/SiteController.java b/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable.dottruncated/SiteController.java
similarity index 96%
rename from spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/SiteController.java
rename to spring-mvc-java-2/src/main/java/com/baeldung/pathvariable.dottruncated/SiteController.java
index 493161b0eb..c9584afdc9 100644
--- a/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/SiteController.java
+++ b/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable.dottruncated/SiteController.java
@@ -1,4 +1,4 @@
-package com.baeldung.pathvariable;
+package com.baeldung.pathvariable.dottruncated;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/PathVariableAnnotationController.java b/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/PathVariableAnnotationController.java
new file mode 100644
index 0000000000..0cbd852095
--- /dev/null
+++ b/spring-mvc-java-2/src/main/java/com/baeldung/pathvariable/PathVariableAnnotationController.java
@@ -0,0 +1,89 @@
+package com.baeldung.pathvariable;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+import java.util.Optional;
+
+@RestController
+public class PathVariableAnnotationController {
+    @GetMapping("/api/employees/{id}")
+    @ResponseBody
+    public String getEmployeesById(@PathVariable String id) {
+        return "ID: " + id;
+    }
+
+    @GetMapping("/api/employeeswithvariable/{id}")
+    @ResponseBody
+    public String getEmployeesByIdWithVariableName(@PathVariable("id") String employeeId) {
+        return "ID: " + employeeId;
+    }
+
+    @GetMapping("/api/employees/{id}/{name}")
+    @ResponseBody
+    public String getEmployeesByIdAndName(@PathVariable String id, @PathVariable String name) {
+        return "ID: " + id + ", name: " + name;
+    }
+
+    @GetMapping("/api/employeeswithmapvariable/{id}/{name}")
+    @ResponseBody
+    public String getEmployeesByIdAndNameWithMapVariable(@PathVariable Map<String, String> pathVarsMap) {
+        String id = pathVarsMap.get("id");
+        String name = pathVarsMap.get("name");
+        if (id != null && name != null) {
+            return "ID: " + id + ", name: " + name;
+        } else {
+            return "Missing Parameters";
+        }
+    }
+
+    @GetMapping(value = { "/api/employeeswithrequired", "/api/employeeswithrequired/{id}" })
+    @ResponseBody
+    public String getEmployeesByIdWithRequired(@PathVariable String id) {
+        return "ID: " + id;
+    }
+
+    @GetMapping(value = { "/api/employeeswithrequiredfalse", "/api/employeeswithrequiredfalse/{id}" })
+    @ResponseBody
+    public String getEmployeesByIdWithRequiredFalse(@PathVariable(required = false) String id) {
+        if (id != null) {
+            return "ID: " + id;
+        } else {
+            return "ID missing";
+        }
+    }
+
+    @GetMapping(value = { "/api/employeeswithoptional", "/api/employeeswithoptional/{id}" })
+    @ResponseBody
+    public String getEmployeesByIdWithOptional(@PathVariable Optional<String> id) {
+        if (id.isPresent()) {
+            return "ID: " + id.get();
+        } else {
+            return "ID missing";
+        }
+    }
+
+    @GetMapping(value = { "/api/defaultemployeeswithoptional", "/api/defaultemployeeswithoptional/{id}" })
+    @ResponseBody
+    public String getDefaultEmployeesByIdWithOptional(@PathVariable Optional<String> id) {
+        if (id.isPresent()) {
+            return "ID: " + id.get();
+        } else {
+            return "ID: Default Employee";
+        }
+    }
+
+    @GetMapping(value = { "/api/employeeswithmap/{id}", "/api/employeeswithmap" })
+    @ResponseBody
+    public String getEmployeesByIdWithMap(@PathVariable Map<String, String> pathVarsMap) {
+        String id = pathVarsMap.get("id");
+        if (id != null) {
+            return "ID: " + id;
+        } else {
+            return "ID missing";
+        }
+    }
+}