diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3ad39cf5c9..c962d35c79 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: platform: [ ubuntu-latest ] - java-version: [ 8, 11, 17, 21 ] + java-version: [ 21, 25 ] fail-fast: false runs-on: ${{ matrix.platform }} diff --git a/bamboo-specs/bamboo.yaml b/bamboo-specs/bamboo.yaml index c597ab4b78..bd666f6ef4 100644 --- a/bamboo-specs/bamboo.yaml +++ b/bamboo-specs/bamboo.yaml @@ -10,7 +10,7 @@ stages: manual: false final: false jobs: - - Build and Test JDK 8 + - Build and Test JDK 21 - Deploy: manual: false final: false @@ -22,8 +22,8 @@ stages: jobs: - Release to Maven -Build and Test JDK 8: - key: BTJ8 +Build and Test JDK 21: + key: BTJ21 tasks: - checkout: force-clean-build: 'false' @@ -34,7 +34,7 @@ Build and Test JDK 8: - |- #!/bin/bash -eu set -x - export IMAGE="maven:3.9.9-amazoncorretto-8" + export IMAGE="maven:3.9.9-amazoncorretto-21" docker pull ${IMAGE} docker run -v m2-repo:/root/.m2/repository -v ${PWD}:/module --rm -w="/module" ${IMAGE} bash -c 'mvn clean package && chmod -R 777 .' description: Build and test @@ -63,7 +63,7 @@ Deploy to Maven: - |- #!/bin/bash -eu set -x - export IMAGE="maven:3.9.9-amazoncorretto-8" + export IMAGE="maven:3.9.9-amazoncorretto-21" docker pull ${IMAGE} docker run -v m2-repo:/root/.m2/repository -v ~/.m2/settings.xml:/.m2/settings.xml:ro -v ${PWD}:/module --rm -w="/module" ${IMAGE} bash -c 'mvn deploy -DskipTests --settings /.m2/settings.xml' description: Deploy @@ -97,7 +97,7 @@ Release to Maven: - |- #!/bin/bash -eu set -x - export IMAGE="maven:3.9.9-amazoncorretto-8" + export IMAGE="maven:3.9.9-amazoncorretto-21" docker pull ${IMAGE} docker run \ -v m2-repo:/root/.m2/repository \ diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 58d490d970..222371b2cd 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -51,8 +51,8 @@ maven-compiler-plugin 3.6.2 - 1.8 - 1.8 + 21 + 21 diff --git a/omod-common/pom.xml b/omod-common/pom.xml index aa52c6227d..e2421955d5 100644 --- a/omod-common/pom.xml +++ b/omod-common/pom.xml @@ -13,7 +13,7 @@ org.apache.tomcat - jasper + tomcat-jasper ${apacheTomcatVersion} provided diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/Info.java b/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/Info.java index c5eac0b915..caec36469c 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/Info.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/Info.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.docs.swagger; import com.fasterxml.jackson.annotation.JsonGetter; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /* The object provides metadata about the API.*/ public class Info { diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/Parameter.java b/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/Parameter.java index a3857e776b..0991f3fc94 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/Parameter.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/Parameter.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonSetter; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java b/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java index d0232bf2f8..5b4cb99435 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/docs/swagger/SwaggerSpecificationCreator.java @@ -33,7 +33,7 @@ import io.swagger.models.properties.RefProperty; import io.swagger.models.properties.StringProperty; import io.swagger.util.Json; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Level; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/helper/ModuleFactoryWrapper.java b/omod-common/src/main/java/org/openmrs/module/webservices/helper/ModuleFactoryWrapper.java index 9180b17225..1b26a745f8 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/helper/ModuleFactoryWrapper.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/helper/ModuleFactoryWrapper.java @@ -20,7 +20,7 @@ import org.openmrs.util.PrivilegeConstants; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/SimpleObject.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/SimpleObject.java index 0274a6bba6..4fab273c2f 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/SimpleObject.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/SimpleObject.java @@ -12,9 +12,9 @@ import java.io.IOException; import java.util.LinkedHashMap; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.openmrs.module.webservices.rest.util.SimpleObjectConverter; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/DynamicBeanConfiguration.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/DynamicBeanConfiguration.java index 346716cf98..3a82d75770 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/DynamicBeanConfiguration.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/DynamicBeanConfiguration.java @@ -47,7 +47,7 @@ public HttpMessageConverter getMappingJacksonHttpMessageConverter() throws Ex clazz = Context.loadClass("org.springframework.http.converter.json.MappingJacksonHttpMessageConverter"); } - return (HttpMessageConverter) clazz.newInstance(); + return (HttpMessageConverter) clazz.getDeclaredConstructor().newInstance(); } /** @@ -75,7 +75,7 @@ public AbstractHandlerExceptionResolver getHandlerExceptionResolver() throws Exc Class clazz = Context .loadClass("org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerExceptionResolver"); - bean = (AbstractHandlerExceptionResolver) clazz.newInstance(); + bean = (AbstractHandlerExceptionResolver) clazz.getDeclaredConstructor().newInstance(); Method method = bean.getClass().getMethod("setMessageConverters", HttpMessageConverter[].class); method.invoke(bean, new Object[] { new HttpMessageConverter[] { stringHttpMessageConverter, @@ -85,7 +85,7 @@ public AbstractHandlerExceptionResolver getHandlerExceptionResolver() throws Exc Class clazz = Context .loadClass("org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver"); - bean = (AbstractHandlerExceptionResolver) clazz.newInstance(); + bean = (AbstractHandlerExceptionResolver) clazz.getDeclaredConstructor().newInstance(); Method method = bean.getClass().getMethod("setMessageConverters", List.class); method.invoke(bean, Arrays.asList(stringHttpMessageConverter, @@ -115,6 +115,6 @@ public AbstractHandlerMapping getHandlerMapping() throws Exception { clazz = Context.loadClass("org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"); } - return (AbstractHandlerMapping) clazz.newInstance(); + return (AbstractHandlerMapping) clazz.getDeclaredConstructor().newInstance(); } } diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/Hyperlink.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/Hyperlink.java index 3855d5e6eb..810230720b 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/Hyperlink.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/Hyperlink.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.thoughtworks.xstream.annotations.XStreamAlias; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RequestContext.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RequestContext.java index aa589c1644..23c65e6def 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RequestContext.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RequestContext.java @@ -13,8 +13,8 @@ import java.net.URLEncoder; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.openmrs.api.APIException; import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestInit.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestInit.java index fc1242dd0d..c167912ff4 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestInit.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestInit.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestUtil.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestUtil.java index 4c72b4b070..9f66144368 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestUtil.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestUtil.java @@ -10,8 +10,8 @@ package org.openmrs.module.webservices.rest.web; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.openmrs.GlobalProperty; @@ -34,8 +34,8 @@ import org.springframework.web.bind.ServletRequestUtils; import org.springframework.web.bind.annotation.ResponseStatus; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; import java.net.InetAddress; @@ -496,7 +496,7 @@ public static RequestContext getRequestContext(HttpServletRequest request, HttpS * @param request the current http web request * @param response the current http web response * @return a {@link RequestContext} object filled with all the necessary values - * @see getRequestContext(javax.servlet.http.HttpServletRequest, + * @see getRequestContext(jakarta.servlet.http.HttpServletRequest, * org.openmrs.module.webservices.rest.web.representation.Representation) */ public static RequestContext getRequestContext(HttpServletRequest request, HttpServletResponse response) { @@ -552,11 +552,7 @@ public static Boolean getBooleanParam(HttpServletRequest request, String param) public static void setResponseStatus(Throwable ex, HttpServletResponse response) { ResponseStatus ann = ex.getClass().getAnnotation(ResponseStatus.class); if (ann != null) { - if (StringUtils.isNotBlank(ann.reason())) { - response.setStatus(ann.value().value(), ann.reason()); - } else { - response.setStatus(ann.value().value()); - } + response.setStatus(ann.value().value()); } else { response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/RestHelperServiceImpl.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/RestHelperServiceImpl.java index b829cb445e..2e797d18c4 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/RestHelperServiceImpl.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/RestHelperServiceImpl.java @@ -9,22 +9,22 @@ */ package org.openmrs.module.webservices.rest.web.api.impl; -import org.hibernate.CacheMode; -import org.hibernate.Criteria; -import org.hibernate.criterion.MatchMode; -import org.hibernate.criterion.Restrictions; import org.openmrs.Patient; import org.openmrs.api.context.Context; -import org.openmrs.api.db.hibernate.DbSession; import org.openmrs.api.db.hibernate.DbSessionFactory; import org.openmrs.api.impl.BaseOpenmrsService; import org.openmrs.module.webservices.rest.web.api.RestHelperService; import org.openmrs.module.webservices.rest.web.resource.api.SearchHandler; import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingSubclassHandler; +import org.hibernate.Session; import org.springframework.transaction.annotation.Transactional; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.io.Serializable; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -38,54 +38,34 @@ public class RestHelperServiceImpl extends BaseOpenmrsService implements RestHel DbSessionFactory sessionFactory; - Method method; - public void setSessionFactory(DbSessionFactory sessionFactory) { this.sessionFactory = sessionFactory; } + private Session getHibernateSession() { + return sessionFactory.getHibernateSessionFactory().getCurrentSession(); + } + /** * @see org.openmrs.module.webservices.rest.web.api.RestHelperService#getObjectByUuid(Class, * String) */ @Override @Transactional(readOnly = true) + @SuppressWarnings("unchecked") public T getObjectByUuid(Class type, String uuid) { - return type.cast(getSession().createCriteria(type).add(Restrictions.eq("uuid", uuid)).uniqueResult()); + Session session = getHibernateSession(); + CriteriaBuilder cb = session.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery((Class) type); + Root root = cq.from((Class) type); + cq.where(cb.equal(root.get("uuid"), uuid)); + List results = session.createQuery(cq).getResultList(); + return results.isEmpty() ? null : results.get(0); } - private DbSession getSession() { - if (method == null) { - try { - return sessionFactory.getCurrentSession(); - } - catch (NoSuchMethodError error) { - //Supports Hibernate 3 by casting org.hibernate.classic.Session to org.hibernate.Session - try { - method = sessionFactory.getClass().getMethod("getCurrentSession"); - return (DbSession) method.invoke(sessionFactory); - } - catch (Exception e) { - throw new IllegalStateException(e); - } - } - } else { - try { - return (DbSession) method.invoke(sessionFactory); - } - catch (Exception e) { - throw new IllegalStateException(e); - } - } - } - - /** - * @see org.openmrs.module.webservices.rest.web.api.RestHelperService#getObjectById(Class, - * Serializable) - */ @Override public T getObjectById(Class type, Serializable id) { - return type.cast(getSession().get(type, id)); + return type.cast(getHibernateSession().get(type, id)); } /** @@ -95,29 +75,42 @@ public T getObjectById(Class type, Serializable id) { @SuppressWarnings("unchecked") @Override public List getObjectsByFields(Class type, Field... fields) { - Criteria criteria = getSession().createCriteria(type); + Session session = getHibernateSession(); + CriteriaBuilder cb = session.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery((Class) type); + Root root = cq.from((Class) type); + List predicates = new ArrayList<>(); for (Field field : fields) { if (field != null) { - criteria.add(Restrictions.eq(field.getName(), field.getValue())); + predicates.add(cb.equal(root.get(field.getName()), field.getValue())); } } - return criteria.list(); + if (!predicates.isEmpty()) { + cq.where(predicates.toArray(new Predicate[0])); + } + return session.createQuery(cq).getResultList(); } /** * @see org.openmrs.module.webservices.rest.web.api.RestHelperService#getPatients(Collection) */ @Override - @SuppressWarnings("unchecked") public List getPatients(Collection patientIds) { List ret = new ArrayList(); if (!patientIds.isEmpty()) { - Criteria criteria = getSession().createCriteria(Patient.class); - criteria.setCacheMode(CacheMode.IGNORE); - criteria.add(Restrictions.in("patientId", patientIds)); - criteria.add(Restrictions.eq("voided", false)); - List temp = criteria.list(); + Session session = getHibernateSession(); + CriteriaBuilder cb = session.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(Patient.class); + Root root = cq.from(Patient.class); + cq.where( + cb.and( + root.get("patientId").in(patientIds), + cb.equal(root.get("voided"), false) + ) + ); + session.setCacheMode(org.hibernate.CacheMode.IGNORE); + List temp = session.createQuery(cq).getResultList(); for (Patient p : temp) { ret.add(p); } @@ -128,14 +121,19 @@ public List getPatients(Collection patientIds) { @Override public List findPatientsByIdentifierStartingWith(String identifier, boolean includeAll) { - Criteria criteria = getSession().createCriteria(Patient.class); - criteria.createAlias("identifiers", "identifiers"); - criteria.add(Restrictions.like("identifiers.identifier", identifier, MatchMode.START)); - criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY); + Session session = getHibernateSession(); + CriteriaBuilder cb = session.getCriteriaBuilder(); + CriteriaQuery cq = cb.createQuery(Patient.class); + Root root = cq.from(Patient.class); + Join identifiers = root.join("identifiers"); + List predicates = new ArrayList<>(); + predicates.add(cb.like(identifiers.get("identifier"), identifier + "%")); if (!includeAll) { - criteria.add(Restrictions.eq("voided", false)); + predicates.add(cb.equal(root.get("voided"), false)); } - return criteria.list(); + cq.where(predicates.toArray(new Predicate[0])); + cq.distinct(true); + return session.createQuery(cq).getResultList(); } /** diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/RestServiceImpl.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/RestServiceImpl.java index 06c668dbdb..888b3a8102 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/RestServiceImpl.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/api/impl/RestServiceImpl.java @@ -20,7 +20,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.proxy.HibernateProxy; import org.openmrs.api.APIException; import org.openmrs.module.ModuleUtil; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/filter/AuthorizationFilter.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/filter/AuthorizationFilter.java index 79df9e2108..489060b427 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/filter/AuthorizationFilter.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/filter/AuthorizationFilter.java @@ -12,17 +12,17 @@ import java.io.IOException; import java.nio.charset.Charset; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.api.context.Context; import org.openmrs.module.webservices.rest.web.RestConstants; import org.openmrs.module.webservices.rest.web.RestUtil; @@ -42,7 +42,7 @@ public class AuthorizationFilter implements Filter { private static final Logger log = LoggerFactory.getLogger(AuthorizationFilter.class); /** - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) + * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig) */ @Override public void init(FilterConfig arg0) throws ServletException { @@ -50,7 +50,7 @@ public void init(FilterConfig arg0) throws ServletException { } /** - * @see javax.servlet.Filter#destroy() + * @see jakarta.servlet.Filter#destroy() */ @Override public void destroy() { @@ -58,8 +58,8 @@ public void destroy() { } /** - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, - * javax.servlet.FilterChain) + * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse, + * jakarta.servlet.FilterChain) */ @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/filter/ContentTypeFilter.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/filter/ContentTypeFilter.java index b8e4c9690b..1fce294c34 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/filter/ContentTypeFilter.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/filter/ContentTypeFilter.java @@ -12,13 +12,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** @@ -29,7 +29,7 @@ public class ContentTypeFilter implements Filter { protected final Log log = LogFactory.getLog(getClass()); /** - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) + * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig) */ @Override public void init(FilterConfig arg0) throws ServletException { @@ -37,7 +37,7 @@ public void init(FilterConfig arg0) throws ServletException { } /** - * @see javax.servlet.Filter#destroy() + * @see jakarta.servlet.Filter#destroy() */ @Override public void destroy() { @@ -45,8 +45,8 @@ public void destroy() { } /** - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse, javax.servlet.FilterChain) + * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, + * jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain) */ @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/api/SearchConfig.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/api/SearchConfig.java index ceee764bd5..e38ee6473c 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/api/SearchConfig.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/api/SearchConfig.java @@ -15,7 +15,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Stores {@link SearchHandler}'s configuration. diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/api/SearchQuery.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/api/SearchQuery.java index 0e5b93b3cd..e79c0a9216 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/api/SearchQuery.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/api/SearchQuery.java @@ -14,7 +14,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; /** * Search query used by the {@link SearchConfig}. diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/BaseDelegatingResource.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/BaseDelegatingResource.java index 62163b4596..9c4b1e57e8 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/BaseDelegatingResource.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/BaseDelegatingResource.java @@ -25,7 +25,7 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.proxy.HibernateProxy; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/MetadataDelegatingCrudResource.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/MetadataDelegatingCrudResource.java index bf4defa256..092ea99d91 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/MetadataDelegatingCrudResource.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/MetadataDelegatingCrudResource.java @@ -15,7 +15,7 @@ import io.swagger.models.ModelImpl; import io.swagger.models.properties.BooleanProperty; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.OpenmrsMetadata; import org.openmrs.api.context.Context; import org.openmrs.module.webservices.rest.SimpleObject; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseRestController.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseRestController.java index a2d3db2536..96cfcd196e 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseRestController.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseRestController.java @@ -9,10 +9,10 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.api.APIAuthenticationException; import org.openmrs.api.context.Context; import org.apache.commons.logging.Log; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseUriSetup.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseUriSetup.java index 163bb0b54f..c20ec215ab 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseUriSetup.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseUriSetup.java @@ -9,9 +9,9 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.controller; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.module.webservices.rest.web.RestConstants; import org.springframework.stereotype.Component; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainResourceController.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainResourceController.java index 24d6f9b285..9bd792f1bf 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainResourceController.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainResourceController.java @@ -39,8 +39,8 @@ import org.springframework.web.bind.annotation.ResponseBody; 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.io.IOException; import java.util.Enumeration; import java.util.Set; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainSubResourceController.java b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainSubResourceController.java index 0597158eb7..d8cb694afa 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainSubResourceController.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainSubResourceController.java @@ -9,8 +9,8 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.openmrs.module.webservices.rest.SimpleObject; import org.openmrs.module.webservices.rest.web.RequestContext; diff --git a/omod-common/src/main/java/org/openmrs/module/webservices/validation/ValidateUtil.java b/omod-common/src/main/java/org/openmrs/module/webservices/validation/ValidateUtil.java index 5150e91799..6679376f44 100644 --- a/omod-common/src/main/java/org/openmrs/module/webservices/validation/ValidateUtil.java +++ b/omod-common/src/main/java/org/openmrs/module/webservices/validation/ValidateUtil.java @@ -14,7 +14,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.api.APIException; import org.openmrs.api.AdministrationService; import org.openmrs.api.context.Context; diff --git a/omod-common/src/main/resources/webModuleApplicationContext.xml b/omod-common/src/main/resources/webModuleApplicationContext.xml index 138483236c..26de8560fd 100644 --- a/omod-common/src/main/resources/webModuleApplicationContext.xml +++ b/omod-common/src/main/resources/webModuleApplicationContext.xml @@ -88,8 +88,7 @@ - + class="org.springframework.web.multipart.support.StandardServletMultipartResolver"> diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/AdminSection.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/AdminSection.java index 52621d882e..1874f2101c 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/AdminSection.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/AdminSection.java @@ -13,7 +13,6 @@ import java.util.Map; import org.openmrs.api.context.Context; -import org.openmrs.module.Extension; import org.openmrs.module.web.extension.AdministrationSectionExt; /** @@ -23,25 +22,11 @@ */ public class AdminSection extends AdministrationSectionExt { - /** - * @see org.openmrs.module.web.extension.AdministrationSectionExt#getMediaType() - */ - @Override - public Extension.MEDIA_TYPE getMediaType() { - return Extension.MEDIA_TYPE.html; - } - - /** - * @see org.openmrs.module.web.extension.AdministrationSectionExt#getTitle() - */ @Override public String getTitle() { return RestConstants.MODULE_ID + ".title"; } - /** - * @see org.openmrs.module.web.extension.AdministrationSectionExt#getLinks() - */ @Override public Map getLinks() { diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/InitPathMatcher2_4.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/InitPathMatcher2_4.java index e72b074184..e2610a2706 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/InitPathMatcher2_4.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/InitPathMatcher2_4.java @@ -15,7 +15,7 @@ import org.springframework.web.context.ServletContextAware; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.util.List; /** diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/controller/SwaggerSpecificationController.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/controller/SwaggerSpecificationController.java index af6c747777..be3206a493 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/controller/SwaggerSpecificationController.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/controller/SwaggerSpecificationController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; @Controller("SwaggerSpecificationController") @RequestMapping("/module/webservices/rest/swagger.json") diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/ChangePasswordController1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/ChangePasswordController1_8.java index 0f71604671..5f7e5fbb8c 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/ChangePasswordController1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/ChangePasswordController1_8.java @@ -10,8 +10,8 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_8; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.openmrs.User; import org.openmrs.api.APIAuthenticationException; import org.openmrs.api.APIException; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/HL7MessageController1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/HL7MessageController1_8.java index 4b3344453d..9cefb56d33 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/HL7MessageController1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/HL7MessageController1_8.java @@ -11,11 +11,11 @@ import java.io.IOException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.map.JsonMappingException; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.JsonMappingException; import org.openmrs.api.context.Context; import org.openmrs.hl7.HL7Source; import org.openmrs.module.webservices.rest.SimpleObject; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/ObsComplexValueController1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/ObsComplexValueController1_8.java index 5a90f75aca..6a6155940d 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/ObsComplexValueController1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/ObsComplexValueController1_8.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam; import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.InputStream; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ClobDatatypeStorageController.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ClobDatatypeStorageController.java index 41b2b21f9b..9ee38d5b00 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ClobDatatypeStorageController.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ClobDatatypeStorageController.java @@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.ResponseBody; 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.io.IOException; import java.io.PrintWriter; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptReferenceController1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptReferenceController1_9.java index d6958df073..e59305d066 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptReferenceController1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptReferenceController1_9.java @@ -9,8 +9,8 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.openmrs.Concept; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/FormResourceController1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/FormResourceController1_9.java index 01c21e3f7a..053922e986 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/FormResourceController1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/FormResourceController1_9.java @@ -12,7 +12,7 @@ import org.openmrs.FormResource; import org.openmrs.api.FormService; import org.openmrs.module.webservices.rest.web.RestConstants; -import org.openmrs.module.webservices.rest.web.v1_0.controller.MainResourceController; +import org.openmrs.module.webservices.rest.web.v1_0.controller.BaseRestController; import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_9.FormResourceResource1_9; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -23,12 +23,12 @@ import org.springframework.web.bind.annotation.ResponseBody; 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; @Controller("webservices.rest.formResourceController") @RequestMapping(value = "/rest/" + RestConstants.VERSION_1 + "/form/{uuid}/resource/{resourceUuid}/value") -public class FormResourceController1_9 extends MainResourceController { +public class FormResourceController1_9 extends BaseRestController { @Autowired private ClobDatatypeStorageController clobDatatypeStorageController; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9.java index 5d37cf2cae..e8c8748d7d 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9.java @@ -34,8 +34,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import java.util.Collection; import java.util.HashSet; import java.util.Locale; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ClearDbCacheController2_0.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ClearDbCacheController2_0.java index ea68a5ff62..846f4f9652 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ClearDbCacheController2_0.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ClearDbCacheController2_0.java @@ -79,7 +79,7 @@ public void clearDbCache(@RequestBody(required = false) String json) throws Exce log.debug("Clearing DB cache via REST for resource: {} ({})", resourceName, supportedClass); } - sf.getCache().evictEntityRegion(supportedClass); + sf.getCache().evict(supportedClass); } else { if (log.isDebugEnabled()) { log.debug("Clearing DB cache via REST for resource: {} ({}) with uuid: {}", @@ -96,10 +96,10 @@ public void clearDbCache(@RequestBody(required = false) String json) throws Exce return; } - sf.getCache().evictEntity(supportedClass, object.getId()); + sf.getCache().evict(supportedClass, object.getId()); } - sf.getCache().evictCollectionRegions(); + sf.getCache().evictCollectionData(); sf.getCache().evictQueryRegions(); } } diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/LoggedInUsersController2_0.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/LoggedInUsersController2_0.java index 12fe1482d1..1a0dc03a7c 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/LoggedInUsersController2_0.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/LoggedInUsersController2_0.java @@ -21,8 +21,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/VisitConfigurationController2_0.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/VisitConfigurationController2_0.java index d12bb73db0..fc5dcea8f0 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/VisitConfigurationController2_0.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/VisitConfigurationController2_0.java @@ -9,8 +9,8 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs2_0; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.BaseOpenmrsMetadata; import org.openmrs.BaseOpenmrsObject; import org.openmrs.VisitType; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/helper/LayoutTemplateProvider.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/helper/LayoutTemplateProvider.java index 8450f17d34..ecbc6cb1e1 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/helper/LayoutTemplateProvider.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/helper/LayoutTemplateProvider.java @@ -15,7 +15,7 @@ import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.api.context.Context; import org.openmrs.layout.LayoutSupport; import org.openmrs.layout.LayoutTemplate; @@ -51,6 +51,9 @@ public T getLayoutTemplateByName(String codename) { public List getAllLayoutTemplates() { List templates = source.getLayoutTemplates(); + if (templates == null) { + return new ArrayList<>(); + } List populated = new ArrayList<>(templates.size()); for (T template : templates) { populated.add(createPopulatedLayoutTemplate(template)); diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/DrugOrderSubclassHandler1_10.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/DrugOrderSubclassHandler1_10.java index 96945da4e2..57ce17b489 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/DrugOrderSubclassHandler1_10.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/DrugOrderSubclassHandler1_10.java @@ -11,7 +11,7 @@ import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.CareSetting; import org.openmrs.DrugOrder; import org.openmrs.Order; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java index 7f1271ecaa..95538c11ec 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java @@ -14,7 +14,7 @@ import io.swagger.models.properties.DateProperty; import io.swagger.models.properties.RefProperty; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.CareSetting; import org.openmrs.Order; import org.openmrs.OrderType; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java index 1141e8cf62..eddf8ce9a2 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java @@ -11,7 +11,7 @@ import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.CareSetting; import org.openmrs.Order; import org.openmrs.OrderType; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/ObsResource1_11.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/ObsResource1_11.java index 14626f497e..5b8743fb06 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/ObsResource1_11.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/ObsResource1_11.java @@ -12,7 +12,7 @@ import io.swagger.models.Model; import io.swagger.models.ModelImpl; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.openmrs.Concept; import org.openmrs.ConceptNumeric; import org.openmrs.Obs; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptResource1_8.java index 44fabc6d27..0a8f5ed516 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptResource1_8.java @@ -16,7 +16,7 @@ import io.swagger.models.properties.ObjectProperty; import io.swagger.models.properties.RefProperty; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Concept; import org.openmrs.ConceptAnswer; import org.openmrs.ConceptClass; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java index 326806683b..76e7d0cd82 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java @@ -9,7 +9,6 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8; -import java.util.ArrayList; import java.util.List; import io.swagger.models.Model; @@ -26,6 +25,7 @@ import org.openmrs.module.webservices.rest.web.annotation.RepHandler; import org.openmrs.module.webservices.rest.web.annotation.Resource; import org.openmrs.module.webservices.rest.web.annotation.SubResource; +import org.openmrs.module.webservices.rest.web.api.RestHelperService; import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation; import org.openmrs.module.webservices.rest.web.representation.FullRepresentation; import org.openmrs.module.webservices.rest.web.representation.RefRepresentation; @@ -200,10 +200,8 @@ public void setParent(FieldAnswer instance, Field parent) { */ @Override public NeedsPaging doGetAll(Field parent, RequestContext context) throws ResponseException { - List fieldAnswers = new ArrayList(); - if (parent.getAnswers() != null) { - fieldAnswers.addAll(parent.getAnswers()); - } + List fieldAnswers = Context.getService(RestHelperService.class) + .getObjectsByFields(FieldAnswer.class, new RestHelperService.Field("field", parent)); return new NeedsPaging(fieldAnswers, context); } diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java index f2df83ed0f..ff2369be35 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/HL7MessageResource1_8.java @@ -125,7 +125,7 @@ public Model getCREATEModel(Representation rep) { /** * It needs to be overwritten to allow for hidden properties: source, sourceKey and data. They * are automatically extracted from the hl7 property and populated in - * {@link HL7MessageController1_8#create(String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)} + * {@link HL7MessageController1_8#create(String, jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)} * . They should not be POSTed by the user. * * @see org.openmrs.module.webservices.rest.web.resource.impl.BaseDelegatingResource#setConvertedProperties(Object, diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java index 454d1691bd..646a711fb5 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleActionResource1_8.java @@ -39,7 +39,7 @@ import org.openmrs.module.webservices.rest.web.response.ResourceDoesNotSupportOperationException; import org.openmrs.module.webservices.rest.web.response.ResponseException; import org.springframework.util.ResourceUtils; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.InputStream; import java.net.MalformedURLException; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java index fb3363f601..d585406ea0 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ModuleResource1_8.java @@ -34,7 +34,7 @@ import org.openmrs.web.WebUtil; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ObsResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ObsResource1_8.java index f6cdc1d2b2..874ccac171 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ObsResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ObsResource1_8.java @@ -21,7 +21,7 @@ import javax.xml.bind.DatatypeConverter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Concept; import org.openmrs.ConceptNumeric; import org.openmrs.Drug; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java index 777ea109fb..7260b9beb8 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PrivilegeResource1_8.java @@ -12,7 +12,7 @@ import io.swagger.models.Model; import io.swagger.models.ModelImpl; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Privilege; import org.openmrs.api.context.Context; import org.openmrs.module.webservices.rest.web.RequestContext; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RelationShipTypeResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RelationShipTypeResource1_8.java index 7424535290..9367021d29 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RelationShipTypeResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RelationShipTypeResource1_8.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.swagger.models.Model; import io.swagger.models.ModelImpl; import io.swagger.models.properties.IntegerProperty; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java index 9da39a53dc..2177133d0e 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/RoleResource1_8.java @@ -14,7 +14,7 @@ import io.swagger.models.properties.ArrayProperty; import io.swagger.models.properties.RefProperty; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Privilege; import org.openmrs.Role; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/UserResource1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/UserResource1_8.java index 585cd86c15..81f7ccedc7 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/UserResource1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/UserResource1_8.java @@ -17,7 +17,7 @@ import java.util.Set; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Role; import org.openmrs.User; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/BaseAttributeCrudResource1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/BaseAttributeCrudResource1_9.java index fb4bc4b215..2e9d1938ac 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/BaseAttributeCrudResource1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/BaseAttributeCrudResource1_9.java @@ -16,7 +16,7 @@ import io.swagger.models.ModelImpl; import io.swagger.models.properties.BooleanProperty; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.attribute.Attribute; import org.openmrs.customdatatype.CustomDatatype; import org.openmrs.customdatatype.CustomDatatypeUtil; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java index 420153e677..bc0f560abc 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptMapResource1_9.java @@ -12,7 +12,7 @@ import io.swagger.models.Model; import io.swagger.models.ModelImpl; import io.swagger.models.properties.RefProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.ConceptMap; import org.openmrs.module.webservices.rest.web.RestConstants; import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptStopwordResource1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptStopwordResource1_9.java index eca8ea851d..a61797d597 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptStopwordResource1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ConceptStopwordResource1_9.java @@ -12,7 +12,7 @@ import io.swagger.models.Model; import io.swagger.models.ModelImpl; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.api.context.Context; import org.openmrs.module.webservices.rest.web.RequestContext; import org.openmrs.module.webservices.rest.web.RestConstants; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResourceResource1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResourceResource1_9.java index 83f6978eb3..19844a6c08 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResourceResource1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/FormResourceResource1_9.java @@ -13,7 +13,7 @@ import io.swagger.models.ModelImpl; import io.swagger.models.properties.RefProperty; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Form; import org.openmrs.FormResource; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/SystemSettingResource1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/SystemSettingResource1_9.java index ed029e9726..abbb5c4fa6 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/SystemSettingResource1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/SystemSettingResource1_9.java @@ -11,7 +11,7 @@ import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.GlobalProperty; import org.openmrs.api.APIException; import org.openmrs.api.AdministrationService; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/AdministrationLinksResource2_0.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/AdministrationLinksResource2_0.java index 0847e791f7..29a2718c4b 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/AdministrationLinksResource2_0.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/AdministrationLinksResource2_0.java @@ -18,7 +18,6 @@ import org.openmrs.messagesource.MessageSourceService; import org.openmrs.module.Extension; import org.openmrs.module.web.extension.AdministrationSectionExt; -import org.openmrs.module.webservices.helper.ModuleFactoryWrapper; import org.openmrs.module.webservices.rest.web.RequestContext; import org.openmrs.module.webservices.rest.web.RestConstants; import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter; @@ -32,6 +31,7 @@ import org.openmrs.module.webservices.rest.web.resource.impl.NeedsPaging; import org.openmrs.module.webservices.rest.web.response.ObjectNotFoundException; import org.openmrs.module.webservices.rest.web.response.ResponseException; +import org.openmrs.module.webservices.helper.ModuleFactoryWrapper; import org.openmrs.module.webservices.rest.web.v1_0.wrapper.AdministrationSectionLinks; import java.util.ArrayList; @@ -145,7 +145,7 @@ private AdministrationSectionLinks getAdministrationLinksForModule(String module List adminListsExtensions = moduleFactoryWrapper.getExtensions(ADMIN_LIST_POINT_ID); for (Extension adminListExtension : adminListsExtensions) { - if (adminListExtension instanceof AdministrationSectionExt && adminListExtension.getModuleId() + if (isAdminSectionExtension(adminListExtension) && adminListExtension.getModuleId() .equals(moduleId)) { return mapAdminListExtension(adminListExtension, messageSourceService); } @@ -161,7 +161,7 @@ private List getAllAdministrationLinks() { List adminListsExtensions = moduleFactoryWrapper.getExtensions(ADMIN_LIST_POINT_ID); for (Extension adminListExtension : adminListsExtensions) { - if (adminListExtension instanceof AdministrationSectionExt) { + if (isAdminSectionExtension(adminListExtension)) { modulesWithLinksList.add(mapAdminListExtension(adminListExtension, messageSourceService)); } } @@ -169,21 +169,23 @@ private List getAllAdministrationLinks() { return modulesWithLinksList; } + private boolean isAdminSectionExtension(Extension extension) { + return extension instanceof AdministrationSectionExt; + } + private AdministrationSectionLinks mapAdminListExtension(Extension extension, MessageSourceService messageSourceService) { - AdministrationSectionExt adminListExtension = (AdministrationSectionExt) extension; + AdministrationSectionExt adminExt = (AdministrationSectionExt) extension; - // map module title message key to its value - String title = messageSourceService.getMessage(adminListExtension.getTitle()); + String title = messageSourceService.getMessage(adminExt.getTitle()); - // map link titles to their values - Map links = adminListExtension.getLinks(); + Map links = adminExt.getLinks(); for (Map.Entry link : links.entrySet()) { link.setValue(messageSourceService.getMessage(link.getValue())); } AdministrationSectionLinks administrationSectionLinks = new AdministrationSectionLinks(); - administrationSectionLinks.setModuleId(adminListExtension.getModuleId()); + administrationSectionLinks.setModuleId(extension.getModuleId()); administrationSectionLinks.setTitle(title); administrationSectionLinks.setLinks(links); diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/AlertRecipientResource2_0.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/AlertRecipientResource2_0.java index 6990bb3611..60037d3a50 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/AlertRecipientResource2_0.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/AlertRecipientResource2_0.java @@ -15,7 +15,7 @@ import io.swagger.models.properties.DateTimeProperty; import io.swagger.models.properties.RefProperty; import io.swagger.models.properties.StringProperty; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.User; import org.openmrs.api.context.Context; import org.openmrs.module.webservices.rest.web.RequestContext; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptStateConversionResource2_0.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptStateConversionResource2_0.java index 13d6398f01..400f9537f4 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptStateConversionResource2_0.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/ConceptStateConversionResource2_0.java @@ -13,6 +13,7 @@ import io.swagger.models.ModelImpl; import io.swagger.models.properties.ArrayProperty; import io.swagger.models.properties.RefProperty; +import org.openmrs.Concept; import org.openmrs.ConceptStateConversion; import org.openmrs.api.context.Context; import org.openmrs.module.webservices.rest.web.RequestContext; @@ -78,6 +79,14 @@ public String getDisplayProperty(ConceptStateConversion delegate) { return delegate.toString(); } + @PropertyGetter("concept") + public Concept getConcept(ConceptStateConversion delegate) { + if (delegate.getConcept() != null) { + return Context.getConceptService().getConceptByUuid(delegate.getConcept().getUuid()); + } + return null; + } + @Override public DelegatingResourceDescription getCreatableProperties() throws ResourceDoesNotSupportOperationException { DelegatingResourceDescription description = new DelegatingResourceDescription(); diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java index 7d1d3e9760..9a73483fca 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.ConceptMapType; import org.openmrs.ConceptSource; import org.openmrs.Drug; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java index 563fdc4f74..fd7d37dd54 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Locale; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Drug; import org.openmrs.api.ConceptService; import org.openmrs.module.webservices.rest.web.RequestContext; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java index 272d3fa8b5..470881fe41 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.ConceptMapType; import org.openmrs.ConceptSource; import org.openmrs.Drug; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_11/LivingPatientSearchHandler1_11.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_11/LivingPatientSearchHandler1_11.java index 42a7536328..e8a0c89432 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_11/LivingPatientSearchHandler1_11.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_11/LivingPatientSearchHandler1_11.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Patient; import org.openmrs.api.context.Context; import org.openmrs.module.webservices.rest.web.RequestContext; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java index 7011625c7b..031307c495 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/ObservationSearchHandler1_8.java @@ -46,7 +46,7 @@ public class ObservationSearchHandler1_8 implements SearchHandler { private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/obs", Arrays.asList( - "1.8.* - 2.*"), Arrays.asList(new SearchQuery.Builder( + "1.8.* - 9.*"), Arrays.asList(new SearchQuery.Builder( "Allows you to find Observations by patient and concept").withRequiredParameters("patient") .withOptionalParameters("concept", "concepts", "answers", "groupingConcepts").build())); diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/PatientByIdentifierSearchHandler1_8.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/PatientByIdentifierSearchHandler1_8.java index 5fa0ae1d58..53b4df723e 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/PatientByIdentifierSearchHandler1_8.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/PatientByIdentifierSearchHandler1_8.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_8; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Patient; import org.openmrs.api.context.Context; import org.openmrs.module.webservices.rest.web.RequestContext; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermSearchHandler1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermSearchHandler1_9.java index a75a73a804..054b727a92 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermSearchHandler1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/ConceptReferenceTermSearchHandler1_9.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_9; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.ConceptReferenceTerm; import org.openmrs.ConceptSource; import org.openmrs.api.ConceptService; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/EncounterSearchHandler1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/EncounterSearchHandler1_9.java index 3245a3a0db..c943f2581f 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/EncounterSearchHandler1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/EncounterSearchHandler1_9.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_9; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Concept; import org.openmrs.ConceptDatatype; import org.openmrs.Encounter; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/LocationAttributeSearchHandler1_9.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/LocationAttributeSearchHandler1_9.java index 0dc7eda1e4..a46a460328 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/LocationAttributeSearchHandler1_9.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_9/LocationAttributeSearchHandler1_9.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_9; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.Location; import org.openmrs.LocationAttribute; import org.openmrs.api.context.Context; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_2/OrderSearchHandler2_2.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_2/OrderSearchHandler2_2.java index ae8edff6e0..0e8955dbfe 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_2/OrderSearchHandler2_2.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_2/OrderSearchHandler2_2.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs2_2; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.CareSetting; import org.openmrs.Concept; import org.openmrs.Order; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_3/OrderSearchHandler2_3.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_3/OrderSearchHandler2_3.java index 9a1a77fa55..b02252250c 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_3/OrderSearchHandler2_3.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs2_3/OrderSearchHandler2_3.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs2_3; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openmrs.CareSetting; import org.openmrs.Concept; import org.openmrs.Order; diff --git a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/wrapper/AdministrationSectionLinks.java b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/wrapper/AdministrationSectionLinks.java index 7963aad067..ec4f95ffd1 100644 --- a/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/wrapper/AdministrationSectionLinks.java +++ b/omod/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/wrapper/AdministrationSectionLinks.java @@ -18,9 +18,6 @@ * We're using it instead of {@link AdministrationSectionExt} for a few reasons: * - {@link AdministrationSectionExt} class doesn't support setters for its fields * so we cannot map their values, for example as we do with message keys. - * - Using {@link AdministrationSectionExt} as a Resource requires all Resource classes - * to have this class on their classpath, resulting in requirement to add legacyui-omod - * dependency to each module * - Using a custom wrapper gives us more flexibility when {@link AdministrationSectionExt} * would change in the future. */ diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/DelegatingCrudResourceTest.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/DelegatingCrudResourceTest.java index cbdd8ca9a5..4aef82ccbc 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/DelegatingCrudResourceTest.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/DelegatingCrudResourceTest.java @@ -17,7 +17,7 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/MockModuleFactoryWrapper.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/MockModuleFactoryWrapper.java index dad36c223d..c3b80a47f4 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/MockModuleFactoryWrapper.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/MockModuleFactoryWrapper.java @@ -14,7 +14,7 @@ import org.openmrs.module.webservices.helper.ModuleFactoryWrapper; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/api/impl/RestServiceImplTest.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/api/impl/RestServiceImplTest.java index df4e1dc9ac..96447a5cad 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/api/impl/RestServiceImplTest.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/api/impl/RestServiceImplTest.java @@ -494,7 +494,7 @@ public void getResourceBySupportedClass_shouldReturnResourceWithLowerOrderValueI public void getSearchHandler_shouldReturnSearchHandlerMatchingIdSetInGivenParameters() throws Exception { SearchHandler searchHandler = mock(SearchHandler.class); - SearchConfig searchConfig = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "Fuzzy search").withRequiredParameters("q").build()); when(searchHandler.getSearchConfig()).thenReturn(searchConfig); when(restHelperService.getRegisteredSearchHandlers()).thenReturn(asList(searchHandler)); @@ -537,12 +537,12 @@ public void getSearchHandler_shouldFailIfParametersContainASearchHandlerIdWhichC public void getSearchHandler_shouldFailIfTwoSearchHandlersForTheSameResourceHaveTheSameId() throws Exception { SearchHandler searchHandler1 = mock(SearchHandler.class); - SearchConfig searchConfig1 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig1 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler1.getSearchConfig()).thenReturn(searchConfig1); SearchHandler searchHandler2 = mock(SearchHandler.class); - SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler2.getSearchConfig()).thenReturn(searchConfig2); @@ -595,12 +595,12 @@ public void getSearchHandler_shouldReturnSearchHandlerProvidingAllRequestParamet throws Exception { SearchHandler searchHandler1 = mock(SearchHandler.class); - SearchConfig searchConfig1 = new SearchConfig("default", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig1 = new SearchConfig("default", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler1.getSearchConfig()).thenReturn(searchConfig1); SearchHandler searchHandler2 = mock(SearchHandler.class); - SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").build()); when(searchHandler2.getSearchConfig()).thenReturn(searchConfig2); @@ -657,12 +657,12 @@ public void getSearchHandler_shouldReturnDefaultSearchHandlerIfDefaultAndCustomS throws Exception { SearchHandler searchHandler1 = mock(SearchHandler.class); - SearchConfig searchConfig1 = new SearchConfig("default", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig1 = new SearchConfig("default", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler1.getSearchConfig()).thenReturn(searchConfig1); SearchHandler searchHandler2 = mock(SearchHandler.class); - SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler2.getSearchConfig()).thenReturn(searchConfig2); @@ -684,12 +684,12 @@ public void getSearchHandler_shouldFailIfTwoSearchHandlersMatchGivenResourceAndP throws Exception { SearchHandler searchHandler1 = mock(SearchHandler.class); - SearchConfig searchConfig1 = new SearchConfig("conceptByName", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig1 = new SearchConfig("conceptByName", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler1.getSearchConfig()).thenReturn(searchConfig1); SearchHandler searchHandler2 = mock(SearchHandler.class); - SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler2.getSearchConfig()).thenReturn(searchConfig2); @@ -930,17 +930,17 @@ public void getAllSearchHandlers_shouldReturnNullIfSearchHandlersHaveNotBeenInit public void getSearchHandlers_shouldReturnSearchHandlersForGivenResourceName() throws Exception { SearchHandler searchHandler1 = mock(SearchHandler.class); - SearchConfig searchConfig1 = new SearchConfig("default", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig1 = new SearchConfig("default", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler1.getSearchConfig()).thenReturn(searchConfig1); SearchHandler searchHandler2 = mock(SearchHandler.class); - SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").build()); when(searchHandler2.getSearchConfig()).thenReturn(searchConfig2); SearchHandler searchHandler3 = mock(SearchHandler.class); - SearchConfig searchConfig3 = new SearchConfig("default", "v1/order", "2.8.*", new SearchQuery.Builder("description") + SearchConfig searchConfig3 = new SearchConfig("default", "v1/order", "3.0.*", new SearchQuery.Builder("description") .withRequiredParameters("patient").build()); when(searchHandler3.getSearchConfig()).thenReturn(searchConfig3); @@ -1021,12 +1021,12 @@ public void getSearchHandlers_shouldReturnNullGivenNull() throws Exception { public void getSearchHandlers_shouldFailIfTwoSearchHandlersForTheSameResourceHaveTheSameId() throws Exception { SearchHandler searchHandler1 = mock(SearchHandler.class); - SearchConfig searchConfig1 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig1 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler1.getSearchConfig()).thenReturn(searchConfig1); SearchHandler searchHandler2 = mock(SearchHandler.class); - SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler2.getSearchConfig()).thenReturn(searchConfig2); @@ -1055,7 +1055,7 @@ public void initialize_shouldInitializeResourcesAndSearchHandlers() throws Excep when(openmrsClassScanner.getClasses(Resource.class, true)).thenReturn(resources); SearchHandler searchHandler1 = mock(SearchHandler.class); - SearchConfig searchConfig1 = new SearchConfig("default", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig1 = new SearchConfig("default", "v1/concept", "3.0.*", new SearchQuery.Builder( "Search for concepts").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler1.getSearchConfig()).thenReturn(searchConfig1); when(restHelperService.getRegisteredSearchHandlers()).thenReturn(asList(searchHandler1)); @@ -1171,12 +1171,12 @@ public void initialize_shouldFailIfTwoResourcesWithSameNameAndOrderAreFound() th public void initialize_shouldFailIfTwoSearchHandlersForTheSameResourceHaveTheSameId() throws Exception { SearchHandler searchHandler1 = mock(SearchHandler.class); - SearchConfig searchConfig1 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig1 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler1.getSearchConfig()).thenReturn(searchConfig1); SearchHandler searchHandler2 = mock(SearchHandler.class); - SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "2.8.*", new SearchQuery.Builder( + SearchConfig searchConfig2 = new SearchConfig("conceptByMapping", "v1/concept", "3.0.*", new SearchQuery.Builder( "description").withRequiredParameters("source").withOptionalParameters("code").build()); when(searchHandler2.getSearchConfig()).thenReturn(searchConfig2); diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseRestControllerTest.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseRestControllerTest.java index 4da6f61a09..9c69ebd109 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseRestControllerTest.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/BaseRestControllerTest.java @@ -16,7 +16,7 @@ import java.lang.reflect.Field; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.junit.Assert; @@ -64,7 +64,7 @@ public void before() throws NoSuchFieldException, SecurityException, IllegalArgu /** * @verifies return unauthorized if not logged in * @see BaseRestController#apiAuthenticationExceptionHandler(Exception, - * javax.servlet.http.HttpServletRequest, HttpServletResponse) + * jakarta.servlet.http.HttpServletRequest, HttpServletResponse) */ @Test public void apiAuthenticationExceptionHandler_shouldReturnUnauthorizedIfNotLoggedIn() throws Exception { @@ -78,7 +78,7 @@ public void apiAuthenticationExceptionHandler_shouldReturnUnauthorizedIfNotLogge /** * @verifies return forbidden if logged in * @see BaseRestController#apiAuthenticationExceptionHandler(Exception, - * javax.servlet.http.HttpServletRequest, HttpServletResponse) + * jakarta.servlet.http.HttpServletRequest, HttpServletResponse) */ @Test public void apiAuthenticationExceptionHandler_shouldReturnForbiddenIfLoggedIn() throws Exception { @@ -145,7 +145,7 @@ public void handleConversionException_shouldLogConversionErrorAsInfo() throws Ex @Test public void httpMessageNotReadableExceptionHandler_shouldReturnBadRequestIfEmptyBody() throws Exception { - controller.httpMessageNotReadableExceptionHandler(new HttpMessageNotReadableException(""), request, response); + controller.httpMessageNotReadableExceptionHandler(new HttpMessageNotReadableException("", (org.springframework.http.HttpInputMessage) null), request, response); assertThat(response.getStatus(), is(HttpServletResponse.SC_BAD_REQUEST)); } } diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/RestControllerTestUtils.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/RestControllerTestUtils.java index 154225fc01..674bf202f9 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/RestControllerTestUtils.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/RestControllerTestUtils.java @@ -12,7 +12,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -23,7 +23,7 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.openmrs.module.webservices.rest.OpenmrsPathMatcher; import org.openmrs.module.webservices.rest.SimpleObject; @@ -105,7 +105,6 @@ public MockHttpServletResponse handle(HttpServletRequest request) throws Excepti HandlerExecutionChain handlerExecutionChain = null; for (RequestMappingHandlerMapping handlerMapping : handlerMappings) { - handlerMapping.setPathMatcher(pathMatcher); handlerExecutionChain = handlerMapping.getHandler(request); if (handlerExecutionChain != null) { break; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/jupiter/RestControllerTestUtils.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/jupiter/RestControllerTestUtils.java index 530f76dc43..83992f609b 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/jupiter/RestControllerTestUtils.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/jupiter/RestControllerTestUtils.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -26,7 +26,7 @@ import java.io.StringWriter; import java.util.List; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.openmrs.module.webservices.rest.OpenmrsPathMatcher; import org.openmrs.module.webservices.rest.SimpleObject; import org.openmrs.module.webservices.rest.web.RestConstants; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/DrugReferenceMapController1_10Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/DrugReferenceMapController1_10Test.java index 1bbb80cff3..713fbf82eb 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/DrugReferenceMapController1_10Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/DrugReferenceMapController1_10Test.java @@ -39,7 +39,7 @@ public void before() throws Exception { @Override public String getURI() { - return "/drugreferencemap"; + return "drugreferencemap"; } @Override diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/OrderTypeController1_10Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/OrderTypeController1_10Test.java index a4704087e8..da956663a2 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/OrderTypeController1_10Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_10/OrderTypeController1_10Test.java @@ -19,7 +19,7 @@ import java.util.List; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.openmrs.OrderType; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_12/OrderSetController1_12Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_12/OrderSetController1_12Test.java index 4237da6358..648d779e19 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_12/OrderSetController1_12Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_12/OrderSetController1_12Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_12; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/CohortController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/CohortController1_8Test.java index fe6a1e651e..22b9f000ad 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/CohortController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/CohortController1_8Test.java @@ -11,7 +11,7 @@ import java.util.List; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/EncounterTypeController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/EncounterTypeController1_8Test.java index 8eeac176cb..6fc74c52bb 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/EncounterTypeController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/EncounterTypeController1_8Test.java @@ -16,7 +16,7 @@ import static org.junit.Assert.assertFalse; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.openmrs.EncounterType; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/LocationTagController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/LocationTagController1_8Test.java index e76ba02bf6..e9f65adee8 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/LocationTagController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/LocationTagController1_8Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_8; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PatientIdentifierTypeController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PatientIdentifierTypeController1_8Test.java index 6641229719..2fdc4f6456 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PatientIdentifierTypeController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PatientIdentifierTypeController1_8Test.java @@ -16,7 +16,7 @@ import static org.junit.Assert.assertFalse; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.openmrs.PatientIdentifierType; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PersonAttributeTypeController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PersonAttributeTypeController1_8Test.java index 213f1dbc05..5b6b3c5c85 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PersonAttributeTypeController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PersonAttributeTypeController1_8Test.java @@ -11,7 +11,7 @@ import java.util.List; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PrivilegeController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PrivilegeController1_8Test.java index eeb27bf6f8..c20805e0e4 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PrivilegeController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PrivilegeController1_8Test.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertNull; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.openmrs.Privilege; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/RoleController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/RoleController1_8Test.java index ff864c2162..36a0f2062f 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/RoleController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/RoleController1_8Test.java @@ -11,10 +11,10 @@ import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; @@ -64,7 +64,7 @@ public String getUuid() { } /** - * @see RoleController#create(SimpleObject, javax.servlet.http.HttpServletRequest, + * @see RoleController#create(SimpleObject, jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) * @verifies create a new Role */ @@ -90,7 +90,7 @@ public void createRole_shouldCreateANewRole() throws Exception { } /** - * @see RoleController#retrieve(String, javax.servlet.http.HttpServletRequest) + * @see RoleController#retrieve(String, jakarta.servlet.http.HttpServletRequest) * @verifies get a default representation of a Role */ @Test @@ -105,7 +105,7 @@ public void getRole_shouldGetADefaultRepresentationOfARole() throws Exception { } /** - * @see RoleController#retrieve(String, javax.servlet.http.HttpServletRequest) + * @see RoleController#retrieve(String, jakarta.servlet.http.HttpServletRequest) * @verifies get a full representation of a Role */ @Test @@ -121,7 +121,7 @@ public void getRole_shouldGetAFullRepresentationOfARole() throws Exception { } /** - * @see RoleController#update(String, SimpleObject, javax.servlet.http.HttpServletRequest, + * @see RoleController#update(String, SimpleObject, jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) * @verifies change a property on a Role */ @@ -141,7 +141,7 @@ public void updateRole_shouldChangeAPropertyOnARole() throws Exception { } /** - * @see RoleController#delete(String, String, javax.servlet.http.HttpServletRequest, + * @see RoleController#delete(String, String, jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) * @verifies void a Role */ @@ -181,7 +181,7 @@ public void shouldUnRetireARole() throws Exception { } /** - * @see RoleController#search(String, javax.servlet.http.HttpServletRequest, + * @see RoleController#search(String, jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) * @verifies return no results if there are no matching Roles */ @@ -198,7 +198,7 @@ public void findRoles_shouldReturnNoResultsIfThereAreNoMatchingRoles() throws Ex } /** - * @see RoleController#search(String, javax.servlet.http.HttpServletRequest, + * @see RoleController#search(String, jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) * @verifies find matching Roles */ @@ -218,7 +218,7 @@ public void findRoles_shouldFindMatchingRoles() throws Exception { } /** - * @see RoleController#getAll(javax.servlet.http.HttpServletRequest, HttpServletResponse) + * @see RoleController#getAll(jakarta.servlet.http.HttpServletRequest, HttpServletResponse) * @verifies get all Roles */ @Test diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/TaskDefinitionController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/TaskDefinitionController1_8Test.java index a2ce58687b..41e3a873bb 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/TaskDefinitionController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/TaskDefinitionController1_8Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_8; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/UserController1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/UserController1_8Test.java index 3d8f2af821..35496a789e 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/UserController1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/UserController1_8Test.java @@ -18,10 +18,10 @@ import java.util.Collections; import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ClobDatatypeStorageControllerTest.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ClobDatatypeStorageControllerTest.java index cef7a050c7..2870c383d8 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ClobDatatypeStorageControllerTest.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ClobDatatypeStorageControllerTest.java @@ -27,7 +27,7 @@ import java.sql.Connection; import java.sql.ResultSet; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; public class ClobDatatypeStorageControllerTest extends MainResourceControllerTest { diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptDatatypeController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptDatatypeController1_9Test.java index 3f15931bfb..f6a85c5f89 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptDatatypeController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptDatatypeController1_9Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptMapTypeController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptMapTypeController1_9Test.java index ab58d1cf4f..70af48a619 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptMapTypeController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptMapTypeController1_9Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.openmrs.ConceptMapType; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptReferenceTermController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptReferenceTermController1_9Test.java index e20696fe2e..923871675b 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptReferenceTermController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ConceptReferenceTermController1_9Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/DrugController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/DrugController1_9Test.java index d37efb91ea..f52816cead 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/DrugController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/DrugController1_9Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/EncounterController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/EncounterController1_9Test.java index 18119e25dd..272fd4384f 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/EncounterController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/EncounterController1_9Test.java @@ -9,9 +9,9 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/EncounterRoleController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/EncounterRoleController1_9Test.java index ed96fd8bff..d22f807139 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/EncounterRoleController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/EncounterRoleController1_9Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.openmrs.EncounterRole; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/FormResourceController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/FormResourceController1_9Test.java index 399176d842..3aa8d557fa 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/FormResourceController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/FormResourceController1_9Test.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.io.IOUtils; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/LocationAttributeTypeController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/LocationAttributeTypeController1_9Test.java index 8b28ca3e44..2be30b76c4 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/LocationAttributeTypeController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/LocationAttributeTypeController1_9Test.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.context.request.WebRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; public class LocationAttributeTypeController1_9Test extends MainResourceControllerTest { diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/LocationController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/LocationController1_9Test.java index 625df67615..74d4301371 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/LocationController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/LocationController1_9Test.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.List; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/PatientIdentifierController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/PatientIdentifierController1_9Test.java index c5eb3aa4e1..4a1df81521 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/PatientIdentifierController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/PatientIdentifierController1_9Test.java @@ -18,7 +18,7 @@ import static org.junit.Assert.fail; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.openmrs.PatientIdentifier; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/PersonAttributeController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/PersonAttributeController1_9Test.java index 62b09d647d..ed10d54bcb 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/PersonAttributeController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/PersonAttributeController1_9Test.java @@ -14,7 +14,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProgramController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProgramController1_9Test.java index 3023d66749..1d3a11c2ce 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProgramController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProgramController1_9Test.java @@ -13,7 +13,7 @@ import java.util.Map; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProviderAttributeTypeController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProviderAttributeTypeController1_9Test.java index de7b059f24..f7d2245b65 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProviderAttributeTypeController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProviderAttributeTypeController1_9Test.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.context.request.WebRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.util.List; public class ProviderAttributeTypeController1_9Test extends MainResourceControllerTest { diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProviderController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProviderController1_9Test.java index 013c6e240b..25aafe9931 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProviderController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/ProviderController1_9Test.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.context.request.WebRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9Test.java index 06323bad82..9687b3296f 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SessionController1_9Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs1_9; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -24,7 +24,7 @@ import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.List; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SystemSettingController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SystemSettingController1_9Test.java index 90b2726f73..76bf4a378d 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SystemSettingController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/SystemSettingController1_9Test.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.openmrs.GlobalProperty; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/VisitAttributeTypeController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/VisitAttributeTypeController1_9Test.java index baba4567ef..b51cc0b5a7 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/VisitAttributeTypeController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/VisitAttributeTypeController1_9Test.java @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Contains tests for {@link VisitAttributeTypeController} CRUD operations @@ -72,7 +72,7 @@ public void before() throws Exception { } /** - * @see VisitAttributeTypeController#create(SimpleObject, javax.servlet.http.HttpServletRequest, + * @see VisitAttributeTypeController#create(SimpleObject, jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) */ @Test @@ -87,7 +87,7 @@ public void create_shouldCreateANewVisitAttributeType() throws Exception { /** * @see VisitAttributeTypeController#update(String, SimpleObject, - * javax.servlet.http.HttpServletRequest, HttpServletResponse) + * jakarta.servlet.http.HttpServletRequest, HttpServletResponse) */ @Test public void update_shouldChangeAPropertyOnAVisitAttributeType() throws Exception { @@ -100,7 +100,7 @@ public void update_shouldChangeAPropertyOnAVisitAttributeType() throws Exception /** * @see VisitAttributeTypeController#delete(String, String, - * javax.servlet.http.HttpServletRequest, HttpServletResponse) + * jakarta.servlet.http.HttpServletRequest, HttpServletResponse) */ @Test public void delete_shouldRetireAVisitAttributeType() throws Exception { @@ -115,7 +115,7 @@ public void delete_shouldRetireAVisitAttributeType() throws Exception { } /** - * @see VisitAttributeTypeController#getAll(javax.servlet.http.HttpServletRequest, + * @see VisitAttributeTypeController#getAll(jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) */ @Test @@ -127,7 +127,7 @@ public void getAll_shouldGellVisitAttributeTypesIfIncludeAllIsSetToTrue() throws } /** - * @see VisitAttributeTypeController#search(String, javax.servlet.http.HttpServletRequest, + * @see VisitAttributeTypeController#search(String, jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) */ @Test @@ -138,7 +138,7 @@ public void search_shouldFindMatchingVisitAttributeTypesExcludingRetiredOnes() t } /** - * @see VisitAttributeTypeController#search(String, javax.servlet.http.HttpServletRequest, + * @see VisitAttributeTypeController#search(String, jakarta.servlet.http.HttpServletRequest, * HttpServletResponse) */ @Test @@ -150,7 +150,7 @@ public void search_shouldFindAllMatchingVisitAttributeTypesIfIncludeAllIsSetToTr } /** - * @See {@link VisitAttributeTypeController#purge(String, javax.servlet.http.HttpServletRequest, HttpServletResponse)} + * @See {@link VisitAttributeTypeController#purge(String, jakarta.servlet.http.HttpServletRequest, HttpServletResponse)} */ @Test public void purge_shouldPurgeAVisitAttributeType() throws Exception { diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/VisitController1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/VisitController1_9Test.java index af5a3b3975..f5084f9591 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/VisitController1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_9/VisitController1_9Test.java @@ -28,8 +28,8 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.bind.annotation.RequestMethod; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.temporal.ChronoUnit; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/AdministrationLinksController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/AdministrationLinksController2_0Test.java index 6f5d4966ce..0ccd4443d5 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/AdministrationLinksController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/AdministrationLinksController2_0Test.java @@ -20,7 +20,6 @@ import org.apache.commons.beanutils.PropertyUtils; import org.junit.Before; import org.junit.Test; -import org.openmrs.module.Extension; import org.openmrs.module.web.extension.AdministrationSectionExt; import org.openmrs.module.webservices.rest.SimpleObject; import org.openmrs.module.webservices.rest.test.Util; @@ -35,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestMethod; /** - * Tests Read operations for {@link AdministrationSectionExt} via web service calls + * Tests Read operations for administration links via web service calls */ public class AdministrationLinksController2_0Test extends MainResourceControllerTest { @@ -109,7 +108,7 @@ private void assertCorrectAtlasModuleLinks(Object result) } private void setupMockRestWsModuleAdminListExtension() { - Extension extension = new AdministrationSectionExt() { + AdministrationSectionExt extension = new AdministrationSectionExt() { @Override public String getTitle() { @@ -134,7 +133,7 @@ public String getPointId() { } private void setupMockAtlasModuleAdminListExtension() { - Extension extension = new AdministrationSectionExt() { + AdministrationSectionExt extension = new AdministrationSectionExt() { @Override public String getTitle() { diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ClearDbCacheController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ClearDbCacheController2_0Test.java index 66119cca5f..6ececa14d1 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ClearDbCacheController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ClearDbCacheController2_0Test.java @@ -15,11 +15,10 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import org.hibernate.Query; +import org.hibernate.query.Query; import org.hibernate.SessionFactory; import org.junit.Test; import org.openmrs.Location; -import org.openmrs.Person; import org.openmrs.PersonName; import org.openmrs.api.LocationService; import org.openmrs.api.PersonService; @@ -55,8 +54,8 @@ public void clearDbCache_shouldEvictTheEntityFromTheCaches() throws Exception { //Load the person so that the names are also stored in person names collection region personService.getPerson(name.getPerson().getPersonId()); //Let's have the name in a query cache - Query query = sessionFactory.getCurrentSession().createQuery("FROM PersonName WHERE personNameId = ?0"); - query.setInteger(0, 9351); + Query query = sessionFactory.getCurrentSession().createQuery("FROM PersonName WHERE personNameId = :id"); + query.setParameter("id", 9351); query.setCacheable(true); query.setCacheRegion(QUERY_REGION); query.list(); @@ -79,9 +78,9 @@ public void clearDbCache_shouldEvictAllEntitiesOfTheSpecifiedTypeFromTheCaches() //Load the persons so that the names are also stored in person names collection region personService.getPerson(name1.getPerson().getPersonId()).getNames(); personService.getPerson(name2.getPerson().getPersonId()).getNames(); - Query query = sessionFactory.getCurrentSession().createQuery("FROM PersonName WHERE personNameId IN (?0, ?1)"); - query.setInteger(0, name1.getPersonNameId()); - query.setInteger(1, name2.getPersonNameId()); + Query query = sessionFactory.getCurrentSession().createQuery("FROM PersonName WHERE personNameId IN (:id1, :id2)"); + query.setParameter("id1", name1.getPersonNameId()); + query.setParameter("id2", name2.getPersonNameId()); query.setCacheable(true); query.setCacheRegion(QUERY_REGION); query.list(); @@ -97,11 +96,6 @@ public void clearDbCache_shouldEvictAllEntitiesOfTheSpecifiedTypeFromTheCaches() assertEquals(HttpStatus.NO_CONTENT.value(), response.getStatus()); assertFalse(sessionFactory.getCache().containsEntity(PERSON_NAME_CLASS, ID_2)); assertFalse(sessionFactory.getCache().containsEntity(PERSON_NAME_CLASS, ID_8)); - //All persistent collections containing the names should have been discarded - assertNull(sessionFactory.getStatistics().getSecondLevelCacheStatistics(Person.class.getName() + ".names") - .getEntries().get(name1.getPerson().getPersonId())); - assertNull(sessionFactory.getStatistics().getSecondLevelCacheStatistics(Person.class.getName() + ".names") - .getEntries().get(name2.getPerson().getPersonId())); } @Test @@ -112,9 +106,9 @@ public void clearDbCache_shouldEvictAllEntitiesFromTheCaches() throws Exception personService.getPerson(name1.getPerson().getPersonId()).getNames(); personService.getPerson(name2.getPerson().getPersonId()).getNames(); locationService.getLocation(ID_2); - Query query = sessionFactory.getCurrentSession().createQuery("FROM PersonName WHERE personNameId IN (?0, ?1)"); - query.setInteger(0, name1.getPersonNameId()); - query.setInteger(1, name2.getPersonNameId()); + Query query = sessionFactory.getCurrentSession().createQuery("FROM PersonName WHERE personNameId IN (:id1, :id2)"); + query.setParameter("id1", name1.getPersonNameId()); + query.setParameter("id2", name2.getPersonNameId()); query.setCacheable(true); query.setCacheRegion(QUERY_REGION); query.list(); @@ -130,11 +124,6 @@ public void clearDbCache_shouldEvictAllEntitiesFromTheCaches() throws Exception assertFalse(sessionFactory.getCache().containsEntity(PERSON_NAME_CLASS, ID_2)); assertFalse(sessionFactory.getCache().containsEntity(PERSON_NAME_CLASS, ID_8)); assertFalse(sessionFactory.getCache().containsEntity(Location.class, ID_2)); - //All persistent collections containing the names should have been discarded - assertNull(sessionFactory.getStatistics().getSecondLevelCacheStatistics(Person.class.getName() + ".names") - .getEntries().get(name1.getPerson().getPersonId())); - assertNull(sessionFactory.getStatistics().getSecondLevelCacheStatistics(Person.class.getName() + ".names") - .getEntries().get(name2.getPerson().getPersonId())); } @Test diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptDatatypeController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptDatatypeController2_0Test.java index 57579d99d3..e97ed45d81 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptDatatypeController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptDatatypeController2_0Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs2_0; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptSourceController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptSourceController2_0Test.java index 851050fd19..3e93cc6275 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptSourceController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptSourceController2_0Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs2_0; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptStateConversionController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptStateConversionController2_0Test.java index 7dfb284913..efb21fcd7a 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptStateConversionController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ConceptStateConversionController2_0Test.java @@ -31,7 +31,25 @@ public class ConceptStateConversionController2_0Test extends MainResourceControl @Before public void setUp() { - Concept concept = Context.getConceptService().getConceptByUuid(RestTestConstants1_8.CONCEPT2_UUID); + ProgramWorkflowState state = createWorkflowState(RestTestConstants1_8.CONCEPT2_UUID); + ProgramWorkflow workflow = Context.getProgramWorkflowService().getWorkflowByUuid(RestTestConstants1_8.WORKFLOW_UUID); + + ConceptStateConversion conceptStateConversion = new ConceptStateConversion(); + conceptStateConversion.setConcept(state.getConcept()); + conceptStateConversion.setProgramWorkflow(workflow); + conceptStateConversion.setProgramWorkflowState(state); + + Context.getProgramWorkflowService().saveConceptStateConversion(conceptStateConversion); + uuid = conceptStateConversion.getUuid(); + } + + /** + * Creates a new ProgramWorkflowState for the given concept UUID, saves it, + * and returns a clean re-fetched instance. The flush/clear/re-fetch cycle + * is needed because Hibernate 6 is stricter about transient references. + */ + private ProgramWorkflowState createWorkflowState(String conceptUuid) { + Concept concept = Context.getConceptService().getConceptByUuid(conceptUuid); ProgramWorkflow workflow = Context.getProgramWorkflowService().getWorkflowByUuid(RestTestConstants1_8.WORKFLOW_UUID); ProgramWorkflowState state = new ProgramWorkflowState(); @@ -41,16 +59,16 @@ public void setUp() { workflow.addState(state); Context.getProgramWorkflowService().saveProgram(workflow.getProgram()); - Context.flushSession(); - - ConceptStateConversion conceptStateConversion = new ConceptStateConversion(); - conceptStateConversion.setConcept(concept); - conceptStateConversion.setProgramWorkflow(workflow); - conceptStateConversion.setProgramWorkflowState(state); - - Context.getProgramWorkflowService().saveConceptStateConversion(conceptStateConversion); - uuid = conceptStateConversion.getUuid(); + Context.clearSession(); + + workflow = Context.getProgramWorkflowService().getWorkflowByUuid(RestTestConstants1_8.WORKFLOW_UUID); + for (ProgramWorkflowState s : workflow.getStates()) { + if (concept.equals(s.getConcept())) { + return s; + } + } + throw new IllegalStateException("Could not find state for concept " + conceptUuid); } @Override @@ -74,18 +92,9 @@ public void shouldCreateStateConversion() throws Exception { int countBefore = service.getAllConceptStateConversions().size(); - Concept concept = Context.getConceptService().getConceptByUuid("0955b484-b364-43dd-909b-1fa3655eaad2"); + ProgramWorkflowState state = createWorkflowState("0955b484-b364-43dd-909b-1fa3655eaad2"); ProgramWorkflow workflow = service.getWorkflowByUuid(RestTestConstants1_8.WORKFLOW_UUID); - - ProgramWorkflowState state = new ProgramWorkflowState(); - state.setConcept(concept); - state.setInitial(true); - state.setTerminal(false); - - workflow.addState(state); - service.saveProgram(workflow.getProgram()); - - Context.flushSession(); + Concept concept = state.getConcept(); String json = "{\"concept\": \"" + concept.getUuid() + "\",\"programWorkflow\": \"" + workflow.getUuid() @@ -107,20 +116,11 @@ public void shouldCreateStateConversion() throws Exception { public void shouldPurgeStateConversion() throws Exception { ProgramWorkflowService service = Context.getProgramWorkflowService(); - Concept concept = Context.getConceptService().getConceptByUuid("0955b484-b364-43dd-909b-1fa3655eaad2"); - ProgramWorkflow workflow = Context.getProgramWorkflowService().getWorkflowByUuid(RestTestConstants1_8.WORKFLOW_UUID); - - ProgramWorkflowState state = new ProgramWorkflowState(); - state.setConcept(concept); - state.setInitial(true); - state.setTerminal(false); - - workflow.addState(state); - service.saveProgram(workflow.getProgram()); - Context.flushSession(); + ProgramWorkflowState state = createWorkflowState("0955b484-b364-43dd-909b-1fa3655eaad2"); + ProgramWorkflow workflow = service.getWorkflowByUuid(RestTestConstants1_8.WORKFLOW_UUID); ConceptStateConversion conceptStateConversion = new ConceptStateConversion(); - conceptStateConversion.setConcept(concept); + conceptStateConversion.setConcept(state.getConcept()); conceptStateConversion.setProgramWorkflow(workflow); conceptStateConversion.setProgramWorkflowState(state); service.saveConceptStateConversion(conceptStateConversion); diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/LoggedInUsersController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/LoggedInUsersController2_0Test.java index f7b7c8d827..605000997c 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/LoggedInUsersController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/LoggedInUsersController2_0Test.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs2_0; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; import org.openmrs.module.webservices.rest.web.v1_0.controller.RestControllerTestUtils; import org.openmrs.web.WebConstants; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/NameTemplateController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/NameTemplateController2_0Test.java index 1965b4b491..01586910e8 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/NameTemplateController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/NameTemplateController2_0Test.java @@ -11,9 +11,11 @@ import java.io.IOException; import java.io.InputStream; +import java.util.List; +import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ProgramWorkflowStateController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ProgramWorkflowStateController2_0Test.java index 40655ad71d..1c5881bd6e 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ProgramWorkflowStateController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/ProgramWorkflowStateController2_0Test.java @@ -24,7 +24,7 @@ public class ProgramWorkflowStateController2_0Test extends MainResourceControlle @Override public String getURI() { - return "workflow/" + RestTestConstants1_8.WORKFLOW_UUID + "/state/"; + return "workflow/" + RestTestConstants1_8.WORKFLOW_UUID + "/state"; } @Override diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/UserController2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/UserController2_0Test.java index 12df377263..50eadd32d3 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/UserController2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_0/UserController2_0Test.java @@ -11,10 +11,10 @@ import java.util.List; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_1/ConceptSourceController2_1Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_1/ConceptSourceController2_1Test.java index c72b4bda91..f753677892 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_1/ConceptSourceController2_1Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_1/ConceptSourceController2_1Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs2_1; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_1/PersonNameController2_1Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_1/PersonNameController2_1Test.java index fdbb9eabd5..a78b849c46 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_1/PersonNameController2_1Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_1/PersonNameController2_1Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs2_1; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/ConditionController2_2Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/ConditionController2_2Test.java index 1e574bd65f..99fcbb6396 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/ConditionController2_2Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/ConditionController2_2Test.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.controller.openmrs2_2; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/DiagnosisController2_2Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/DiagnosisController2_2Test.java index 4d11849be7..f72e0b2efb 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/DiagnosisController2_2Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/DiagnosisController2_2Test.java @@ -15,7 +15,7 @@ import java.util.List; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/PasswordResetController2_2Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/PasswordResetController2_2Test.java index 36748a1eba..daa8928fe1 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/PasswordResetController2_2Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs2_2/PasswordResetController2_2Test.java @@ -122,7 +122,7 @@ public void resetPassword_shouldResetUserPasswordIfActivationKeyIsCorrect() thro credentials .setActivationKey("b071c88d6d877922e35af2e6a90dd57d37ac61143a03bb986c5f353566f3972a86ce9b2604c31a22dfa467922dcfd54fa7d18b0a7c7648d94ca3d97a88ea2fd0:" + tokenTime); - dao.updateLoginCredential(credentials); + dao.setUserActivationKey(credentials); String newPassword = "newPasswordString123"; MockHttpServletResponse response = handle(newPostRequest(RESET_PASSWORD_URI + "/" + key, "{\"newPassword\":\"" + newPassword + "\"}")); diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10Test.java index 110a0b2886..d98f2c1894 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10Test.java @@ -10,7 +10,7 @@ package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_10; import org.apache.commons.beanutils.PropertyUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8Test.java index dabbed2df7..b5a0b680b9 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8Test.java @@ -27,7 +27,7 @@ public FieldAnswer newObject() { Field field = Context.getFormService().getFieldByUuid(RestTestConstants1_8.FIELD_UUID); FieldAnswer fieldAnswer = new FieldAnswer(); fieldAnswer.setConcept(Context.getConceptService().getConceptByUuid(RestTestConstants1_8.CONCEPT_UUID)); - field.addAnswer(fieldAnswer); + fieldAnswer.setField(field); fieldAnswerUUID = fieldAnswer.getUuid(); @@ -39,7 +39,7 @@ public FieldAnswer newObject() { */ @Override public String getDisplayProperty() { - return "Null Field - YES"; + return "Some concept - YES"; } /** diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8Test.java index 5417167e5e..1682bee2bd 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/PersonAttributeResource1_8Test.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ServerLogResource1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ServerLogResource1_8Test.java index f5a647783e..c71c5bc8a4 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ServerLogResource1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ServerLogResource1_8Test.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8; -import org.apache.struts.mock.MockHttpServletResponse; +import org.springframework.mock.web.MockHttpServletResponse; import org.junit.Assert; import org.junit.Test; import org.openmrs.module.webservices.helper.ServerLogActionWrapper; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/SystemInformationResource1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/SystemInformationResource1_8Test.java index b03012a5bc..dd88e65b73 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/SystemInformationResource1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/SystemInformationResource1_8Test.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8; -import org.apache.struts.mock.MockHttpServletResponse; +import org.springframework.mock.web.MockHttpServletResponse; import org.junit.Assert; import org.junit.Test; import org.openmrs.module.webservices.rest.SimpleObject; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/UpdateUserResource1_8Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/UpdateUserResource1_8Test.java index c939146d97..478ef47072 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/UpdateUserResource1_8Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/UpdateUserResource1_8Test.java @@ -9,7 +9,7 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CreatePatientIdentifierResource1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CreatePatientIdentifierResource1_9Test.java index 7f305d4769..27b75caaa6 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CreatePatientIdentifierResource1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CreatePatientIdentifierResource1_9Test.java @@ -11,7 +11,7 @@ import java.util.HashMap; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CreateUpdatePatientResource1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CreateUpdatePatientResource1_9Test.java index 3ef92fbba3..aed5179169 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CreateUpdatePatientResource1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/CreateUpdatePatientResource1_9Test.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ObsResource1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ObsResource1_9Test.java index 6db41c2165..d1e57c5145 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ObsResource1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/ObsResource1_9Test.java @@ -346,6 +346,6 @@ public void setConvertedProperties_shouldAllowAnyPropertyOrder() throws Exceptio propertyMap.put("obsDatetime", "2013-12-09T00:00:00.000+0100"); resource.setConvertedProperties(obs, propertyMap, resource.getUpdatableProperties(), false); - org.springframework.util.Assert.isTrue(((Double) new ObsResource2_1().getValue(obs)) == 10.0); + org.springframework.util.Assert.isTrue(((Double) new ObsResource2_1().getValue(obs)) == 10.0, "Expected obs value to be 10.0"); } } diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/UserResource1_9Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/UserResource1_9Test.java index 8dc25eee46..86abdb1931 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/UserResource1_9Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_9/UserResource1_9Test.java @@ -13,7 +13,7 @@ import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Test; import org.openmrs.api.context.Context; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/NameTemplateResource2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/NameTemplateResource2_0Test.java index d9669628cd..b76cda5222 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/NameTemplateResource2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/NameTemplateResource2_0Test.java @@ -9,14 +9,19 @@ */ package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs2_0; +import org.openmrs.api.context.Context; import org.openmrs.layout.name.NameSupport; import org.openmrs.layout.name.NameTemplate; import org.openmrs.module.webservices.rest.web.resource.impl.BaseDelegatingResourceTest; +import static org.openmrs.util.OpenmrsConstants.GLOBAL_PROPERTY_LAYOUT_NAME_FORMAT; +import static org.openmrs.util.OpenmrsConstants.PERSON_NAME_FORMAT_SHORT; + public class NameTemplateResource2_0Test extends BaseDelegatingResourceTest { @Override public NameTemplate newObject() { + Context.getAdministrationService().setGlobalProperty(GLOBAL_PROPERTY_LAYOUT_NAME_FORMAT, PERSON_NAME_FORMAT_SHORT); return NameSupport.getInstance().getDefaultLayoutTemplate(); } diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/UserResource2_0Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/UserResource2_0Test.java index 212d40fc4b..8d7c97dba7 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/UserResource2_0Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_0/UserResource2_0Test.java @@ -13,7 +13,7 @@ import java.util.Collection; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Test; import org.openmrs.api.context.Context; diff --git a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_4/ServerLogResource2_4Test.java b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_4/ServerLogResource2_4Test.java index 03e2feb05c..f50b9def41 100644 --- a/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_4/ServerLogResource2_4Test.java +++ b/omod/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs2_4/ServerLogResource2_4Test.java @@ -15,7 +15,7 @@ import java.util.ArrayList; -import org.apache.struts.mock.MockHttpServletResponse; +import org.springframework.mock.web.MockHttpServletResponse; import org.junit.jupiter.api.Test; import org.openmrs.module.webservices.helper.ServerLogActionWrapper; import org.openmrs.module.webservices.helper.openmrs2_4.ServerLogActionWrapper2_4; diff --git a/omod/src/test/resources/customTestDataset.xml b/omod/src/test/resources/customTestDataset.xml index a96f12876c..d063225035 100644 --- a/omod/src/test/resources/customTestDataset.xml +++ b/omod/src/test/resources/customTestDataset.xml @@ -45,8 +45,8 @@ - - + + diff --git a/omod/src/test/resources/taskSchedulerDataset.xml b/omod/src/test/resources/taskSchedulerDataset.xml index 401e77b952..0b7aa929d5 100644 --- a/omod/src/test/resources/taskSchedulerDataset.xml +++ b/omod/src/test/resources/taskSchedulerDataset.xml @@ -11,8 +11,8 @@ --> - - - - + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 03d2c03154..ca7c4ce340 100644 --- a/pom.xml +++ b/pom.xml @@ -39,15 +39,15 @@ UTF-8 - 2.8.3 - 1.8 - 1.8 + 3.0.0-SNAPSHOT + 21 + 21 ${project.parent.artifactId} ${project.name} ${project.parent.version} ${project.parent.groupId}.${project.parent.artifactId} - 6.0.53 + 11.0.5 4.0.1 2.19.1 @@ -90,31 +90,12 @@ pom ${openmrs.version} test - - - - - - org.mockito - mockito-core - - org.openmrs.web openmrs-web ${openmrs.version} provided - - - javax.servlet - servlet-api - - - javax.servlet - jsp-api - - org.openmrs.web @@ -122,16 +103,6 @@ ${openmrs.version} test-jar test - - - javax.servlet - servlet-api - - - javax.servlet - jsp-api - - org.openmrs.tools @@ -146,9 +117,9 @@ compile - javax.servlet - javax.servlet-api - ${javaxVersion} + jakarta.servlet + jakarta.servlet-api + 6.1.0 provided @@ -178,15 +149,9 @@ org.openmrs.module legacyui-omod - 1.23.0 + 3.0.0-SNAPSHOT provided - - org.mockito - mockito-core - 3.12.4 - test - @@ -225,8 +190,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api provided @@ -251,11 +216,6 @@ jackson-databind provided - - org.mockito - mockito-core - test - @@ -307,9 +267,10 @@ maven-compiler-plugin 3.14.0 - 8 - 8 + 21 + 21 UTF-8 + true