Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- * branch master -> FETCH_HEAD
- Updating be4905b7b..26342b5f7
- Updating files: 100% (158/158), done.
- Fast-forward
- .github/workflows/build.yaml | 14 +-
- .github/workflows/scorecard.yml | 2 +-
- README.md | 26 +-
- api/pom.xml | 22 +-
- api/src/main/java/org/openmrs/BaseOpenmrsData.java | 4 +-
- .../main/java/org/openmrs/BaseOpenmrsMetadata.java | 13 +-
- api/src/main/java/org/openmrs/Concept.java | 38 +-
- api/src/main/java/org/openmrs/ConceptClass.java | 2 -
- api/src/main/java/org/openmrs/ConceptComplex.java | 3 +-
- api/src/main/java/org/openmrs/ConceptDatatype.java | 2 -
- api/src/main/java/org/openmrs/ConceptMap.java | 11 +-
- api/src/main/java/org/openmrs/ConceptName.java | 43 +-
- api/src/main/java/org/openmrs/ConceptNumeric.java | 2 -
- .../java/org/openmrs/ConceptReferenceRange.java | 2 +-
- .../java/org/openmrs/ConceptReferenceTerm.java | 7 +-
- api/src/main/java/org/openmrs/Drug.java | 20 +-
- .../main/java/org/openmrs/DrugReferenceMap.java | 13 +-
- .../main/java/org/openmrs/ObsReferenceRange.java | 4 +-
- api/src/main/java/org/openmrs/Patient.java | 2 -
- .../main/java/org/openmrs/PatientIdentifier.java | 43 +-
- .../java/org/openmrs/PatientIdentifierType.java | 16 +-
- api/src/main/java/org/openmrs/Person.java | 35 +-
- api/src/main/java/org/openmrs/PersonAttribute.java | 34 +-
- .../main/java/org/openmrs/PersonAttributeType.java | 12 +-
- api/src/main/java/org/openmrs/PersonName.java | 67 +-
- .../main/java/org/openmrs/api/ConceptService.java | 22 +
- .../main/java/org/openmrs/api/StorageService.java | 176 +
- .../main/java/org/openmrs/api/context/Context.java | 14 +
- .../main/java/org/openmrs/api/db/ConceptDAO.java | 5 +
- .../main/java/org/openmrs/api/db/ContextDAO.java | 5 +
- .../openmrs/api/db/DelegatingFullTextSession.java | 156 -
- .../api/db/FullTextQueryAndEntityClass.java | 50 -
- .../api/db/hibernate/HibernateConceptDAO.java | 375 +-
- .../api/db/hibernate/HibernateContextDAO.java | 72 +-
- .../api/db/hibernate/HibernatePatientDAO.java | 204 +-
- .../api/db/hibernate/HibernatePersonDAO.java | 106 +-
- .../api/db/hibernate/PersonLuceneQuery.java | 278 -
- .../org/openmrs/api/db/hibernate/PersonQuery.java | 257 +
- .../db/hibernate/search/LuceneAnalyzerFactory.java | 72 -
- .../api/db/hibernate/search/LuceneQuery.java | 464 --
- .../{LuceneAnalyzers.java => SearchAnalysis.java} | 20 +-
- .../search/SearchAndEntityCollection.java | 57 +
- .../search/SearchCreatedEvent.java} | 20 +-
- .../api/db/hibernate/search/SearchQuery.java | 83 -
- .../hibernate/search/SearchQueryContributor.java | 32 +
- .../api/db/hibernate/search/SearchQueryUnique.java | 367 +
- .../api/db/hibernate/search/SearchQueryUtils.java | 32 +
- .../db/hibernate/search/TermsFilterFactory.java | 76 -
- .../hibernate/search/bridge/LocaleFieldBridge.java | 28 -
- .../hibernate/search/bridge/LocaleValueBridge.java | 40 +
- ...ldBridge.java => OpenmrsObjectValueBridge.java} | 18 +-
- .../search/elasticsearch/ElasticsearchConfig.java | 64 +
- .../db/hibernate/search/lucene/LuceneConfig.java | 83 +
- .../EventPublisherDelegatingSearchSession.java | 152 +
- .../search/session/SearchQuerySelectDelegate.java | 123 +
- .../search/session/SearchQueryWhereDelegate.java | 73 +
- .../search/session/SearchSessionFactory.java} | 22 +-
- .../search/session/SearchSessionFactoryImpl.java} | 22 +-
- .../org/openmrs/api/impl/ConceptServiceImpl.java | 18 +
- .../java/org/openmrs/api/impl/ObsServiceImpl.java | 8 +-
- .../openmrs/api/storage/BaseStorageService.java | 76 +
- .../openmrs/api/storage/LocalStorageService.java | 248 +
- .../org/openmrs/api/storage/ObjectMetadata.java | 135 +
- .../api/storage/StorageServiceCondition.java | 43 +
- .../org/openmrs/api/stream/StreamDataService.java | 197 +
- .../org/openmrs/api/stream/StreamDataWriter.java | 28 +
- .../java/org/openmrs/attribute/BaseAttribute.java | 4 +-
- .../org/openmrs/liquibase/ChangeLogVersions.java | 4 +-
- api/src/main/java/org/openmrs/module/Module.java | 16 +-
- .../java/org/openmrs/module/ModuleClassLoader.java | 14 -
- .../java/org/openmrs/module/ModuleConstants.java | 18 +-
- .../java/org/openmrs/module/ModuleFactory.java | 32 +-
- .../openmrs/module/ModuleMustStartException.java | 1 -
- .../main/java/org/openmrs/module/ModuleUtil.java | 168 +-
- .../openmrs/module/OpenmrsCoreModuleException.java | 79 -
- .../org/openmrs/obs/handler/AbstractHandler.java | 183 +-
- .../org/openmrs/obs/handler/BinaryDataHandler.java | 75 +-
- .../openmrs/obs/handler/BinaryStreamHandler.java | 51 +-
- .../java/org/openmrs/obs/handler/ImageHandler.java | 153 +-
- .../java/org/openmrs/obs/handler/MediaHandler.java | 55 +-
- .../java/org/openmrs/obs/handler/TextHandler.java | 102 +-
- .../java/org/openmrs/util/DatabaseUpdater.java | 7 +-
- .../java/org/openmrs/util/OpenmrsConstants.java | 2 +-
- .../main/java/org/openmrs/util/OpenmrsUtil.java | 5 +-
- .../java/org/openmrs/validator/ObsValidator.java | 20 +-
- .../main/resources/applicationContext-service.xml | 27 +-
- api/src/main/resources/hibernate.cfg.xml | 1 -
- .../main/resources/hibernate.default.properties | 20 +-
- api/src/main/resources/liquibase-core-data.xml | 9 +-
- api/src/main/resources/liquibase-schema-only.xml | 9 +-
- .../liquibase-update-to-latest-from-1.9.x.xml | 8 +-
- .../main/resources/liquibase-update-to-latest.xml | 9 +-
- api/src/main/resources/messages.properties | 4 +
- .../search/elasticsearch/es-index-settings.json | 3 +
- .../core-data/liquibase-core-data-2.7.x.xml | 5618 ++++++++++++++++
- .../schema-only/liquibase-schema-only-2.7.x.xml | 7006 ++++++++++++++++++++
- .../updates/liquibase-update-to-latest-2.8.x.xml | 27 +
- .../java/org/openmrs/api/ConceptServiceTest.java | 29 +-
- .../java/org/openmrs/api/EncounterServiceTest.java | 51 +-
- .../test/java/org/openmrs/api/ObsServiceTest.java | 183 +-
- .../java/org/openmrs/api/StorageServiceTest.java | 604 ++
- .../java/org/openmrs/module/ModuleUtilTest.java | 57 +-
- .../java/org/openmrs/obs/AbstractHandlerTest.java | 106 +-
- .../org/openmrs/obs/BinaryDataHandlerTest.java | 11 +-
- .../org/openmrs/obs/BinaryStreamHandlerTest.java | 18 +-
- .../java/org/openmrs/obs/ImageHandlerTest.java | 12 +-
- .../java/org/openmrs/obs/MediaHandlerTest.java | 11 +-
- .../test/java/org/openmrs/obs/TextHandlerTest.java | 16 +-
- .../org/openmrs/test/BaseContextSensitiveTest.java | 4 -
- .../test/jupiter/BaseContextSensitiveTest.java | 10 +-
- .../openmrs/util/DatabaseUpdaterDatabaseIT.java | 2 +-
- .../java/org/openmrs/util/OpenmrsUtilTest.java | 14 +-
- .../ValidateHibernateMappingsDatabaseIT.java | 2 +
- .../org/openmrs/validator/ObsValidatorTest.java | 16 +
- .../org/openmrs/include/standardTestDataset.xml | 5 +
- bamboo-specs/bamboo.yml | 85 +
- docker-compose.es.yml | 58 +
- docker-compose.override.yml | 1 +
- docker-compose.yml | 4 +-
- pom.xml | 113 +-
- startup-init.sh | 9 +
- startup.sh | 9 +-
- web/src/main/java/org/openmrs/web/Listener.java | 17 +-
- .../initialization/InitializationFilter.java | 51 +-
- .../initialization/InitializationWizardModel.java | 2 +-
- .../filter/startuperror/StartupErrorFilter.java | 54 +-
- .../startuperror/StartupErrorFilterModel.java | 6 +
- .../openmrs/web/filter/update/UpdateFilter.java | 3 -
- .../web/filter/update/UpdateFilterModel.java | 2 +-
- .../openmrs/web/filter/util/SessionModelUtils.java | 111 +
- .../resources/org/openmrs/web/filter/footer.vm | 118 +
- .../web/filter/initialization/adminusersetup.vm | 295 +-
- .../web/filter/initialization/chooselang.vm | 215 +-
- .../web/filter/initialization/databasesetup.vm | 396 +-
- .../filter/initialization/databasetablesanduser.vm | 356 +-
- .../openmrs/web/filter/initialization/footer.vm | 2 -
- .../openmrs/web/filter/initialization/header.vm | 334 +-
- .../filter/initialization/implementationidsetup.vm | 269 +-
- .../web/filter/initialization/installmethod.vm | 307 +-
- .../initialization/otherruntimeproperties.vm | 230 +-
- .../openmrs/web/filter/initialization/progress.vm | 571 +-
- .../web/filter/initialization/remotedetails.vm | 236 +-
- .../web/filter/initialization/simplesetup.vm | 274 +-
- .../web/filter/initialization/wizardcomplete.vm | 375 +-
- .../org/openmrs/web/filter/startuperror/footer.vm | 2 -
- .../web/filter/startuperror/generalerror.vm | 134 +-
- .../org/openmrs/web/filter/startuperror/header.vm | 170 +-
- .../org/openmrs/web/filter/update/footer.vm | 2 -
- .../org/openmrs/web/filter/update/header.vm | 200 +-
- .../org/openmrs/web/filter/update/maintenance.vm | 124 +-
- .../org/openmrs/web/filter/update/reviewchanges.vm | 193 +-
- webapp/pom.xml | 2 +-
- webapp/src/main/webapp/index.htm | 227 +-
- 153 files changed, 21125 insertions(+), 4071 deletions(-)
- create mode 100644 api/src/main/java/org/openmrs/api/StorageService.java
- delete mode 100644 api/src/main/java/org/openmrs/api/db/DelegatingFullTextSession.java
- delete mode 100644 api/src/main/java/org/openmrs/api/db/FullTextQueryAndEntityClass.java
- delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/PersonLuceneQuery.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/PersonQuery.java
- delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneAnalyzerFactory.java
- delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java
- rename api/src/main/java/org/openmrs/api/db/hibernate/search/{LuceneAnalyzers.java => SearchAnalysis.java} (52%)
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchAndEntityCollection.java
- rename api/src/main/java/org/openmrs/api/db/{FullTextQueryCreatedEvent.java => hibernate/search/SearchCreatedEvent.java} (58%)
- delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQueryContributor.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQueryUnique.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQueryUtils.java
- delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/TermsFilterFactory.java
- delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/LocaleFieldBridge.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/LocaleValueBridge.java
- rename api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/{OpenmrsObjectFieldBridge.java => OpenmrsObjectValueBridge.java} (62%)
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/elasticsearch/ElasticsearchConfig.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/lucene/LuceneConfig.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/session/EventPublisherDelegatingSearchSession.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/session/SearchQuerySelectDelegate.java
- create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/session/SearchQueryWhereDelegate.java
- rename api/src/main/java/org/openmrs/api/db/{FullTextSessionFactory.java => hibernate/search/session/SearchSessionFactory.java} (57%)
- rename api/src/main/java/org/openmrs/api/db/{FullTextSessionFactoryImpl.java => hibernate/search/session/SearchSessionFactoryImpl.java} (59%)
- create mode 100644 api/src/main/java/org/openmrs/api/storage/BaseStorageService.java
- create mode 100644 api/src/main/java/org/openmrs/api/storage/LocalStorageService.java
- create mode 100644 api/src/main/java/org/openmrs/api/storage/ObjectMetadata.java
- create mode 100644 api/src/main/java/org/openmrs/api/storage/StorageServiceCondition.java
- create mode 100644 api/src/main/java/org/openmrs/api/stream/StreamDataService.java
- create mode 100644 api/src/main/java/org/openmrs/api/stream/StreamDataWriter.java
- delete mode 100644 api/src/main/java/org/openmrs/module/OpenmrsCoreModuleException.java
- create mode 100644 api/src/main/resources/org/openmrs/api/db/hibernate/search/elasticsearch/es-index-settings.json
- create mode 100644 api/src/main/resources/org/openmrs/liquibase/snapshots/core-data/liquibase-core-data-2.7.x.xml
- create mode 100644 api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml
- create mode 100644 api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.8.x.xml
- create mode 100644 api/src/test/java/org/openmrs/api/StorageServiceTest.java
- create mode 100644 docker-compose.es.yml
- create mode 100644 web/src/main/java/org/openmrs/web/filter/util/SessionModelUtils.java
- create mode 100644 web/src/main/resources/org/openmrs/web/filter/footer.vm
- delete mode 100644 web/src/main/resources/org/openmrs/web/filter/initialization/footer.vm
- delete mode 100644 web/src/main/resources/org/openmrs/web/filter/startuperror/footer.vm
- delete mode 100644 web/src/main/resources/org/openmrs/web/filter/update/footer.vm
Advertisement
Add Comment
Please, Sign In to add comment