diff --git a/build.gradle.kts b/build.gradle
similarity index 65%
rename from build.gradle.kts
rename to build.gradle
index 8815cfb..1868edd 100644
--- a/build.gradle.kts
+++ b/build.gradle
@@ -1,46 +1,32 @@
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.4.10"
-    id("org.jetbrains.kotlin.kapt") version "1.4.10"
-    id("org.jetbrains.kotlin.plugin.allopen") version "1.4.10"
-    id("org.jetbrains.kotlin.plugin.noarg") version "1.4.10"
-    id("com.github.johnrengelman.shadow") version "6.1.0"
-    id("io.micronaut.application") version "1.2.0"
+    id("org.jetbrains.kotlin.jvm") version "${kotlinVersion}"
+    id("org.jetbrains.kotlin.kapt") version "${kotlinVersion}"
+    id("org.jetbrains.kotlin.plugin.allopen") version "${kotlinVersion}"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("io.micronaut.application") version "3.4.1"
 }
 
 version = "0.1"
 group = "com.codersee"
 
-val kotlinVersion=project.properties.get("kotlinVersion")
 repositories {
     mavenCentral()
-    jcenter()
-}
-
-micronaut {
-    runtime("netty")
-    testRuntime("junit5")
-    processing {
-        incremental(true)
-        annotations("com.codersee.*")
-    }
 }
 
 dependencies {
-    implementation("io.micronaut:micronaut-validation")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
-    implementation("io.micronaut.kotlin:micronaut-kotlin-runtime")
-    implementation("io.micronaut:micronaut-runtime")
+    kapt("io.micronaut:micronaut-http-validation")
     implementation("io.micronaut:micronaut-http-client")
+    implementation("io.micronaut:micronaut-jackson-databind")
+    implementation("io.micronaut.kotlin:micronaut-kotlin-runtime")
     implementation("io.micronaut.mongodb:micronaut-mongo-sync")
-    implementation("org.jetbrains.kotlin:kotlin-noarg:1.4.21")
-
+    implementation("jakarta.annotation:jakarta.annotation-api")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
     runtimeOnly("ch.qos.logback:logback-classic")
+    implementation("io.micronaut:micronaut-validation")
+
     runtimeOnly("com.fasterxml.jackson.module:jackson-module-kotlin")
-}
 
-noArg {
-    annotation("com.codersee.annotation.NoArg")
 }
 
 application {
@@ -64,3 +50,13 @@ tasks {
     }
 }
 
