Skip to content

Commit ac1fbcb

Browse files
petmongrelspetmongrels
committed
Upgraded to Java 17
Latest gradle and spring renamed from bahmni_avni to avni_int disabled external tests
1 parent 5ab680b commit ac1fbcb

File tree

269 files changed

+1076
-1153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+1076
-1153
lines changed

‎.java-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
15.0
1+
17.0.1

‎Makefile

+16-13
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ help:
1010
done
1111

1212
SU:=$(shell id -un)
13-
DB=bahmni_avni
14-
ADMIN_USER=bahmni_avni_admin
13+
DB=avni_int
14+
ADMIN_USER=avni_int
1515
postgres_user := $(shell id -un)
1616

1717
define _build_db
@@ -43,20 +43,20 @@ endef
4343
rebuild-db: drop-db build-db
4444

4545
build-db:
46-
$(call _build_db,bahmni_avni)
46+
$(call _build_db,avni_int)
4747
./gradlew migrateDb
4848

4949
drop-db:
50-
$(call _drop_db,bahmni_avni)
50+
$(call _drop_db,avni_int)
5151

5252
create-test-db:
53-
$(call _build_db,bahmni_avni_test)
53+
$(call _build_db,avni_int_test)
5454

5555
build-test-db: create-test-db
5656
./gradlew migrateTestDb
5757

5858
drop-test-db:
59-
$(call _drop_db,bahmni_avni_test)
59+
$(call _drop_db,avni_int_test)
6060

6161
rebuild-test-db: drop-test-db build-test-db
6262

@@ -81,20 +81,23 @@ run-server-without-background: build-server
8181
run-migrator: build-server
8282
$(call _run_migrator)
8383

84-
test-server: drop-test-db build-test-db build-server
85-
./gradlew unitTest
84+
test-server: drop-test-db build-test-db
85+
./gradlew clean build
8686

8787
setup-external-test-db: drop-test-db create-test-db
88-
sudo -u ${postgres_user} psql bahmni_avni_test -f dump.sql
88+
sudo -u ${postgres_user} psql avni_int_test -f dump.sql
8989

9090
test-server-external: drop-test-db setup-external-test-db
9191
./gradlew clean build
9292

93-
open-unit-test-results-integrator:
94-
open integrator/build/reports/tests/unitTest/index.html
93+
open-test-results-integrator:
94+
open integrator/build/reports/tests/test/index.html
95+
96+
open-test-results-migrator:
97+
open metadata-migrator/build/reports/tests/test/index.html
9598

96-
open-unit-test-results-migrator:
97-
open metadata-migrator/build/reports/tests/unitTest/index.html
99+
open-test-results-integration-data:
100+
open integration-data/build/reports/tests/test/index.html
98101
#######
99102

100103

‎conf/env.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ export BAHMNI_OPENMRS_API_PASSWORD=dummy
66
export INT_SCHEDULE_CRON="0/3 * * * * ?"
77
export INT_CONFIG_LOCATION=../ashwini/config
88
export INT_APP_TASKS=BahmniPatient
9-
export INT_DB_NAME=bahmni_avni
10-
export INT_APP_FIRST_RUN=true
9+
export INT_DB_NAME=avni_int
10+
export INT_APP_FIRST_RUN=true

‎conf/local-test.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export INT_DB_NAME=bahmni_avni_test
1+
export INT_DB_NAME=avni_int_test

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip

‎integration-data/build.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
2-
id 'org.springframework.boot' version '2.4.1'
2+
id 'org.springframework.boot' version '2.5.6'
33
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
44
id 'java'
55
id "org.flywaydb.flyway" version "7.1.1"
66
}
77

8-
group = 'org.bahmni_avni_integration'
9-
version = '0.0.1-SNAPSHOT'
10-
sourceCompatibility = '15'
8+
group = 'org.avni_integration_service'
9+
version = '0.0.2-SNAPSHOT'
10+
sourceCompatibility = '17'
1111

