KATOEL

Untitled

May 8th, 2025
93
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 13.77 KB | None | 0 0
  1. * branch master -> FETCH_HEAD
  2. Updating be4905b7b..26342b5f7
  3. Updating files: 100% (158/158), done.
  4. Fast-forward
  5. .github/workflows/build.yaml | 14 +-
  6. .github/workflows/scorecard.yml | 2 +-
  7. README.md | 26 +-
  8. api/pom.xml | 22 +-
  9. api/src/main/java/org/openmrs/BaseOpenmrsData.java | 4 +-
  10. .../main/java/org/openmrs/BaseOpenmrsMetadata.java | 13 +-
  11. api/src/main/java/org/openmrs/Concept.java | 38 +-
  12. api/src/main/java/org/openmrs/ConceptClass.java | 2 -
  13. api/src/main/java/org/openmrs/ConceptComplex.java | 3 +-
  14. api/src/main/java/org/openmrs/ConceptDatatype.java | 2 -
  15. api/src/main/java/org/openmrs/ConceptMap.java | 11 +-
  16. api/src/main/java/org/openmrs/ConceptName.java | 43 +-
  17. api/src/main/java/org/openmrs/ConceptNumeric.java | 2 -
  18. .../java/org/openmrs/ConceptReferenceRange.java | 2 +-
  19. .../java/org/openmrs/ConceptReferenceTerm.java | 7 +-
  20. api/src/main/java/org/openmrs/Drug.java | 20 +-
  21. .../main/java/org/openmrs/DrugReferenceMap.java | 13 +-
  22. .../main/java/org/openmrs/ObsReferenceRange.java | 4 +-
  23. api/src/main/java/org/openmrs/Patient.java | 2 -
  24. .../main/java/org/openmrs/PatientIdentifier.java | 43 +-
  25. .../java/org/openmrs/PatientIdentifierType.java | 16 +-
  26. api/src/main/java/org/openmrs/Person.java | 35 +-
  27. api/src/main/java/org/openmrs/PersonAttribute.java | 34 +-
  28. .../main/java/org/openmrs/PersonAttributeType.java | 12 +-
  29. api/src/main/java/org/openmrs/PersonName.java | 67 +-
  30. .../main/java/org/openmrs/api/ConceptService.java | 22 +
  31. .../main/java/org/openmrs/api/StorageService.java | 176 +
  32. .../main/java/org/openmrs/api/context/Context.java | 14 +
  33. .../main/java/org/openmrs/api/db/ConceptDAO.java | 5 +
  34. .../main/java/org/openmrs/api/db/ContextDAO.java | 5 +
  35. .../openmrs/api/db/DelegatingFullTextSession.java | 156 -
  36. .../api/db/FullTextQueryAndEntityClass.java | 50 -
  37. .../api/db/hibernate/HibernateConceptDAO.java | 375 +-
  38. .../api/db/hibernate/HibernateContextDAO.java | 72 +-
  39. .../api/db/hibernate/HibernatePatientDAO.java | 204 +-
  40. .../api/db/hibernate/HibernatePersonDAO.java | 106 +-
  41. .../api/db/hibernate/PersonLuceneQuery.java | 278 -
  42. .../org/openmrs/api/db/hibernate/PersonQuery.java | 257 +
  43. .../db/hibernate/search/LuceneAnalyzerFactory.java | 72 -
  44. .../api/db/hibernate/search/LuceneQuery.java | 464 --
  45. .../{LuceneAnalyzers.java => SearchAnalysis.java} | 20 +-
  46. .../search/SearchAndEntityCollection.java | 57 +
  47. .../search/SearchCreatedEvent.java} | 20 +-
  48. .../api/db/hibernate/search/SearchQuery.java | 83 -
  49. .../hibernate/search/SearchQueryContributor.java | 32 +
  50. .../api/db/hibernate/search/SearchQueryUnique.java | 367 +
  51. .../api/db/hibernate/search/SearchQueryUtils.java | 32 +
  52. .../db/hibernate/search/TermsFilterFactory.java | 76 -
  53. .../hibernate/search/bridge/LocaleFieldBridge.java | 28 -
  54. .../hibernate/search/bridge/LocaleValueBridge.java | 40 +
  55. ...ldBridge.java => OpenmrsObjectValueBridge.java} | 18 +-
  56. .../search/elasticsearch/ElasticsearchConfig.java | 64 +
  57. .../db/hibernate/search/lucene/LuceneConfig.java | 83 +
  58. .../EventPublisherDelegatingSearchSession.java | 152 +
  59. .../search/session/SearchQuerySelectDelegate.java | 123 +
  60. .../search/session/SearchQueryWhereDelegate.java | 73 +
  61. .../search/session/SearchSessionFactory.java} | 22 +-
  62. .../search/session/SearchSessionFactoryImpl.java} | 22 +-
  63. .../org/openmrs/api/impl/ConceptServiceImpl.java | 18 +
  64. .../java/org/openmrs/api/impl/ObsServiceImpl.java | 8 +-
  65. .../openmrs/api/storage/BaseStorageService.java | 76 +
  66. .../openmrs/api/storage/LocalStorageService.java | 248 +
  67. .../org/openmrs/api/storage/ObjectMetadata.java | 135 +
  68. .../api/storage/StorageServiceCondition.java | 43 +
  69. .../org/openmrs/api/stream/StreamDataService.java | 197 +
  70. .../org/openmrs/api/stream/StreamDataWriter.java | 28 +
  71. .../java/org/openmrs/attribute/BaseAttribute.java | 4 +-
  72. .../org/openmrs/liquibase/ChangeLogVersions.java | 4 +-
  73. api/src/main/java/org/openmrs/module/Module.java | 16 +-
  74. .../java/org/openmrs/module/ModuleClassLoader.java | 14 -
  75. .../java/org/openmrs/module/ModuleConstants.java | 18 +-
  76. .../java/org/openmrs/module/ModuleFactory.java | 32 +-
  77. .../openmrs/module/ModuleMustStartException.java | 1 -
  78. .../main/java/org/openmrs/module/ModuleUtil.java | 168 +-
  79. .../openmrs/module/OpenmrsCoreModuleException.java | 79 -
  80. .../org/openmrs/obs/handler/AbstractHandler.java | 183 +-
  81. .../org/openmrs/obs/handler/BinaryDataHandler.java | 75 +-
  82. .../openmrs/obs/handler/BinaryStreamHandler.java | 51 +-
  83. .../java/org/openmrs/obs/handler/ImageHandler.java | 153 +-
  84. .../java/org/openmrs/obs/handler/MediaHandler.java | 55 +-
  85. .../java/org/openmrs/obs/handler/TextHandler.java | 102 +-
  86. .../java/org/openmrs/util/DatabaseUpdater.java | 7 +-
  87. .../java/org/openmrs/util/OpenmrsConstants.java | 2 +-
  88. .../main/java/org/openmrs/util/OpenmrsUtil.java | 5 +-
  89. .../java/org/openmrs/validator/ObsValidator.java | 20 +-
  90. .../main/resources/applicationContext-service.xml | 27 +-
  91. api/src/main/resources/hibernate.cfg.xml | 1 -
  92. .../main/resources/hibernate.default.properties | 20 +-
  93. api/src/main/resources/liquibase-core-data.xml | 9 +-
  94. api/src/main/resources/liquibase-schema-only.xml | 9 +-
  95. .../liquibase-update-to-latest-from-1.9.x.xml | 8 +-
  96. .../main/resources/liquibase-update-to-latest.xml | 9 +-
  97. api/src/main/resources/messages.properties | 4 +
  98. .../search/elasticsearch/es-index-settings.json | 3 +
  99. .../core-data/liquibase-core-data-2.7.x.xml | 5618 ++++++++++++++++
  100. .../schema-only/liquibase-schema-only-2.7.x.xml | 7006 ++++++++++++++++++++
  101. .../updates/liquibase-update-to-latest-2.8.x.xml | 27 +
  102. .../java/org/openmrs/api/ConceptServiceTest.java | 29 +-
  103. .../java/org/openmrs/api/EncounterServiceTest.java | 51 +-
  104. .../test/java/org/openmrs/api/ObsServiceTest.java | 183 +-
  105. .../java/org/openmrs/api/StorageServiceTest.java | 604 ++
  106. .../java/org/openmrs/module/ModuleUtilTest.java | 57 +-
  107. .../java/org/openmrs/obs/AbstractHandlerTest.java | 106 +-
  108. .../org/openmrs/obs/BinaryDataHandlerTest.java | 11 +-
  109. .../org/openmrs/obs/BinaryStreamHandlerTest.java | 18 +-
  110. .../java/org/openmrs/obs/ImageHandlerTest.java | 12 +-
  111. .../java/org/openmrs/obs/MediaHandlerTest.java | 11 +-
  112. .../test/java/org/openmrs/obs/TextHandlerTest.java | 16 +-
  113. .../org/openmrs/test/BaseContextSensitiveTest.java | 4 -
  114. .../test/jupiter/BaseContextSensitiveTest.java | 10 +-
  115. .../openmrs/util/DatabaseUpdaterDatabaseIT.java | 2 +-
  116. .../java/org/openmrs/util/OpenmrsUtilTest.java | 14 +-
  117. .../ValidateHibernateMappingsDatabaseIT.java | 2 +
  118. .../org/openmrs/validator/ObsValidatorTest.java | 16 +
  119. .../org/openmrs/include/standardTestDataset.xml | 5 +
  120. bamboo-specs/bamboo.yml | 85 +
  121. docker-compose.es.yml | 58 +
  122. docker-compose.override.yml | 1 +
  123. docker-compose.yml | 4 +-
  124. pom.xml | 113 +-
  125. startup-init.sh | 9 +
  126. startup.sh | 9 +-
  127. web/src/main/java/org/openmrs/web/Listener.java | 17 +-
  128. .../initialization/InitializationFilter.java | 51 +-
  129. .../initialization/InitializationWizardModel.java | 2 +-
  130. .../filter/startuperror/StartupErrorFilter.java | 54 +-
  131. .../startuperror/StartupErrorFilterModel.java | 6 +
  132. .../openmrs/web/filter/update/UpdateFilter.java | 3 -
  133. .../web/filter/update/UpdateFilterModel.java | 2 +-
  134. .../openmrs/web/filter/util/SessionModelUtils.java | 111 +
  135. .../resources/org/openmrs/web/filter/footer.vm | 118 +
  136. .../web/filter/initialization/adminusersetup.vm | 295 +-
  137. .../web/filter/initialization/chooselang.vm | 215 +-
  138. .../web/filter/initialization/databasesetup.vm | 396 +-
  139. .../filter/initialization/databasetablesanduser.vm | 356 +-
  140. .../openmrs/web/filter/initialization/footer.vm | 2 -
  141. .../openmrs/web/filter/initialization/header.vm | 334 +-
  142. .../filter/initialization/implementationidsetup.vm | 269 +-
  143. .../web/filter/initialization/installmethod.vm | 307 +-
  144. .../initialization/otherruntimeproperties.vm | 230 +-
  145. .../openmrs/web/filter/initialization/progress.vm | 571 +-
  146. .../web/filter/initialization/remotedetails.vm | 236 +-
  147. .../web/filter/initialization/simplesetup.vm | 274 +-
  148. .../web/filter/initialization/wizardcomplete.vm | 375 +-
  149. .../org/openmrs/web/filter/startuperror/footer.vm | 2 -
  150. .../web/filter/startuperror/generalerror.vm | 134 +-
  151. .../org/openmrs/web/filter/startuperror/header.vm | 170 +-
  152. .../org/openmrs/web/filter/update/footer.vm | 2 -
  153. .../org/openmrs/web/filter/update/header.vm | 200 +-
  154. .../org/openmrs/web/filter/update/maintenance.vm | 124 +-
  155. .../org/openmrs/web/filter/update/reviewchanges.vm | 193 +-
  156. webapp/pom.xml | 2 +-
  157. webapp/src/main/webapp/index.htm | 227 +-
  158. 153 files changed, 21125 insertions(+), 4071 deletions(-)
  159. create mode 100644 api/src/main/java/org/openmrs/api/StorageService.java
  160. delete mode 100644 api/src/main/java/org/openmrs/api/db/DelegatingFullTextSession.java
  161. delete mode 100644 api/src/main/java/org/openmrs/api/db/FullTextQueryAndEntityClass.java
  162. delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/PersonLuceneQuery.java
  163. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/PersonQuery.java
  164. delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneAnalyzerFactory.java
  165. delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java
  166. rename api/src/main/java/org/openmrs/api/db/hibernate/search/{LuceneAnalyzers.java => SearchAnalysis.java} (52%)
  167. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchAndEntityCollection.java
  168. rename api/src/main/java/org/openmrs/api/db/{FullTextQueryCreatedEvent.java => hibernate/search/SearchCreatedEvent.java} (58%)
  169. delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java
  170. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQueryContributor.java
  171. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQueryUnique.java
  172. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQueryUtils.java
  173. delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/TermsFilterFactory.java
  174. delete mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/LocaleFieldBridge.java
  175. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/LocaleValueBridge.java
  176. rename api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/{OpenmrsObjectFieldBridge.java => OpenmrsObjectValueBridge.java} (62%)
  177. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/elasticsearch/ElasticsearchConfig.java
  178. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/lucene/LuceneConfig.java
  179. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/session/EventPublisherDelegatingSearchSession.java
  180. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/session/SearchQuerySelectDelegate.java
  181. create mode 100644 api/src/main/java/org/openmrs/api/db/hibernate/search/session/SearchQueryWhereDelegate.java
  182. rename api/src/main/java/org/openmrs/api/db/{FullTextSessionFactory.java => hibernate/search/session/SearchSessionFactory.java} (57%)
  183. rename api/src/main/java/org/openmrs/api/db/{FullTextSessionFactoryImpl.java => hibernate/search/session/SearchSessionFactoryImpl.java} (59%)
  184. create mode 100644 api/src/main/java/org/openmrs/api/storage/BaseStorageService.java
  185. create mode 100644 api/src/main/java/org/openmrs/api/storage/LocalStorageService.java
  186. create mode 100644 api/src/main/java/org/openmrs/api/storage/ObjectMetadata.java
  187. create mode 100644 api/src/main/java/org/openmrs/api/storage/StorageServiceCondition.java
  188. create mode 100644 api/src/main/java/org/openmrs/api/stream/StreamDataService.java
  189. create mode 100644 api/src/main/java/org/openmrs/api/stream/StreamDataWriter.java
  190. delete mode 100644 api/src/main/java/org/openmrs/module/OpenmrsCoreModuleException.java
  191. create mode 100644 api/src/main/resources/org/openmrs/api/db/hibernate/search/elasticsearch/es-index-settings.json
  192. create mode 100644 api/src/main/resources/org/openmrs/liquibase/snapshots/core-data/liquibase-core-data-2.7.x.xml
  193. create mode 100644 api/src/main/resources/org/openmrs/liquibase/snapshots/schema-only/liquibase-schema-only-2.7.x.xml
  194. create mode 100644 api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.8.x.xml
  195. create mode 100644 api/src/test/java/org/openmrs/api/StorageServiceTest.java
  196. create mode 100644 docker-compose.es.yml
  197. create mode 100644 web/src/main/java/org/openmrs/web/filter/util/SessionModelUtils.java
  198. create mode 100644 web/src/main/resources/org/openmrs/web/filter/footer.vm
  199. delete mode 100644 web/src/main/resources/org/openmrs/web/filter/initialization/footer.vm
  200. delete mode 100644 web/src/main/resources/org/openmrs/web/filter/startuperror/footer.vm
  201. delete mode 100644 web/src/main/resources/org/openmrs/web/filter/update/footer.vm
Advertisement
Add Comment
Please, Sign In to add comment