IDGEN-134: Update to OpenMRS Platform 2.8.x and Support Java 21 (#130)

Author: wikumChamith

.github/workflows/build-omod.yml

@@ -9,5 +9,5 @@ jobs:
   build:
     uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-backend-module.yml@main
     with:
-       java_versions: "[8]"
+       java_versions: "[8, 11, 17, 21]"
        main_java_version: "8"

api/pom.xml

@@ -3,22 +3,12 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>idgen</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>6.0.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.openmrs.module</groupId>
 	<artifactId>idgen-api</artifactId>
 	<packaging>jar</packaging>
 	<name>ID Generation API</name>
 	<description>API project for ID Generation</description>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.5.0</version>
-			<type>jar</type>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-	
 </project>

api/src/main/java/org/openmrs/module/idgen/BaseIdentifierSource.java

@@ -17,7 +17,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.User;
 

api/src/main/java/org/openmrs/module/idgen/IdentifierPool.java

@@ -13,14 +13,14 @@
  */
 package org.openmrs.module.idgen;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-
 /**
  * Identifier Source which contains a pre-generated pool of identifiers,
  * and which typically is used in conjunction with another IdentifierSource 

api/src/main/java/org/openmrs/module/idgen/PooledIdentifier.java

@@ -13,10 +13,11 @@
  */
 package org.openmrs.module.idgen;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.Date;
 import java.util.UUID;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
 /**
  * Component which encapsulates an identifier that has been allocated to an Identifier Pool

api/src/main/java/org/openmrs/module/idgen/processor/RemoteIdentifierSourceProcessor.java

@@ -28,7 +28,7 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.openmrs.module.idgen.IdentifierSource;
 import org.openmrs.module.idgen.RemoteIdentifierSource;
 import org.openmrs.module.idgen.RemoteIdentifiersMessage;

api/src/main/java/org/openmrs/module/idgen/service/IdentifierSourceService.java

@@ -27,7 +27,7 @@
 import org.openmrs.module.idgen.PooledIdentifier;
 import org.openmrs.module.idgen.SequentialIdentifierGenerator;
 import org.openmrs.module.idgen.processor.IdentifierSourceProcessor;
-import org.openmrs.util.OpenmrsConstants;
+import org.openmrs.util.PrivilegeConstants;
 
 import java.util.Date;
 import java.util.List;
@@ -107,21 +107,21 @@ public interface IdentifierSourceService extends OpenmrsService {
 	 * Given a PatientIdentifierType, generates an identifier using the proper IdentifierSource for this server
 	 * Returns null if this PatientIdentifierType is not set to be auto-generated
 	 */
-	@Authorized(OpenmrsConstants.PRIV_EDIT_PATIENT_IDENTIFIERS)
+	@Authorized(PrivilegeConstants.EDIT_PATIENT_IDENTIFIERS)
 	String generateIdentifier(PatientIdentifierType type, String comment);
 
     /**
      * Given a PatientIdentifierType and Location, generates an identifier using the proper IdentifierSource
      * Returns null if this PatientIdentifierType is not set to be auto-generated
      */
-	@Authorized(OpenmrsConstants.PRIV_EDIT_PATIENT_IDENTIFIERS)
+	@Authorized(PrivilegeConstants.EDIT_PATIENT_IDENTIFIERS)
     String generateIdentifier(PatientIdentifierType type, Location location, String comment);
 
 	/**
 	 * Generates a Single Identifiers from the given source
 	 * @throws APIException
 	 */
-	@Authorized(OpenmrsConstants.PRIV_EDIT_PATIENT_IDENTIFIERS)
+	@Authorized(PrivilegeConstants.EDIT_PATIENT_IDENTIFIERS)
 	String generateIdentifier(IdentifierSource source, String comment) throws APIException;
 
 	/**

api/src/main/java/org/openmrs/module/idgen/service/db/HibernateIdentifierSourceDAO.java

@@ -312,7 +312,7 @@ public Long getSequenceValue(SequentialIdentifierGenerator generator) {
 
 
     public void refreshIdentifierSource(IdentifierSource source) {
-        sessionFactory.getCurrentSession().refresh(source);
+		sessionFactory.getCurrentSession().refresh(source);
     }
 
 

api/src/test/java/org/openmrs/module/idgen/IdgenBaseTest.java

@@ -1,28 +1,16 @@
 package org.openmrs.module.idgen;
 
-import org.hibernate.cfg.Environment;
-import org.junit.Before;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
-
-import java.util.Properties;
+import org.junit.jupiter.api.BeforeEach;
+import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
 
 /**
  * Base class that can be used for an common functionality or modifications to the standard base module context sensitive test
  */
 public abstract class IdgenBaseTest extends BaseModuleContextSensitiveTest {
 
-    @Before
-    public void setupActivator() {
+    @BeforeEach
+    public void before() {
         new IdgenModuleActivator().started();
     }
 
-    @Override
-    public Properties getRuntimeProperties() {
-        Properties props = super.getRuntimeProperties();
-        String url = props.getProperty(Environment.URL);
-        if (url.contains("jdbc:h2:") && !url.toLowerCase().contains(";mvcc=true")) {
-            props.setProperty(Environment.URL, url + ";mvcc=true");
-        }
-        return props;
-    }
 }

api/src/test/java/org/openmrs/module/idgen/SequentialIdentifierGeneratorTest.java

@@ -3,13 +3,14 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.openmrs.Location;
 import org.openmrs.LocationAttribute;
 import org.openmrs.LocationAttributeType;
@@ -20,19 +21,21 @@
 import org.openmrs.module.idgen.prefixprovider.PrefixProvider;
 import org.openmrs.module.idgen.suffixprovider.LocationBasedSuffixProvider;
 import org.openmrs.module.idgen.suffixprovider.SuffixProvider;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 /**
  * test class for {@link SequentialIdentifierGenerator}
  */
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(Context.class)
 public class SequentialIdentifierGeneratorTest {
-		
+
+	private MockedStatic<Context> mockedContext;
 	@Before
 	public void setup() {
-		mockStatic(Context.class);
+		mockedContext = mockStatic(Context.class);
+	}
+
+	@After
+	public void teardown() {
+		mockedContext.close();
 	}
 
 	/**