1212
bootJar {
1313
enabled = false
@@ -18,14 +18,14 @@ jar {
1818
}
1919

2020
task migrateTestDb(type: org.flywaydb.gradle.task.FlywayMigrateTask) {
21-
url = 'jdbc:postgresql://localhost:5432/bahmni_avni_test'
22-
user = 'bahmni_avni_admin'
21+
url = 'jdbc:postgresql://localhost:5432/avni_int_test'
22+
user = 'avni_int'
2323
password = 'password'
2424
}
2525

2626
task migrateDb(type: org.flywaydb.gradle.task.FlywayMigrateTask) {
27-
url = 'jdbc:postgresql://localhost:5432/bahmni_avni'
28-
user = 'bahmni_avni_admin'
27+
url = 'jdbc:postgresql://localhost:5432/avni_int'
28+
user = 'avni_int'
2929
password = 'password'
3030
}
3131

@@ -53,9 +53,9 @@ dependencies {
5353
developmentOnly 'org.springframework.boot:spring-boot-devtools'
5454
testImplementation 'org.springframework.boot:spring-boot-starter-test'
5555

56-
implementation group: 'mysql', name: 'mysql-connector-java', version: '5.1.6'
56+
// implementation group: 'mysql', name: 'mysql-connector-java', version: '5.1.6'
5757

58-
compile "log4j:log4j:1.2.16"
58+
implementation "log4j:log4j:1.2.17"
5959
}
6060

6161
test {

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/BahmniEntityType.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/BahmniEntityType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data;
1+
package org.avni_integration_service.integration_data;
22

33
public enum BahmniEntityType {
44
Patient, Encounter, LabResult

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/ConnectionFactory.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/ConnectionFactory.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.bahmni_avni_integration.integration_data;
1+
package org.avni_integration_service.integration_data;
22

3-
import org.bahmni_avni_integration.integration_data.config.AvniConfig;
4-
import org.bahmni_avni_integration.integration_data.config.BahmniConfig;
5-
import org.bahmni_avni_integration.integration_data.util.TxConfigurableConnection;
3+
import org.avni_integration_service.integration_data.config.AvniConfig;
4+
import org.avni_integration_service.integration_data.config.BahmniConfig;
5+
import org.avni_integration_service.integration_data.util.TxConfigurableConnection;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.beans.factory.annotation.Value;
88
import org.springframework.stereotype.Component;
@@ -53,4 +53,4 @@ public Connection getAvniConnection() {
5353
throw new RuntimeException(e);
5454
}
5555
}
56-
}
56+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/config/AvniConfig.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/config/AvniConfig.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
package org.bahmni_avni_integration.integration_data.config;
1+
package org.avni_integration_service.integration_data.config;
22

33
import org.springframework.beans.factory.annotation.Value;
4-
import org.springframework.boot.web.client.RestTemplateBuilder;
5-
import org.springframework.context.annotation.Bean;
64
import org.springframework.context.annotation.Configuration;
75

86
@Configuration

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/config/BahmniConfig.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/config/BahmniConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.config;
1+
package org.avni_integration_service.integration_data.config;
22

33
import org.springframework.beans.factory.annotation.Value;
44
import org.springframework.context.annotation.Configuration;
@@ -32,4 +32,4 @@ public String getOpenMrsMySqlDatabase() {
3232
public int getOpenMrsMySqlPort() {
3333
return openMrsMySqlPort;
3434
}
35-
}
35+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/AvniEntityStatus.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/AvniEntityStatus.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import javax.persistence.*;
44
import java.util.Date;
@@ -29,4 +29,4 @@ public AvniEntityType getEntityType() {
2929
public void setEntityType(AvniEntityType entityType) {
3030
this.entityType = entityType;
3131
}
32-
}
32+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/AvniEntityType.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/AvniEntityType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
public enum AvniEntityType {
44
Subject, Enrolment, ProgramEncounter, GeneralEncounter

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/BahmniEntityStatus.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/BahmniEntityStatus.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

3-
import org.bahmni_avni_integration.integration_data.BahmniEntityType;
3+
import org.avni_integration_service.integration_data.BahmniEntityType;
44

55
import javax.persistence.*;
6-
import java.util.Date;
76

87
@Entity
98
@Table(name = "bahmni_entity_status")
@@ -30,4 +29,4 @@ public BahmniEntityType getEntityType() {
3029
public void setEntityType(BahmniEntityType entityType) {
3130
this.entityType = entityType;
3231
}
33-
}
32+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/BaseEntity.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/BaseEntity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import javax.persistence.*;
44

@@ -16,4 +16,4 @@ public Integer getId() {
1616
public void setId(Integer id) {
1717
this.id = id;
1818
}
19-
}
19+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/BaseEnum.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/BaseEnum.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
public interface BaseEnum {
44
int getValue();

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/Constant.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/Constant.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import javax.persistence.*;
44

@@ -35,4 +35,4 @@ public String getValue() {
3535
public void setValue(String value) {
3636
this.value = value;
3737
}
38-
}
38+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/ConstantKey.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/ConstantKey.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
public enum ConstantKey {
44
BahmniIdentifierPrefix,

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/Constants.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/Constants.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import java.util.ArrayList;
44
import java.util.List;
@@ -20,4 +20,4 @@ public String getValue(ConstantKey key) {
2020
public List<Constant> getValues(ConstantKey key) {
2121
return list.stream().filter(constant -> constant.getKey().equals(key)).collect(Collectors.toList());
2222
}
23-
}
23+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/ErrorRecord.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/ErrorRecord.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

3-
import org.bahmni_avni_integration.integration_data.BahmniEntityType;
3+
import org.avni_integration_service.integration_data.BahmniEntityType;
44

55
import javax.persistence.*;
66
import java.util.*;

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/ErrorRecordLog.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/ErrorRecordLog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import javax.persistence.*;
44
import java.util.Date;

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/ErrorType.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/ErrorType.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

3-
import org.bahmni_avni_integration.integration_data.util.EnumUtil;
3+
import org.avni_integration_service.integration_data.util.EnumUtil;
44

55
import java.util.Arrays;
66
import java.util.List;

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/IgnoredBahmniConcept.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/IgnoredBahmniConcept.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import javax.persistence.Column;
44
import javax.persistence.Entity;
@@ -18,4 +18,4 @@ public IgnoredBahmniConcept(String conceptUuid) {
1818
public String getConceptUuid() {
1919
return conceptUuid;
2020
}
21-
}
21+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/MappingGroup.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/MappingGroup.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
public enum MappingGroup implements BaseEnum {
44
Common(1), PatientSubject(2), GeneralEncounter(3), ProgramEnrolment(4), ProgramEncounter(5), Observation(6);

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/MappingMetaData.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/MappingMetaData.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import javax.persistence.*;
44

@@ -81,4 +81,4 @@ public boolean isText() {
8181
public void setDataTypeHint(ObsDataType dataTypeHint) {
8282
this.dataTypeHint = dataTypeHint;
8383
}
84-
}
84+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/MappingMetaDataCollection.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/MappingMetaDataCollection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import java.util.List;
44

@@ -28,4 +28,4 @@ public MappingMetaData getMappingForAvniValue(String avniValue) {
2828
public MappingMetaData getMappingForBahmniValue(String bahmniValue) {
2929
return list.stream().filter(mappingMetaData -> bahmniValue.equals(mappingMetaData.getBahmniValue())).findAny().orElse(null);
3030
}
31-
}
31+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/MappingType.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/MappingType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
public enum MappingType implements BaseEnum {
44
Subject_EncounterType(1),

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/Names.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/Names.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
public class Names {
44
public static final String AvniPatientRegistrationEncounter = "Bahmni Patient Registration";
55
public static final String AvniEntityUuidConceptName = "Avni Entity UUID";
66
public static final String AvniEventDateConceptName = "Event Date";
77
public static final String AvniProgramDataConceptName = "Program Data";
8-
}
8+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/domain/ObsDataType.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/ObsDataType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.bahmni_avni_integration.integration_data.domain;
1+
package org.avni_integration_service.integration_data.domain;
22

33
import java.util.Map;
44

‎integration-data/src/main/java/org/avni_integration_service/integration_data/domain/SyncDirection.java

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.avni_integration_service.integration_data.domain;
2+
3+
public enum SyncDirection {
4+
BahmniToAvni, AvniToBahmni
5+
}

‎integration-data/src/main/java/org/bahmni_avni_integration/integration_data/internal/BahmniEncounterToAvniEncounterMetaData.java renamed to ‎integration-data/src/main/java/org/avni_integration_service/integration_data/internal/BahmniEncounterToAvniEncounterMetaData.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package org.bahmni_avni_integration.integration_data.internal;
1+
package org.avni_integration_service.integration_data.internal;
22

3-
import org.bahmni_avni_integration.integration_data.domain.IgnoredBahmniConcept;
4-
import org.bahmni_avni_integration.integration_data.domain.MappingMetaData;
3+
import org.avni_integration_service.integration_data.domain.IgnoredBahmniConcept;
4+
import org.avni_integration_service.integration_data.domain.MappingMetaData;
55

6-
import java.util.ArrayList;
76
import java.util.List;
87

98
public class BahmniEncounterToAvniEncounterMetaData implements BahmniToAvniMetaData {
@@ -86,4 +85,4 @@ public void setIgnoredConcepts(List<IgnoredBahmniConcept> ignoredBahmniConcepts)
8685
public boolean isIgnoredInBahmni(String conceptUuid) {
8786
return ignoredBahmniConcepts.stream().filter(ignoredBahmniConcept -> ignoredBahmniConcept.getConceptUuid().equals(conceptUuid)).findFirst().orElse(null) != null;
8887
}
89-
}
88+
}

0 commit comments

Comments
 (0)