#813 - javax to jakarta

avniproject · Oct 30, 2024 · 2154c34 · 2154c34
1 parent d596e83
commit 2154c34
Show file tree

Hide file tree

Showing 25 changed files with 43 additions and 44 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...server-api/src/main/java/org/avni/server/framework/security/ResourceProtectionStatus.java b/...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/...-server-api/src/main/java/org/avni/server/framework/sync/MetadataResourceInterceptor.java b/...-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
@@ -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
@@ -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/...er-api/src/main/java/org/avni/server/framework/sync/TransactionalResourceInterceptor.java b/...er-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
@@ -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<Encounter> {

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...server-api/src/main/java/org/avni/server/web/request/webapp/EncounterTypeContractWeb.java b/...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/...ver-api/src/main/java/org/avni/server/web/request/webapp/IdentifierSourceContractWeb.java b/...ver-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/...src/main/java/org/avni/server/web/request/webapp/IdentifierUserAssignmentContractWeb.java b/...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
@@ -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
@@ -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/...server-api/src/test/java/org/avni/server/framework/security/LimitHostNamesFilterTest.java b/...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;