+graalvmNative.toolchainDetection = false
+
+micronaut {
+    runtime("netty")
+    testRuntime("junit5")
+    processing {
+        incremental(true)
+        annotations("com.codersee.*")
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index 18458c2..bbad27e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-micronautVersion=2.2.1
-kotlinVersion=1.4.10
+micronautVersion=3.5.2
+kotlinVersion=1.7.10
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c05..41d9927 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be52383..aa991fc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
old mode 100755
new mode 100644
index 5093609..107acd3
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/main/kotlin/com/codersee/annotation/NoArg.kt b/src/main/kotlin/com/codersee/annotation/NoArg.kt
deleted file mode 100644
index c085ed1..0000000
--- a/src/main/kotlin/com/codersee/annotation/NoArg.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.codersee.annotation
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-annotation class NoArg
diff --git a/src/main/kotlin/com/codersee/exception/NotFoundExceptionHandler.kt b/src/main/kotlin/com/codersee/exception/NotFoundExceptionHandler.kt
index 329848d..742cc5d 100644
--- a/src/main/kotlin/com/codersee/exception/NotFoundExceptionHandler.kt
+++ b/src/main/kotlin/com/codersee/exception/NotFoundExceptionHandler.kt
@@ -5,7 +5,7 @@ import io.micronaut.http.HttpRequest
 import io.micronaut.http.HttpResponse
 import io.micronaut.http.annotation.Produces
 import io.micronaut.http.server.exceptions.ExceptionHandler
-import javax.inject.Singleton
+import jakarta.inject.Singleton
 
 @Produces
 @Singleton
diff --git a/src/main/kotlin/com/codersee/model/Company.kt b/src/main/kotlin/com/codersee/model/Company.kt
index 8769b0b..2f5a544 100644
--- a/src/main/kotlin/com/codersee/model/Company.kt
+++ b/src/main/kotlin/com/codersee/model/Company.kt
@@ -1,11 +1,14 @@
 package com.codersee.model
 
-import com.codersee.annotation.NoArg
+import io.micronaut.core.annotation.Creator
+import io.micronaut.core.annotation.Introspected
+import org.bson.codecs.pojo.annotations.BsonCreator
+import org.bson.codecs.pojo.annotations.BsonProperty
 import org.bson.types.ObjectId
 
-@NoArg
-data class Company(
-    var id: ObjectId? = null,
-    var name: String,
-    var address: String
+@Introspected
+data class Company @Creator @BsonCreator constructor(
+    @field:BsonProperty("_id") @param:BsonProperty("_id") var id: ObjectId? = null,
+    @field:BsonProperty("name") @param:BsonProperty("name") var name: String,
+    @field:BsonProperty("address") @param:BsonProperty("address") var address: String
 )
\ No newline at end of file
diff --git a/src/main/kotlin/com/codersee/model/Employee.kt b/src/main/kotlin/com/codersee/model/Employee.kt
index f4da5bb..a0ecf4f 100644
--- a/src/main/kotlin/com/codersee/model/Employee.kt
+++ b/src/main/kotlin/com/codersee/model/Employee.kt
@@ -1,13 +1,14 @@
 package com.codersee.model
 
-import com.codersee.annotation.NoArg
+import io.micronaut.core.annotation.Introspected
+import org.bson.codecs.pojo.annotations.BsonProperty
 import org.bson.types.ObjectId
 
-@NoArg
+@Introspected
 data class Employee(
-    var id: ObjectId? = null,
-    var firstName: String,
-    var lastName: String,
-    var email: String,
-    var company: Company?,
+    @field:BsonProperty("_id") @param:BsonProperty("_id") var id: ObjectId? = null,
+    @field:BsonProperty("firstName") @param:BsonProperty("firstName") var firstName: String,
+    @field:BsonProperty("lastName") @param:BsonProperty("lastName") var lastName: String,
+    @field:BsonProperty("email") @param:BsonProperty("email") var email: String,
+    @field:BsonProperty("company") @param:BsonProperty("company") var company: Company?,
 )
\ No newline at end of file
diff --git a/src/main/kotlin/com/codersee/repository/CompanyRepository.kt b/src/main/kotlin/com/codersee/repository/CompanyRepository.kt
index c1524e4..f8f1f67 100644
--- a/src/main/kotlin/com/codersee/repository/CompanyRepository.kt
+++ b/src/main/kotlin/com/codersee/repository/CompanyRepository.kt
@@ -7,7 +7,7 @@ import com.mongodb.client.result.DeleteResult
 import com.mongodb.client.result.InsertOneResult
 import com.mongodb.client.result.UpdateResult
 import org.bson.types.ObjectId
-import javax.inject.Singleton
+import jakarta.inject.Singleton
 
 @Singleton
 class CompanyRepository(
diff --git a/src/main/kotlin/com/codersee/repository/EmployeeRepository.kt b/src/main/kotlin/com/codersee/repository/EmployeeRepository.kt
index 4c09374..0d7da5c 100644
--- a/src/main/kotlin/com/codersee/repository/EmployeeRepository.kt
+++ b/src/main/kotlin/com/codersee/repository/EmployeeRepository.kt
@@ -6,8 +6,8 @@ import com.mongodb.client.model.Filters
 import com.mongodb.client.result.DeleteResult
 import com.mongodb.client.result.InsertOneResult
 import com.mongodb.client.result.UpdateResult
+import jakarta.inject.Singleton
 import org.bson.types.ObjectId
-import javax.inject.Singleton
 
 @Singleton
 class EmployeeRepository(
diff --git a/src/main/kotlin/com/codersee/service/CompanyService.kt b/src/main/kotlin/com/codersee/service/CompanyService.kt
index dce65ec..b5c7c88 100644
--- a/src/main/kotlin/com/codersee/service/CompanyService.kt
+++ b/src/main/kotlin/com/codersee/service/CompanyService.kt
@@ -6,7 +6,7 @@ import com.codersee.repository.CompanyRepository
 import com.codersee.repository.EmployeeRepository
 import com.codersee.request.CompanyRequest
 import org.bson.BsonValue
-import javax.inject.Singleton
+import jakarta.inject.Singleton
 
 @Singleton
 class CompanyService(
diff --git a/src/main/kotlin/com/codersee/service/EmployeeService.kt b/src/main/kotlin/com/codersee/service/EmployeeService.kt
index f0c9a51..b4cd92c 100644
--- a/src/main/kotlin/com/codersee/service/EmployeeService.kt
+++ b/src/main/kotlin/com/codersee/service/EmployeeService.kt
@@ -4,8 +4,8 @@ import com.codersee.exception.NotFoundException
 import com.codersee.model.Employee
 import com.codersee.repository.EmployeeRepository
 import com.codersee.request.EmployeeRequest
+import jakarta.inject.Singleton
 import org.bson.BsonValue
-import javax.inject.Singleton
 
 @Singleton
 class EmployeeService(
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7a426b4..460eee0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,13 @@
 micronaut:
   application:
     name: example
+#  Uncomment to see HTTP client traffic in unit testing
+#  http:
+#    client:
+#      logger-name: traceLogger
 mongodb:
   uri: 'mongodb://localhost:27017/test'
+netty:
+  default:
+    allocator:
+      max-order: 3
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 6010eb5..c223130 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -9,6 +9,8 @@
         </encoder>
     </appender>
 
+    <logger name="traceLogger" level="TRACE"/>
+
     <root level="info">
         <appender-ref ref="STDOUT" />
     </root>
diff --git a/src/test/kotlin/com/codersee/CompanyClient.kt b/src/test/kotlin/com/codersee/CompanyClient.kt
new file mode 100644
index 0000000..dffb5f7
--- /dev/null
+++ b/src/test/kotlin/com/codersee/CompanyClient.kt
@@ -0,0 +1,29 @@
+package com.codersee
+
+import com.codersee.request.CompanyRequest
+import com.codersee.response.CompanyResponse
+import io.micronaut.http.HttpResponse
+import io.micronaut.http.annotation.*
+import io.micronaut.http.client.annotation.Client
+
+@Client("/api/company")
+interface CompanyClient {
+
+    @Post
+    fun create(name: String, address: String): HttpResponse<Void>
+
+    @Get
+    fun findAll(): List<CompanyResponse>
+
+    @Get("/{id}")
+    fun findById(@RequestAttribute id: String): HttpResponse<CompanyResponse>
+
+    @Put("/{id}")
+    fun update(
+        @RequestAttribute id: String,
+        @Body request: CompanyRequest
+    ) : HttpResponse<CompanyResponse>
+
+    @Delete("/{id}")
+    fun deleteById(@RequestAttribute id: String): HttpResponse<Void>
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/codersee/CompanyControllerTest.kt b/src/test/kotlin/com/codersee/CompanyControllerTest.kt
new file mode 100644
index 0000000..63fbed8
--- /dev/null
+++ b/src/test/kotlin/com/codersee/CompanyControllerTest.kt
@@ -0,0 +1,60 @@
+package com.codersee
+
+import com.codersee.request.CompanyRequest
+import com.codersee.response.CompanyResponse
+import io.micronaut.http.HttpResponse
+import io.micronaut.http.HttpStatus.*
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+
+@MicronautTest
+class CompanyControllerTest {
+
+    @Test
+    fun companyEndpoint(companyClient: CompanyClient) {
+
+        var companies = companyClient.findAll()
+        assertTrue(companies.isEmpty())
+
+        var response = companyClient.create("Company 1", "Address 1")
+        assertEquals(CREATED, response.status)
+        assertNotNull(CREATED, response.header("location"))
+        assertEquals(24, response.header("location")?.length) // DB _id, string of 24 hexadecimal characters
+
+        companies = companyClient.findAll()
+        assertFalse(companies.isEmpty())
+        assertEquals("Company 1", companies[0].name)
+        assertEquals("Address 1", companies[0].address)
+
+        response = companyClient.create("Company 2", "Address 2")
+        assertEquals(CREATED, response.status())
+        assertNotNull(CREATED, response.header("location"))
+        assertEquals(24, response.header("location")?.length) // DB _id, string of 24 hexadecimal characters
+
+        companies = companyClient.findAll()
+        assertEquals(2, companies.size)
+        assertTrue(companies.any { companyResponse -> companyResponse.name == "Company 2" })
+
+        val companyId = companies[0].id
+        val otherCompanyId = companies[1].id
+        response = companyClient.deleteById(companyId)
+        assertEquals(NO_CONTENT, response.status)
+        companies = companyClient.findAll()
+        assertEquals(1, companies.size)
+
+        var companyResponse: HttpResponse<CompanyResponse> =
+            companyClient.update(otherCompanyId, CompanyRequest("Updated Company 2", "Update Address 2"))
+        assertEquals(OK, companyResponse.status)
+        assertEquals("Updated Company 2", companyResponse.body.get().name)
+
+        companyResponse = companyClient.findById(otherCompanyId)
+        assertEquals(OK, companyResponse.status)
+        assertEquals("Updated Company 2", companyResponse.body.get().name)
+
+        response = companyClient.deleteById(otherCompanyId)
+        assertEquals(NO_CONTENT, response.status)
+        companies = companyClient.findAll()
+        assertTrue(companies.isEmpty())
+    }
+}
\ No newline at end of file
diff --git a/src/test/kotlin/com/codersee/ExampleTest.kt b/src/test/kotlin/com/codersee/ExampleTest.kt
index c900097..923328e 100644
--- a/src/test/kotlin/com/codersee/ExampleTest.kt
+++ b/src/test/kotlin/com/codersee/ExampleTest.kt
@@ -3,7 +3,7 @@ import io.micronaut.runtime.EmbeddedApplication
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 @MicronautTest
 class ExampleTest {