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.

Sign up for GitHub

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

Jump to bottom

feature(refactoring):xxx removed logging interceptors #1044

Merged
merged 9 commits into from
Jun 18, 2024
Merged

feature(refactoring):xxx removed logging interceptors #1044

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a72e52
feature(refactoring):xxx removed message coverters
ds-mwesener Jun 17, 2024
a052fe3
feature(refactoring):xxx removed message coverters
ds-mwesener Jun 18, 2024
4de015e
feature(refactoring):xxx removed message coverters
ds-mwesener Jun 18, 2024
be474a6
feature(refactoring):xxx removed message coverters
ds-mwesener Jun 18, 2024
a75d19b
feature(refactoring):xxx removed message coverters
ds-mwesener Jun 18, 2024
be99f8a
feature(refactoring):xxx fixed commit id on docker hub image.
ds-mwesener Jun 18, 2024
3b640d1
feature(refactoring):xxx fixed commit id on docker hub image.
ds-mwesener Jun 18, 2024
507e7c9
feature(refactoring):xxx fixed commit id on docker hub image.
ds-mwesener Jun 18, 2024
634651e
feature(refactoring):xxx fixed commit id on docker hub image.
ds-mwesener Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pull-request_backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_BACKEND }}
SONAR_ORGANIZATION: ${{ vars.SONAR_ORGANIZATION }}
SONAR_PROJECT_KEY: ${{ vars.SONAR_PROJECT_KEY_BACKEND }}
run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=/home/runner/work/tx-traceability-foss/tx-traceability-foss/tx-coverage/target/site/jacoco-aggregate/jacoco.xml -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY_BACKEND }} -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }}
run: mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=/home/runner/work/traceability-foss/traceability-foss/tx-coverage/target/site/jacoco-aggregate/jacoco.xml -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY_BACKEND }} -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }}

Publish-docker-image:
needs: [ "Test-and-Sonar" ]
Expand Down
1 change: 0 additions & 1 deletion ...nd/src/main/java/org/eclipse/tractusx/traceability/common/config/PolicyStartUpConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ public class PolicyStartUpConfig {
@ConditionalOnProperty(name = "applicationConfig.registerDecentralRegistryPermissions.enabled", havingValue = "true")
public void registerDecentralRegistryPermissions() throws JsonProcessingException {
ObjectMapper mapper = new ObjectMapper();
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
mapper.registerModule(new JavaTimeModule());
List<AcceptedPolicy> acceptedPolicy = buildAcceptedPolicies();
defaultAcceptedPoliciesProvider.addAcceptedPolicies(acceptedPolicy);
Expand Down
2 changes: 0 additions & 2 deletions .../main/java/org/eclipse/tractusx/traceability/common/config/RestTemplateConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ public RestTemplate irsAdminTemplate(@Autowired TraceabilityProperties traceabil
.rootUri(traceabilityProperties.getIrsBase())
.defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) // Set Content-Type header
.defaultHeader(IRS_API_KEY_HEADER_NAME, traceabilityProperties.getAdminApiKey())
.messageConverters(customMessageConverters())
.build();
}

Expand Down Expand Up @@ -225,7 +224,6 @@ private List<HttpMessageConverter<?>> customMessageConverters() {
.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS, true)
.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
.build()
.registerModules(javaTimeModule));

Expand Down
Loading