diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java
index b186d6f36..001c8f4e5 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java
@@ -63,8 +63,8 @@ public final class DsMetadataCompositeKey implements Serializable {
     }
 
     @Override
-    public boolean equals(final Object obj) { // NOSONAR - as this is generated
-                                              // code
+    public boolean equals(final Object obj) {
+
         if (this == obj) {
             return true;
         }
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java
index 90637245f..fa2196835 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java
@@ -79,8 +79,8 @@ public final class SwMetadataCompositeKey implements Serializable {
     }
 
     @Override
-    public boolean equals(final Object obj) { // NOSONAR - as this is generated
-                                              // code
+    public boolean equals(final Object obj) {
+
         if (this == obj) {
             return true;
         }
diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/SortDirection.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/SortDirection.java
index 72527d0c4..3194011f7 100644
--- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/SortDirection.java
+++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/SortDirection.java
@@ -35,7 +35,7 @@ public enum SortDirection {
     public static SortDirection getByName(final String name) {
         try {
             return valueOf(name.toUpperCase());
-        } catch (final IllegalArgumentException ex) {// NOSONAR
+        } catch (final IllegalArgumentException ex) {
             throw new SortParameterUnsupportedDirectionException();
         }
     }
diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/HeaderAuthentication.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/HeaderAuthentication.java
index ca840c689..e7e82f74a 100644
--- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/HeaderAuthentication.java
+++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/HeaderAuthentication.java
@@ -26,7 +26,7 @@ public final class HeaderAuthentication {
     }
 
     @Override
-    public int hashCode() {// NOSONAR - as this is generated
+    public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((controllerId == null) ? 0 : controllerId.hashCode());
@@ -35,7 +35,7 @@ public final class HeaderAuthentication {
     }
 
     @Override
-    public boolean equals(final Object obj) {// NOSONAR - as this is generated
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/entity/SoftwareModuleIdName.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/entity/SoftwareModuleIdName.java
index 2c8ee42d9..07c2dd155 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/entity/SoftwareModuleIdName.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/entity/SoftwareModuleIdName.java
@@ -61,7 +61,7 @@ public class SoftwareModuleIdName implements Serializable {
     }
 
     @Override
-    public int hashCode() {// NOSONAR - as this is generated
+    public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + (id == null ? 0 : id.hashCode());
@@ -69,7 +69,7 @@ public class SoftwareModuleIdName implements Serializable {
     }
 
     @Override
-    public boolean equals(final Object obj) {// NOSONAR - as this is generated
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }