Merge branch 'master' into TRUNK-5861

Author: pidsonn

.github/workflows/scorecard.yml

@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/[email protected].1
+        uses: ossf/[email protected].2
         with:
           results_file: results.sarif
           results_format: sarif

Dockerfile

@@ -35,6 +35,9 @@ COPY liquibase/pom.xml liquibase/
 COPY api/pom.xml api/
 COPY web/pom.xml web/
 COPY webapp/pom.xml webapp/
+COPY test-module/pom.xml test-module/
+COPY test-module/api/pom.xml test-module/api/
+COPY test-module/omod/pom.xml test-module/omod/
 
 # Install dependencies
 RUN mvn $MVN_SETTINGS -B dependency:go-offline -P !default-tools.jar,!mac-tools.jar

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

@@ -9,8 +9,19 @@
  */
 package org.openmrs;
 
+import org.hibernate.annotations.BatchSize;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -20,34 +31,55 @@
  *
  * @see Concept#getAnswers()
  */
+@Entity
+@Table(name = "concept_answer")
+@BatchSize(size = 25)
 @Audited
 public class ConceptAnswer extends BaseOpenmrsObject implements Auditable, java.io.Serializable, Comparable<ConceptAnswer> {
 
 	public static final long serialVersionUID = 3744L;
 
 	// Fields
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "concept_answer_id_seq")
+	@GenericGenerator(
+			name = "concept_answer_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "concept_answer_concept_answer_id_seq")
+	)
+	@Column(name = "concept_answer_id")
 	private Integer conceptAnswerId;
 
 	/**
 	 * The question concept that this object is answering
 	 */
+	@ManyToOne
+	@JoinColumn(name = "concept_id", nullable = false)
 	private Concept concept;
 
 	/**
 	 * The answer to the question
 	 */
+	@ManyToOne
+	@JoinColumn(name = "answer_concept", nullable = false)
 	private Concept answerConcept;
 
 	/**
 	 * The {@link Drug} answer to the question. This can be null if this does not represent a drug
 	 * type of answer
 	 */
+	@ManyToOne
+	@JoinColumn(name = "answer_drug")
 	private Drug answerDrug;
 
+	@ManyToOne
+	@JoinColumn(name = "creator", nullable = false)
 	private User creator;
 
+	@Column(name = "date_created", nullable = false)
 	private Date dateCreated;
 
+	@Column(name = "sort_weight")
 	private Double sortWeight;
 
 	// Constructors

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

@@ -12,12 +12,27 @@
 import java.util.Date;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 import org.openmrs.customdatatype.CustomDatatypeUtil;
 import org.openmrs.customdatatype.CustomValueDescriptor;
 import org.openmrs.customdatatype.NotYetPersistedException;
 import org.openmrs.customdatatype.SingleCustomValue;
 
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.AttributeOverride;
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.ManyToOne;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+
 /**
  * A FormResource is meant as a way for modules to add arbitrary information to
  * a Form. FormResources are essentially just key-value pairs. The value is
@@ -30,33 +45,59 @@
  *
  * @since 1.9
  */
+@Entity
+@Table(name = "form_resource")
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+@AttributeOverride(name = "uuid", column = @Column(name = "uuid", unique = true, nullable = false, length = 38))
 @Audited
 public class FormResource extends BaseOpenmrsObject implements CustomValueDescriptor, SingleCustomValue<FormResource> {
 
 	private static final long serialVersionUID = 1L;
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "form_resource_form_resource_id_seq")
+	@GenericGenerator(
+		name = "form_resource_form_resource_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "form_resource_form_resource_id_seq")
+	)
+	@Column(name = "form_resource_id")
 	private Integer formResourceId;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "form_id", nullable = false)
 	private Form form;
-	
+
+	@Column(name = "name", length = 255, nullable = true)
 	private String name;
-	
+
+	@Lob
+	@Column(name = "value_reference", length = 65535, nullable = true)
 	private String valueReference;
-	
+
+	@Column(name = "datatype", length = 255)
 	private String datatypeClassname;
-	
+
+	@Lob
+	@Column(name = "datatype_config", length = 65535)
 	private String datatypeConfig;
-	
+
+	@Column(name = "preferred_handler", length = 255)
 	private String preferredHandlerClassname;
-	
+
+	@Lob
+	@Column(name = "handler_config", length = 65535)
 	private String handlerConfig;
 
 	private transient boolean dirty = false;
 
 	private transient Object typedValue;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "changed_by")
 	private User changedBy;
 
+	@Column(name = "date_changed", length = 19)
 	private Date dateChanged;
 
 	public FormResource() {

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

@@ -32,6 +32,8 @@ public class Provider extends BaseCustomizableMetadata<ProviderAttribute> {
 	private Concept role;
 
 	private Concept speciality;
+
+	private ProviderRole providerRole;
 
 	public Provider() {
 	}
@@ -137,6 +139,26 @@ public void setSpeciality(Concept speciality) {
 	public Concept getSpeciality() {
 		return speciality;
 	}
+
+	/**
+	 * Gets the provider role
+	 * 
+	 * @since 2.8.0
+	 * @return the provider role
+	 */
+	public ProviderRole getProviderRole() {
+		return providerRole;
+	}
+
+	/**
+	 * Sets the provider role
+	 * 
+	 * @since 2.8.0
+	 * @param providerRole the provider role to set
+	 */
+	public void setProviderRole(ProviderRole providerRole) {
+		this.providerRole = providerRole;
+	}
 
 	@Override
 	public String toString() {

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

@@ -0,0 +1,70 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ *
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
+package org.openmrs;
+
+import org.openmrs.annotation.OpenmrsProfile;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * Used to store the possible provider roles.  A Provide can only have a single role (though a single person
+ * could be associated with more than one Provider object).
+ * <p>
+ * A provider role specifies what Provider/Patient relationships a provider with that role can support,
+ * as well as the provider roles that another provider role can provider oversight for.
+ * <p>
+ * For example, a "Community Health Worker" role might support an "Accompagnateur" relationship,
+ * and "Head Surgeon" role might be able to oversee a person with Provider Role of "Surgeon".
+ * 
+ * @since 2.8.0
+ */
+@Entity
+@Table(name = "provider_role")
+public class ProviderRole extends BaseOpenmrsMetadata implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "provider_role_id")
+	private Integer providerRoleId;
+
+	@Override
+	public Integer getId() {
+		return providerRoleId;
+	}
+
+	@Override
+	public void setId(Integer id) {
+		this.providerRoleId = id;
+	}
+
+	public Integer getProviderRoleId() {
+		return providerRoleId;
+	}
+
+	public void setProviderRoleId(Integer id) {
+		this.providerRoleId = id;
+	}
+
+	@Override
+	public String toString() {
+		return "ProviderRole{" +
+			"providerRoleId=" + providerRoleId +
+			", name=" + this.getName() +
+			'}';
+	}
+}

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

@@ -9,6 +9,13 @@
  */
 package org.openmrs;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
 import org.hibernate.envers.Audited;
 
 /**
@@ -17,11 +24,16 @@
  * 
  * @since 1.9
  */
+@Entity
+@Table(name = "visit_type")
 @Audited
-public class VisitType extends BaseChangeableOpenmrsMetadata{
+public class VisitType extends BaseChangeableOpenmrsMetadata {
 
 	private static final long serialVersionUID = 1L;
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "visit_type_id")
 	private Integer visitTypeId;
 
 	/** default constructor */

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

@@ -2037,7 +2037,7 @@ public List<ConceptSearchResult> getOrderableConcepts(String phrase, List<Locale
 	 * @since 2.7.0
 	 */
 	@Authorized(PrivilegeConstants.GET_CONCEPTS)
-	public ConceptReferenceRange getConceptReferenceRange(Person person, Concept concept);
+	ConceptReferenceRange getConceptReferenceRange(Person person, Concept concept);
 
 	/**
 	 * Completely purge a <code>ConceptReferenceRange</code> from the database.

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

@@ -0,0 +1,43 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ *
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
+package org.openmrs.api;
+
+import org.openmrs.util.OpenmrsConstants;
+import org.openmrs.util.OpenmrsUtil;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.FileSystemResource;
+import java.util.Properties;
+
+/**
+ * Provides a PropertySourcesPlaceholderConfigurer that uses OpenmrsUtil.getApplicationDataDirectory()
+ * to resolve the runtime properties file location, ensuring the property is always set.
+ * 
+ * @since 2.8.0
+ */
+@Configuration
+public class OpenmrsPropertyConfig {
+	
+    @Bean
+    public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+        PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer();
+        String appDataDir = OpenmrsUtil.getApplicationDataDirectory();
+        Properties props = new Properties();
+        props.setProperty(OpenmrsConstants.KEY_OPENMRS_APPLICATION_DATA_DIRECTORY, appDataDir);
+        configurer.setProperties(props);
+        configurer.setLocations(new ClassPathResource("hibernate.default.properties"), 
+			new FileSystemResource(appDataDir + "/openmrs-runtime.properties"));
+        configurer.setIgnoreResourceNotFound(true);
+        configurer.setLocalOverride(true);
+        return configurer;
+    }
+}

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

@@ -27,7 +27,7 @@
  * {@link ObjectMetadata} can be passed in save methods. It is implementation dependent on how the metadata is 
  * used or persisted.
  * 
- * @since 2.8.0, 2.7.4, 2.6.16, 2.5.15
+ * @since 2.8.0, 2.7.5, 2.6.16, 2.5.15
  */
 public interface StorageService extends OpenmrsService {