Update dependencies, fix log4j (#135)

* Typos and dependencies

* Update cucumber.version to v6.11.0 (#129)

Co-authored-by: Renovate Bot <[email protected]>

* Update dependency org.projectlombok:lombok to v1.18.22 (#128)

Co-authored-by: Renovate Bot <[email protected]>

* Update dependency org.springdoc:springdoc-openapi-ui to v1.5.11 (#127)

Co-authored-by: Renovate Bot <[email protected]>

* Update dependency org.jetbrains:annotations to v21.0.1 (#120)

Co-authored-by: Renovate Bot <[email protected]>

* Update mockito monorepo to v3.12.4 (#132)

Co-authored-by: Renovate Bot <[email protected]>

* Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.9.1.2184 (#131)

Co-authored-by: Renovate Bot <[email protected]>

* Update dependency org.springframework.security:spring-security-crypto to v5.6.0 (#126)

Co-authored-by: Renovate Bot <[email protected]>

* Bumped up version

* Update dependency org.springdoc:springdoc-openapi-ui to v1.5.13 (#133)

Co-authored-by: Renovate Bot <[email protected]>
Co-authored-by: Open Schnick <[email protected]>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renovate Bot <[email protected]>

Author: 3 people

pom.xml

@@ -10,13 +10,13 @@
     </parent>
     <groupId>de.filefighter</groupId>
     <artifactId>rest</artifactId>
-    <version>0.1.2</version>
+    <version>0.1.3</version>
     <name>RestApi</name>
     <description>RestApi for FileFighter</description>
 
     <properties>
         <java.version>11</java.version>
-        <cucumber.version>6.10.4</cucumber.version>
+        <cucumber.version>6.11.0</cucumber.version>
         <sonar.coverage.exclusions>**/data/**/*.java,**/configuration/*.java,**/exceptions/*.java
         </sonar.coverage.exclusions>
     </properties>
@@ -48,20 +48,20 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-crypto</artifactId>
-            <version>5.4.6</version>
+            <version>5.6.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
+            <version>1.18.22</version>
         </dependency>
 
         <!-- For Docs -->
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.5.9</version>
+            <version>1.5.13</version>
         </dependency>
 
         <!-- running script plugin -->
@@ -71,6 +71,14 @@
             <version>3.0.0</version>
         </dependency>
 
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>2.15.0</version>
+            <type>pom</type>
+        </dependency>
+
         <!-- Needed for integration test. -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -86,17 +94,17 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.10.0</version>
+            <version>3.12.4</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
-            <version>3.10.0</version>
+            <version>3.12.4</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>21.0.0</version>
+            <version>21.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -134,11 +142,8 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- TESTING -->
-
     </dependencies>
 
-
     <build>
         <plugins>
             <plugin>
@@ -175,7 +180,7 @@
             <plugin>
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.9.0.2155</version>
+                <version>3.9.1.2184</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

src/main/java/de/filefighter/rest/domain/common/InputSanitizerService.java

@@ -21,7 +21,7 @@ public static boolean stringIsValid(String s) {
     /**
      * Sanitizes a String, so it can be used.
      *
-     * @param string String that needs to be sanitized.
+     * @param string String that needs to cbe sanitized.
      * @return string without whitespaces and without illegal characters.
      * @throws RequestDidntMeetFormalRequirementsException when string was empty.
      */

src/main/java/de/filefighter/rest/domain/filesystem/business/FileSystemBusinessService.java

@@ -156,11 +156,11 @@ public List<FileSystemItem> deleteFileSystemItemById(long fsItemId, User authent
         log.info("User is {}.", authenticatedUser);
 
         ArrayList<FileSystemItem> returnList = new ArrayList<>();
-        recursivlyDeleteFileSystemEntity(parentEntity, authenticatedUser, returnList);
+        recursivelyDeleteFileSystemEntity(parentEntity, authenticatedUser, returnList);
         return returnList;
     }
 
-    private Pair<Boolean, Boolean> recursivlyDeleteFileSystemEntity(FileSystemEntity parentEntity, User authenticatedUser, ArrayList<FileSystemItem> returnList) {
+    private Pair<Boolean, Boolean> recursivelyDeleteFileSystemEntity(FileSystemEntity parentEntity, User authenticatedUser, ArrayList<FileSystemItem> returnList) {
         boolean foundNonDeletable = false;
         boolean foundInvisible = false;
 
@@ -175,7 +175,7 @@ private Pair<Boolean, Boolean> recursivlyDeleteFileSystemEntity(FileSystemEntity
                 for (FileSystemEntity item : items) {
                     if (fileSystemHelperService.userIsAllowedToInteractWithFileSystemEntity(item, authenticatedUser, InteractionType.READ)) {
                         if (fileSystemHelperService.userIsAllowedToInteractWithFileSystemEntity(item, authenticatedUser, InteractionType.DELETE)) {
-                            Pair<Boolean, Boolean> recursiveReturn = recursivlyDeleteFileSystemEntity(item, authenticatedUser, returnList);
+                            Pair<Boolean, Boolean> recursiveReturn = recursivelyDeleteFileSystemEntity(item, authenticatedUser, returnList);
                             foundInvisible = recursiveReturn.getFirst() || foundInvisible;
                             foundNonDeletable = recursiveReturn.getSecond() || foundNonDeletable;
                         } else {
@@ -201,7 +201,7 @@ private Pair<Boolean, Boolean> recursivlyDeleteFileSystemEntity(FileSystemEntity
                     returnList.add(fileSystemHelperService.createDTO(parentEntity, authenticatedUser, null));
                 } else {
                     // else some files are left. invisible or not. but the entity cannot be deleted.
-                    log.info("Some visible entites could not be deleted but are visible.");
+                    log.info("Some visible entities could not be deleted but are visible.");
                 }
             } else {
                 fileSystemHelperService.deleteAndUnbindFileSystemEntity(parentEntity);

src/main/java/de/filefighter/rest/domain/filesystem/business/FileSystemHelperService.java

@@ -128,7 +128,6 @@ public List<FileSystemEntity> getFolderContentsOfEntityAndPermissions(FileSystem
         return fileSystemEntities;
     }
 
-    @SuppressWarnings("java:S3776")
     public boolean userIsAllowedToInteractWithFileSystemEntity(FileSystemEntity fileSystemEntity, User authenticatedUser, InteractionType interaction) {
         // file was created by runtime user.
         if ((interaction == InteractionType.DELETE)

src/main/resources/application.properties

@@ -16,6 +16,6 @@ spring.data.mongodb.host=localhost
 spring.data.mongodb.port=20000
 spring.data.mongodb.auto-index-creation=true
 #------------------- Custom -----------------------
-filefighter.version=0.1.2
-filefighter.date=27.05.2021
+filefighter.version=0.1.3
+filefighter.date=23.12.2021
 filefighter.disable-password-check=false