Merge branch 'master' into TRUNK-6469

Author: wikumChamith

.github/workflows/build-2.x.yaml

@@ -28,7 +28,7 @@ jobs:
           - 8
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup JDK
         uses: actions/setup-java@v5
         with:

.github/workflows/build.yaml

@@ -31,7 +31,7 @@ jobs:
           #  java-version: 24
     runs-on: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup JDK
         uses: actions/setup-java@v5
         with:

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/scorecard.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 

.github/workflows/tx-pull.yml

@@ -15,15 +15,15 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: 🌐 Push source file using transifex client
         uses: transifex/cli-action@v2
         with:
           token: ${{ secrets.TRANSIFEX_TOKEN }}
           args: pull --force --all
       - name: 🔄 Create PR if necessary
         id: cpr
-        uses: peter-evans/[email protected].8
+        uses: peter-evans/[email protected].9
         with:
           commit-message: "(chore) Update translations from Transifex"
           title: "(chore) Update translations from Transifex"

.github/workflows/tx-push.yml

@@ -14,7 +14,7 @@ jobs:
       actions: read
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: 📥 Push source file using transifex client
         uses: transifex/cli-action@v2
         with:

api/pom.xml

@@ -296,6 +296,18 @@
 			<groupId>software.amazon.awssdk</groupId>
 			<artifactId>s3</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.graalvm.js</groupId>
+			<artifactId>js</artifactId>
+			<type>pom</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.graalvm.js</groupId>
+			<artifactId>js-scriptengine</artifactId>
+			<type>pom</type>
+		</dependency>
 	</dependencies>
 	<build>
 		<resources>

api/src/main/java/org/openmrs/ConceptDescription.java

@@ -9,6 +9,14 @@
  */
 package org.openmrs;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.hibernate.envers.Audited;
 
 import java.util.Date;
@@ -18,25 +26,40 @@
  * ConceptDescription is the localized description of a concept.
  */
 @Audited
+@Entity
+@Table(name = "concept_description")
 public class ConceptDescription extends BaseOpenmrsObject implements Auditable, java.io.Serializable {
 
 	private static final long serialVersionUID = -7223075113369136584L;
 
 	// Fields
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "concept_description_id", nullable = false)
 	private Integer conceptDescriptionId;
-	
+
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "concept_id", nullable = false)
 	private Concept concept;
-	
+
+	@Column(name = "description", nullable = false, length = 65535, columnDefinition = "text")
 	private String description;
-	
+
+	@Column(name = "locale", nullable = false, length = 50)
 	private Locale locale;
-	
+
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "creator", nullable = false)
 	private User creator;
-	
+
+	@Column(name = "date_created", nullable = false)
 	private Date dateCreated;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "changed_by")
 	private User changedBy;
-	
+
+	@Column(name = "date_changed")
 	private Date dateChanged;
 
 	// Constructors

api/src/main/java/org/openmrs/ProviderAttribute.java

@@ -9,6 +9,14 @@
  */
 package org.openmrs;
 
+import jakarta.persistence.AssociationOverride;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Table;
 import org.hibernate.envers.Audited;
 import org.openmrs.attribute.Attribute;
 import org.openmrs.attribute.BaseAttribute;
@@ -20,8 +28,17 @@
  * @since 1.9
  */
 @Audited
+@Entity
+@Table(name="provider_attribute")
+@AssociationOverride(
+	name="owner",
+	joinColumns = @JoinColumn(name="provider_id", nullable = false)
+)
 public class ProviderAttribute extends BaseAttribute<ProviderAttributeType, Provider> implements Attribute<ProviderAttributeType, Provider> {
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "provider_attribute_id")
 	private Integer providerAttributeId;
 
 	public Integer getProviderAttributeId() {

api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java

@@ -11,6 +11,7 @@
 
 import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.Locale;
 
 import org.apache.commons.lang3.StringUtils;
 import org.openmrs.User;
@@ -122,7 +123,7 @@ public void before(Method method, Object[] args, Object target) throws Throwable
 	private void throwUnauthorized(User user, Method method, Collection<String> attrs) {
 		log.debug(USER_IS_NOT_AUTHORIZED_TO_ACCESS, user, method.getName());
 		throw new APIAuthenticationException(Context.getMessageSourceService().getMessage("error.privilegesRequired",
-		    new Object[] { StringUtils.join(attrs, ",") }, null));
+		    new Object[] { StringUtils.join(attrs, ",") }, Locale.getDefault()));
 	}
 
 	/**
@@ -135,7 +136,7 @@ private void throwUnauthorized(User user, Method method, Collection<String> attr
 	private void throwUnauthorized(User user, Method method, String attr) {
 		log.debug(USER_IS_NOT_AUTHORIZED_TO_ACCESS, user, method.getName());
 		throw new APIAuthenticationException(Context.getMessageSourceService().getMessage("error.privilegesRequired",
-		    new Object[] { attr }, null));
+		    new Object[] { attr }, Locale.getDefault()));
 	}
 
 	/**