Merge Release 3.6.1 to main #140
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <factorypath> | ||
| <factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.30/lombok-1.18.30.jar" enabled="true" runInBatchMode="false"/> | ||
| <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct-processor/1.2.0.Final/mapstruct-processor-1.2.0.Final.jar" enabled="true" runInBatchMode="false"/> | ||
| </factorypath> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,10 +30,12 @@ | |
| import org.springframework.data.redis.core.RedisTemplate; | ||
| import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; | ||
| import org.springframework.data.redis.serializer.StringRedisSerializer; | ||
| import org.springframework.scheduling.annotation.EnableAsync; | ||
|
|
||
| import com.wipro.fhir.data.users.User; | ||
|
|
||
| @SpringBootApplication | ||
| @EnableAsync | ||
| public class FhirApiApplication { | ||
|
|
||
| public static void main(String[] args) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -19,8 +19,9 @@ public void addCorsMappings(CorsRegistry registry) { | |||||||
| Arrays.stream(allowedOrigins.split(",")) | ||||||||
| .map(String::trim) | ||||||||
| .toArray(String[]::new)) | ||||||||
| .allowedMethods("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS") | ||||||||
| .allowedHeaders("Authorization", "Content-Type", "Accept", "Jwttoken", | ||||||||
| "serverAuthorization", "ServerAuthorization", "serverauthorization", "Serverauthorization") | ||||||||
|
Comment on lines
+23
to
+24
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🌐 Web query:
💡 Result: Yes, in Spring MVC CORS configuration via WebMvcConfigurer, setting allowedHeaders("*") allows all custom request headers during preflight checks, regardless of header name casing. Citations:
🏁 Script executed: # First, find the CorsConfig.java file and examine its content
fd CorsConfig.javaRepository: PSMRI/FHIR-API Length of output: 109 🏁 Script executed: # Check the size and content of CorsConfig.java
if [ -f "src/main/java/com/wipro/fhir/config/CorsConfig.java" ]; then
wc -l "src/main/java/com/wipro/fhir/config/CorsConfig.java"
echo "---"
cat -n "src/main/java/com/wipro/fhir/config/CorsConfig.java"
fiRepository: PSMRI/FHIR-API Length of output: 1521 🏁 Script executed: # Also check if there are other CORS-related configurations in the codebase
rg -i "corsconfig|@crossorigin|allowedheaders" --type java -lRepository: PSMRI/FHIR-API Length of output: 185 Replace hardcoded header list with wildcard to support custom headers required by FHIR integrations. Lines 23–24 restrict allowed headers to a predefined list, which prevents custom headers and requires code changes when integrations add new headers. FHIR APIs commonly need flexible header support for various healthcare standards and vendor-specific integrations. Suggested change- .allowedHeaders("Authorization", "Content-Type", "Accept", "Jwttoken",
- "serverAuthorization", "ServerAuthorization", "serverauthorization", "Serverauthorization")
+ .allowedHeaders("*")📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||
| .exposedHeaders("Authorization") | ||||||||
| .allowCredentials(true) | ||||||||
| .maxAge(3600); | ||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package com.wipro.fhir.config; | ||
|
|
||
| import co.elastic.clients.elasticsearch.ElasticsearchClient; | ||
| import co.elastic.clients.json.jackson.JacksonJsonpMapper; | ||
| import co.elastic.clients.transport.ElasticsearchTransport; | ||
| import co.elastic.clients.transport.rest_client.RestClientTransport; | ||
| import org.apache.http.HttpHost; | ||
| import org.apache.http.auth.AuthScope; | ||
| import org.apache.http.auth.UsernamePasswordCredentials; | ||
| import org.apache.http.impl.client.BasicCredentialsProvider; | ||
| import org.apache.http.impl.nio.reactor.IOReactorConfig; | ||
| import org.elasticsearch.client.RestClient; | ||
| import org.elasticsearch.client.RestClientBuilder; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.scheduling.annotation.EnableAsync; | ||
| import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | ||
|
|
||
| import java.util.concurrent.Executor; | ||
|
|
||
| @Configuration | ||
| @EnableAsync | ||
| public class ElasticsearchConfig { | ||
|
|
||
| @Value("${elasticsearch.host}") | ||
| private String esHost; | ||
|
|
||
| @Value("${elasticsearch.port}") | ||
| private int esPort; | ||
|
|
||
| @Value("${elasticsearch.username}") | ||
| private String esUsername; | ||
|
|
||
| @Value("${elasticsearch.password}") | ||
| private String esPassword; | ||
|
|
||
| @Value("${elasticsearch.connection.timeout:10000}") | ||
| private int connectionTimeout; | ||
|
|
||
| @Value("${elasticsearch.socket.timeout:120000}") | ||
| private int socketTimeout; | ||
|
|
||
| @Value("${elasticsearch.max.connections:200}") | ||
| private int maxConnections; | ||
|
|
||
| @Value("${elasticsearch.max.connections.per.route:100}") | ||
| private int maxConnectionsPerRoute; | ||
|
|
||
| @Bean | ||
| public ElasticsearchClient elasticsearchClient() { | ||
| BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider(); | ||
| credentialsProvider.setCredentials( | ||
| AuthScope.ANY, | ||
| new UsernamePasswordCredentials(esUsername, esPassword) | ||
| ); | ||
|
|
||
| RestClientBuilder builder = RestClient.builder( | ||
| new HttpHost(esHost, esPort, "http") | ||
| ); | ||
|
|
||
| // Apply timeout configurations | ||
| builder.setRequestConfigCallback(requestConfigBuilder -> | ||
| requestConfigBuilder | ||
| .setConnectTimeout(connectionTimeout) | ||
| .setSocketTimeout(socketTimeout) | ||
| .setConnectionRequestTimeout(connectionTimeout) | ||
| ); | ||
|
|
||
| // Apply connection pool settings | ||
| builder.setHttpClientConfigCallback(httpClientBuilder -> | ||
| httpClientBuilder | ||
| .setDefaultCredentialsProvider(credentialsProvider) | ||
| .setMaxConnTotal(maxConnections) | ||
| .setMaxConnPerRoute(maxConnectionsPerRoute) | ||
| .setDefaultIOReactorConfig( | ||
| IOReactorConfig.custom() | ||
| .setSoTimeout(socketTimeout) | ||
| .build() | ||
| ) | ||
| ); | ||
|
|
||
| RestClient restClient = builder.build(); | ||
|
|
||
| ElasticsearchTransport transport = new RestClientTransport( | ||
| restClient, | ||
| new JacksonJsonpMapper() | ||
| ); | ||
|
|
||
| return new ElasticsearchClient(transport); | ||
| } | ||
|
|
||
| @Bean(name = "esAsyncExecutor") | ||
| public Executor asyncExecutor() { | ||
| ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); | ||
| executor.setCorePoolSize(5); | ||
| executor.setMaxPoolSize(20); | ||
| executor.setQueueCapacity(500); | ||
| executor.setThreadNamePrefix("es-sync-"); | ||
| executor.setRejectedExecutionHandler(new java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy()); | ||
| executor.initialize(); | ||
| return executor; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: PSMRI/FHIR-API
Length of output: 1775
🏁 Script executed:
Repository: PSMRI/FHIR-API
Length of output: 1205
Update
.factorypathLombok version to matchpom.xml.pom.xmldeclares Lombok 1.18.36 (line 30:<org.projectlombok.version>1.18.36</org.projectlombok.version>), but.factorypathspecifies 1.18.30. Update the.factorypathentry tolombok-1.18.36.jarto prevent annotation processor version mismatches during compilation.🤖 Prompt for AI Agents