diff --git a/avni-server-api/src/main/java/org/avni/server/framework/api/ApiResourceInterceptor.java b/avni-server-api/src/main/java/org/avni/server/framework/api/ApiResourceInterceptor.java index c6fdb2b8f..52572ca00 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/api/ApiResourceInterceptor.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/api/ApiResourceInterceptor.java @@ -5,8 +5,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Component public class ApiResourceInterceptor extends HandlerInterceptorAdapter { diff --git a/avni-server-api/src/main/java/org/avni/server/framework/hibernate/DummyInterceptor.java b/avni-server-api/src/main/java/org/avni/server/framework/hibernate/DummyInterceptor.java index 598bcecb7..b6036f1d8 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/hibernate/DummyInterceptor.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/hibernate/DummyInterceptor.java @@ -6,8 +6,8 @@ import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.transaction.Transactional; @Component diff --git a/avni-server-api/src/main/java/org/avni/server/framework/security/AuthTokenManager.java b/avni-server-api/src/main/java/org/avni/server/framework/security/AuthTokenManager.java index f6732dc05..8b534dc64 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/security/AuthTokenManager.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/security/AuthTokenManager.java @@ -5,9 +5,9 @@ import org.avni.server.web.LogoutController; import org.springframework.util.StringUtils; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.Date; import java.util.regex.Pattern; diff --git a/avni-server-api/src/main/java/org/avni/server/framework/security/AuthenticationFilter.java b/avni-server-api/src/main/java/org/avni/server/framework/security/AuthenticationFilter.java index 1a00dcf83..9da4a77e2 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/security/AuthenticationFilter.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/security/AuthenticationFilter.java @@ -15,10 +15,10 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; import org.springframework.util.StringUtils; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; diff --git a/avni-server-api/src/main/java/org/avni/server/framework/security/LimitHostNamesFilter.java b/avni-server-api/src/main/java/org/avni/server/framework/security/LimitHostNamesFilter.java index 4b3ed48a0..b7828227d 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/security/LimitHostNamesFilter.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/security/LimitHostNamesFilter.java @@ -7,10 +7,10 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Arrays; diff --git a/avni-server-api/src/main/java/org/avni/server/framework/security/ResourceProtectionStatus.java b/avni-server-api/src/main/java/org/avni/server/framework/security/ResourceProtectionStatus.java index b558e0053..cd6af51b7 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/security/ResourceProtectionStatus.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/security/ResourceProtectionStatus.java @@ -2,7 +2,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; diff --git a/avni-server-api/src/main/java/org/avni/server/framework/sync/MetadataResourceInterceptor.java b/avni-server-api/src/main/java/org/avni/server/framework/sync/MetadataResourceInterceptor.java index 128d2ca3d..3d0a27de5 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/sync/MetadataResourceInterceptor.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/sync/MetadataResourceInterceptor.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashSet; diff --git a/avni-server-api/src/main/java/org/avni/server/framework/sync/MutableRequestFilter.java b/avni-server-api/src/main/java/org/avni/server/framework/sync/MutableRequestFilter.java index 475bc0d06..06ebb791d 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/sync/MutableRequestFilter.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/sync/MutableRequestFilter.java @@ -9,9 +9,9 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.*; import java.util.HashMap; import java.util.Map; diff --git a/avni-server-api/src/main/java/org/avni/server/framework/sync/MutableRequestWrapper.java b/avni-server-api/src/main/java/org/avni/server/framework/sync/MutableRequestWrapper.java index 6530a96a1..00062a604 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/sync/MutableRequestWrapper.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/sync/MutableRequestWrapper.java @@ -1,7 +1,7 @@ package org.avni.server.framework.sync; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.util.*; public class MutableRequestWrapper extends HttpServletRequestWrapper { diff --git a/avni-server-api/src/main/java/org/avni/server/framework/sync/TransactionalResourceInterceptor.java b/avni-server-api/src/main/java/org/avni/server/framework/sync/TransactionalResourceInterceptor.java index 087ca9f91..01d7a28d9 100644 --- a/avni-server-api/src/main/java/org/avni/server/framework/sync/TransactionalResourceInterceptor.java +++ b/avni-server-api/src/main/java/org/avni/server/framework/sync/TransactionalResourceInterceptor.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.Map; diff --git a/avni-server-api/src/main/java/org/avni/server/service/EncounterService.java b/avni-server-api/src/main/java/org/avni/server/service/EncounterService.java index 3c78c25cc..fe75720f4 100644 --- a/avni-server-api/src/main/java/org/avni/server/service/EncounterService.java +++ b/avni-server-api/src/main/java/org/avni/server/service/EncounterService.java @@ -38,7 +38,7 @@ import static org.avni.server.web.request.api.ApiBaseEncounterRequest.*; import static org.avni.server.web.request.api.ApiSubjectRequest.OBSERVATIONS; -import static org.springframework.data.jpa.domain.Specifications.where; +import static org.springframework.data.jpa.domain.Specification.where; @Service public class EncounterService implements ScopeAwareService { diff --git a/avni-server-api/src/main/java/org/avni/server/web/ExtensionController.java b/avni-server-api/src/main/java/org/avni/server/web/ExtensionController.java index ec2f806f0..d1ecb4c1c 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/ExtensionController.java +++ b/avni-server-api/src/main/java/org/avni/server/web/ExtensionController.java @@ -29,7 +29,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.HandlerMapping; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.transaction.Transactional; import javax.validation.Valid; import java.io.IOException; diff --git a/avni-server-api/src/main/java/org/avni/server/web/ImportController.java b/avni-server-api/src/main/java/org/avni/server/web/ImportController.java index a3fb5e562..bfe97013b 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/ImportController.java +++ b/avni-server-api/src/main/java/org/avni/server/web/ImportController.java @@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.util.*; diff --git a/avni-server-api/src/main/java/org/avni/server/web/LogoutController.java b/avni-server-api/src/main/java/org/avni/server/web/LogoutController.java index c691d5de1..88a502bf1 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/LogoutController.java +++ b/avni-server-api/src/main/java/org/avni/server/web/LogoutController.java @@ -4,8 +4,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @RestController public class LogoutController { diff --git a/avni-server-api/src/main/java/org/avni/server/web/MediaController.java b/avni-server-api/src/main/java/org/avni/server/web/MediaController.java index 9782e931d..e68f8f9a5 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/MediaController.java +++ b/avni-server-api/src/main/java/org/avni/server/web/MediaController.java @@ -24,8 +24,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.awt.*; import java.io.File; import java.io.IOException; diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/CatchmentContract.java b/avni-server-api/src/main/java/org/avni/server/web/request/CatchmentContract.java index ca6ae9949..cdf4fef83 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/CatchmentContract.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/CatchmentContract.java @@ -1,7 +1,7 @@ package org.avni.server.web.request; import org.avni.server.domain.Catchment; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; import org.joda.time.DateTime; import java.util.ArrayList; diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/GroupContract.java b/avni-server-api/src/main/java/org/avni/server/web/request/GroupContract.java index a38c278db..f8d07f18f 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/GroupContract.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/GroupContract.java @@ -1,7 +1,7 @@ package org.avni.server.web.request; import org.avni.server.domain.Group; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; @Relation(collectionRelation = "group") public class GroupContract extends ReferenceDataContract { diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoClientContract.java b/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoClientContract.java index fcd72349e..9be67819d 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoClientContract.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoClientContract.java @@ -1,7 +1,7 @@ package org.avni.server.web.request; import org.avni.server.domain.JsonObject; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; import java.util.List; diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoContract.java b/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoContract.java index bba0b0e02..911c4640e 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoContract.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/UserInfoContract.java @@ -2,7 +2,7 @@ import org.joda.time.DateTime; import org.avni.server.domain.JsonObject; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; @Relation(collectionRelation = "userInfo") public class UserInfoContract { diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/EncounterTypeContractWeb.java b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/EncounterTypeContractWeb.java index adff9e939..9d6cd0386 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/EncounterTypeContractWeb.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/EncounterTypeContractWeb.java @@ -2,7 +2,7 @@ import org.avni.server.domain.DeclarativeRule; import org.avni.server.domain.OperationalEncounterType; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; import org.joda.time.DateTime; diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/IdentifierSourceContractWeb.java b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/IdentifierSourceContractWeb.java index 72d9292fa..e3a142820 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/IdentifierSourceContractWeb.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/IdentifierSourceContractWeb.java @@ -2,8 +2,7 @@ import org.avni.server.domain.IdentifierSource; import org.avni.server.domain.JsonObject; -import org.avni.server.domain.identifier.IdentifierGeneratorType; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; @Relation(collectionRelation = "identifierSource") public class IdentifierSourceContractWeb { diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/IdentifierUserAssignmentContractWeb.java b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/IdentifierUserAssignmentContractWeb.java index 89542f804..09395eeaa 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/IdentifierUserAssignmentContractWeb.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/IdentifierUserAssignmentContractWeb.java @@ -2,7 +2,7 @@ import org.avni.server.domain.IdentifierSource; import org.avni.server.domain.IdentifierUserAssignment; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; @Relation(collectionRelation = "identifierUserAssignment") public class IdentifierUserAssignmentContractWeb { diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/ProgramContractWeb.java b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/ProgramContractWeb.java index 31dd2191e..22c74ed4e 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/ProgramContractWeb.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/ProgramContractWeb.java @@ -3,7 +3,7 @@ import org.avni.server.domain.OperationalProgram; import org.avni.server.web.contract.ProgramContract; import org.joda.time.DateTime; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; /** diff --git a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/SubjectTypeContractWeb.java b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/SubjectTypeContractWeb.java index 1875693e3..172c1d8e0 100644 --- a/avni-server-api/src/main/java/org/avni/server/web/request/webapp/SubjectTypeContractWeb.java +++ b/avni-server-api/src/main/java/org/avni/server/web/request/webapp/SubjectTypeContractWeb.java @@ -8,7 +8,7 @@ import org.avni.server.web.request.FormatContract; import org.avni.server.web.request.GroupRoleContract; import org.joda.time.DateTime; -import org.springframework.hateoas.core.Relation; +import org.springframework.hateoas.server.core.Relation; import java.util.List; diff --git a/avni-server-api/src/test/java/org/avni/server/framework/security/LimitHostNamesFilterTest.java b/avni-server-api/src/test/java/org/avni/server/framework/security/LimitHostNamesFilterTest.java index dec65949e..7b1759768 100644 --- a/avni-server-api/src/test/java/org/avni/server/framework/security/LimitHostNamesFilterTest.java +++ b/avni-server-api/src/test/java/org/avni/server/framework/security/LimitHostNamesFilterTest.java @@ -6,8 +6,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import static org.hamcrest.CoreMatchers.equalTo;