SEBSERV-730 Removed sticky ContentType for HTTP GET methods

Author: anhefti

pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.2</version>
+        <version>3.5.3</version>
     </parent>
 
     <packaging>jar</packaging>
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>10.17.3</version>
+<!--            <version>10.17.3</version>-->
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>

src/main/java/ch/ethz/seb/sps/server/CacheConfig.java

@@ -22,7 +22,6 @@
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.cache.jcache.JCacheCacheManager;
-import org.springframework.cache.jcache.config.JCacheConfigurerSupport;
 import org.springframework.cache.support.CompositeCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/ch/ethz/seb/sps/server/weblayer/ActivatableEntityController.java

@@ -58,8 +58,6 @@ public ActivatableEntityController(
                     descending sort order. Note that not all entity-model attribute are suited for sorting while the most
                     are.
                     """,
-            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
-                    content = { @Content(mediaType = MediaType.APPLICATION_FORM_URLENCODED_VALUE) }),
             parameters = {
                     @Parameter(
                             name = Page.ATTR_PAGE_NUMBER,
@@ -74,7 +72,6 @@ public ActivatableEntityController(
     @RequestMapping(
             path = API.ACTIVE_PATH_SEGMENT,
             method = RequestMethod.GET,
-            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public Page<T> allActive(
             @RequestParam(name = Page.ATTR_PAGE_NUMBER, required = false) final Integer pageNumber,
@@ -101,8 +98,6 @@ public Page<T> allActive(
                     descending sort order. Note that not all entity-model attribute are suited for sorting while the most
                     are.
                     """,
-            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
-                    content = { @Content(mediaType = MediaType.APPLICATION_FORM_URLENCODED_VALUE) }),
             parameters = {
                     @Parameter(
                             name = Page.ATTR_PAGE_NUMBER,
@@ -118,7 +113,6 @@ public Page<T> allActive(
     @RequestMapping(
             path = API.INACTIVE_PATH_SEGMENT,
             method = RequestMethod.GET,
-            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public Page<T> allInactive(
             @RequestParam(name = Page.ATTR_PAGE_NUMBER, required = false) final Integer pageNumber,

src/main/java/ch/ethz/seb/sps/server/weblayer/AdminProctorController.java

@@ -124,8 +124,6 @@ protected EntityController(
                     and are of the form [domain-attribute-name]=[filter-value]. E.g.: name=abc. Usually
                     filter attributes of text type are treated as SQL wildcard with %[text]% to filter all text containing
                     a given text-snippet.""",
-            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
-                    content = { @Content(mediaType = MediaType.APPLICATION_FORM_URLENCODED_VALUE) }),
             parameters = {
                     @Parameter(
                             name = Page.ATTR_PAGE_NUMBER,
@@ -144,7 +142,6 @@ protected EntityController(
             })
     @RequestMapping(
             method = RequestMethod.GET,
-            //consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public Page<T> getPage(
             @RequestParam(name = Page.ATTR_PAGE_NUMBER, required = false) final Integer pageNumber,
@@ -179,8 +176,6 @@ public Page<T> getPage(
                     and are of the form [domain-attribute-name]=[filter-value]. E.g.: name=abc or. Usually
                     filter attributes of text type are treated as SQL wildcard with %[text]% to filter all text containing
                     a given text-snippet.""",
-            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
-                    content = { @Content(mediaType = MediaType.APPLICATION_FORM_URLENCODED_VALUE) }),
             parameters = {
                     @Parameter(
                             name = "allRequestParams",
@@ -191,7 +186,6 @@ public Page<T> getPage(
     @RequestMapping(
             path = API.NAMES_PATH_SEGMENT,
             method = RequestMethod.GET,
-            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public Collection<EntityName> getNames(
             @RequestParam(required = false) final MultiValueMap<String, String> allRequestParams,
@@ -214,8 +208,6 @@ public Collection<EntityName> getNames(
 
     @Operation(
             summary = "Get a single entity by its modelId.",
-            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
-                    content = { @Content(mediaType = MediaType.APPLICATION_FORM_URLENCODED_VALUE) }),
             parameters = {
                     @Parameter(
                             name = API.PARAM_MODEL_ID,
@@ -225,7 +217,6 @@ public Collection<EntityName> getNames(
     @RequestMapping(
             path = API.PARAM_MODEL_PATH_SEGMENT,
             method = RequestMethod.GET,
-            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public T getBy(@PathVariable final String modelId) {
         return this.entityDAO
@@ -240,8 +231,6 @@ public T getBy(@PathVariable final String modelId) {
 
     @Operation(
             summary = "Get a list of entity objects by a given list of model identifiers of entities.",
-            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
-                    content = { @Content(mediaType = MediaType.APPLICATION_FORM_URLENCODED_VALUE) }),
             parameters = {
                     @Parameter(
                             name = API.PARAM_MODEL_ID_LIST,
@@ -250,7 +239,6 @@ public T getBy(@PathVariable final String modelId) {
     @RequestMapping(
             path = API.LIST_PATH_SEGMENT,
             method = RequestMethod.GET,
-            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces = MediaType.APPLICATION_JSON_VALUE)
     public List<T> getForIds(@RequestParam(name = API.PARAM_MODEL_ID_LIST, required = true) final String modelIds) {
 

src/main/java/ch/ethz/seb/sps/server/weblayer/EntityController.java

@@ -330,8 +330,7 @@ public CompletableFuture<Void> postScreenshot(
 
     @RequestMapping(
             path = API.PARAM_MODEL_PATH_SEGMENT + API.SCREENSHOT_UPLOAD_ENDPOINT,
-            method = RequestMethod.GET,
-            consumes = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+            method = RequestMethod.GET)
     public void getEncryptionKeyForSessionUUID(
             @PathVariable(name = API.PARAM_MODEL_ID) final String sessionUUID,
             @RequestHeader(name = API.SESSION_HEADER_UUID) final String uploadSessionUUID,

src/main/java/ch/ethz/seb/sps/server/weblayer/SEBSessionController.java

@@ -11,21 +11,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
 import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
 
-import ch.ethz.seb.sps.utils.Utils;
-import org.apache.commons.codec.binary.Hex;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -40,7 +27,6 @@
 import ch.ethz.seb.sps.domain.model.user.EntityPrivilege;
 import ch.ethz.seb.sps.domain.model.user.UserPrivileges;
 import io.swagger.v3.core.util.Constants;
-import org.springframework.security.crypto.keygen.KeyGenerators;
 
 public class ReplTest {