Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mdm config for single application context environment. #3338

Merged
merged 3 commits into from
Jan 27, 2022

Conversation

tadgh
Copy link
Collaborator

@tadgh tadgh commented Jan 27, 2022

  • Removed duplicate bean definitions from MdmSubmitterConfig and MdmConsumerConfig and pushed them into a shared config file imported by both.
  • Downstream consumers that were loading both in a single application were previously getting duplicate bean problems, using @Import solves this

@codecov
Copy link

codecov bot commented Jan 27, 2022

Codecov Report

Merging #3338 (9ac5dab) into master (3f42414) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #3338   +/-   ##
=========================================
  Coverage     82.81%   82.82%           
- Complexity    20471    20473    +2     
=========================================
  Files          1367     1368    +1     
  Lines         73553    73550    -3     
  Branches      11055    11055           
=========================================
+ Hits          60911    60915    +4     
+ Misses         8392     8386    -6     
+ Partials       4250     4249    -1     
Impacted Files Coverage Δ
...c/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java 95.48% <ø> (+0.57%) ⬆️
.../ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java 100.00% <ø> (ø)
...ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java 100.00% <ø> (+28.57%) ⬆️
...va/ca/uhn/fhir/jpa/mdm/config/MdmCommonConfig.java 100.00% <100.00%> (ø)
.../fhir/jpa/partition/RequestPartitionHelperSvc.java 85.91% <0.00%> (+2.81%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3f42414...9ac5dab. Read the comment docs.

@jamesagnew jamesagnew merged commit 6506527 into master Jan 27, 2022
@jamesagnew jamesagnew deleted the fix-mdm-config branch January 27, 2022 11:18
michaelabuckley pushed a commit that referenced this pull request Jan 31, 2022
* wip

* remove beans

* Remove javax.mail from the classpath as we use simplemail instead, which uses jakarta.
michaelabuckley added a commit that referenced this pull request Jan 31, 2022
* master:
  Add error codes to all exceptions (#3278)
  3156 multiple tag race condition (#3297)
  Fix globbing pattern for log files
  Update instance_validator.md (#3328)
  add needed dependendencies for mysql and mssql (#3343)
  Add okhttp dep
  3335 allow alternative character encoding length in searchparam (#3336)
  Fix mdm config for single application context environment.  (#3338)
  Validate include statements for JPA (#3331)
  Add okhttp dep to r5 and indicate which deps need to be included (#3332)
  Bump RestEasy to 5.0.2 (#3329)

# Conflicts:
#	hapi-fhir-base/src/main/java/ca/uhn/fhir/i18n/Msg.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
#	hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/lastn/ElasticsearchSvcImpl.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/FhirResourceDaoDstu2SearchNoFtTest.java
#	hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/module/matcher/InMemorySubscriptionMatcherR4Test.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants