fix: Make hal+json responses just json (#2773)

tolgee · Dec 12, 2024 · a30c7cd · a30c7cd
1 parent a84160a
commit a30c7cd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/ProjectActivityController.kt b/backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/ProjectActivityController.kt
@@ -23,7 +23,6 @@ import io.tolgee.security.authorization.RequiresProjectPermissions
 import org.springdoc.core.annotations.ParameterObject
 import org.springframework.data.domain.Pageable
 import org.springframework.data.web.PagedResourcesAssembler
-import org.springframework.hateoas.MediaTypes
 import org.springframework.hateoas.PagedModel
 import org.springframework.web.bind.annotation.CrossOrigin
 import org.springframework.web.bind.annotation.GetMapping
@@ -46,7 +45,7 @@ class ProjectActivityController(
   private val modifiedEntityModelAssembler: ModifiedEntityModelAssembler,
 ) {
   @Operation(summary = "Get project activity")
-  @GetMapping("", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("")
   @RequiresProjectPermissions([ Scope.ACTIVITY_VIEW ])
   @AllowApiAccess
   fun getActivity(
@@ -57,7 +56,7 @@ class ProjectActivityController(
   }
 
   @Operation(summary = "Get one revision data")
-  @GetMapping("/revisions/{revisionId}", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("/revisions/{revisionId}")
   @RequiresProjectPermissions([Scope.ACTIVITY_VIEW])
   @AllowApiAccess
   fun getSingleRevision(

diff --git a/backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/ProjectStatsController.kt b/backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/ProjectStatsController.kt
@@ -17,7 +17,7 @@ import io.tolgee.service.language.LanguageService
 import io.tolgee.service.project.LanguageStatsService
 import io.tolgee.service.project.ProjectService
 import io.tolgee.service.project.ProjectStatsService
-import org.springframework.hateoas.MediaTypes
+import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.CrossOrigin
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
@@ -38,7 +38,7 @@ class ProjectStatsController(
   private val languageService: LanguageService,
 ) {
   @Operation(summary = "Get project stats")
-  @GetMapping("", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("", produces = [MediaType.APPLICATION_JSON_VALUE])
   @UseDefaultPermissions
   @AllowApiAccess
   fun getProjectStats(): ProjectStatsModel {
@@ -73,7 +73,7 @@ class ProjectStatsController(
   }
 
   @Operation(summary = "Get project daily amount of events")
-  @GetMapping("/daily-activity", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("/daily-activity")
   @RequiresProjectPermissions([ Scope.ACTIVITY_VIEW ])
   @AllowApiAccess
   fun getProjectDailyActivity(): Map<LocalDate, Long> {

diff --git a/...d/api/src/main/kotlin/io/tolgee/api/v2/controllers/organization/OrganizationController.kt b/...d/api/src/main/kotlin/io/tolgee/api/v2/controllers/organization/OrganizationController.kt
@@ -51,7 +51,6 @@ import org.springframework.data.domain.Pageable
 import org.springframework.data.domain.Sort
 import org.springframework.data.web.PagedResourcesAssembler
 import org.springframework.data.web.SortDefault
-import org.springframework.hateoas.MediaTypes
 import org.springframework.hateoas.PagedModel
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
@@ -148,7 +147,7 @@ class OrganizationController(
     return OrganizationView.of(organization, roleType).toModel()
   }
 
-  @GetMapping("", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("")
   @Operation(
     summary = "Get all permitted organizations",
     description = "Returns all organizations, which is current user allowed to view",

diff --git a/...rc/main/kotlin/io/tolgee/api/v2/controllers/organization/OrganizationProjectController.kt b/...rc/main/kotlin/io/tolgee/api/v2/controllers/organization/OrganizationProjectController.kt
@@ -19,7 +19,6 @@ import org.springdoc.core.annotations.ParameterObject
 import org.springframework.data.domain.Pageable
 import org.springframework.data.web.PagedResourcesAssembler
 import org.springframework.data.web.SortDefault
-import org.springframework.hateoas.MediaTypes
 import org.springframework.hateoas.PagedModel
 import org.springframework.web.bind.annotation.CrossOrigin
 import org.springframework.web.bind.annotation.GetMapping
@@ -81,7 +80,7 @@ class OrganizationProjectController(
       "Returns all projects (including statistics)" +
         " where current user has any permission (except none)",
   )
-  @GetMapping("/{organizationId:[0-9]+}/projects-with-stats", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("/{organizationId:[0-9]+}/projects-with-stats")
   @UseDefaultPermissions
   fun getAllWithStatistics(
     @ParameterObject pageable: Pageable,
@@ -98,7 +97,7 @@ class OrganizationProjectController(
       "Returns all projects (including statistics) " +
         "where current user has any permission (except none)",
   )
-  @GetMapping("/{slug:.*[a-z].*}/projects-with-stats", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("/{slug:.*[a-z].*}/projects-with-stats")
   @UseDefaultPermissions
   fun getAllWithStatistics(
     @ParameterObject

diff --git a/backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/project/ProjectsController.kt b/backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/project/ProjectsController.kt
@@ -44,7 +44,6 @@ import jakarta.validation.Valid
 import org.springdoc.core.annotations.ParameterObject
 import org.springframework.data.domain.Pageable
 import org.springframework.data.web.PagedResourcesAssembler
-import org.springframework.hateoas.MediaTypes
 import org.springframework.hateoas.PagedModel
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
@@ -111,7 +110,7 @@ class ProjectsController(
   }
 
   @Operation(summary = "Get all permitted", description = "Returns all projects where current user has any permission")
-  @GetMapping("", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("")
   @IsGlobalRoute
   @AllowApiAccess(tokenType = AuthTokenType.ONLY_PAT)
   @OpenApiOrderExtension(3)
@@ -157,7 +156,7 @@ class ProjectsController(
     summary = "Get all with stats",
     description = "Returns all projects (including statistics) where current user has any permission",
   )
-  @GetMapping("/with-stats", produces = [MediaTypes.HAL_JSON_VALUE])
+  @GetMapping("/with-stats")
   @IsGlobalRoute
   fun getAllWithStatistics(
     @ParameterObject pageable: Pageable,