Merge deltas from Azure to OSDU

Ayushi Srivastavarequested to merge
aysriva/adme-osdu-delta into master

Apart from Azure specific changes

Storage Service Core Improvements and Security Enhancements

Dependency Updates

  • File: pom.xml

Upgraded os-core-common: 3.6.1 → 3.6.2 Updated Netty: 4.1.115.Final → 4.1.119.Final (security patches) Security & Validation Enhancements

  • File: EntitlementsAndCacheServiceImpl.java - Enhanced ACL validation with null-safety checks to prevent NPE on malformed ACL entries
  • File: LegalServiceImpl.java - Improved legal tag validation with better null-handling for record legal information
  • File: IngestionServiceImpl.java - Enhanced null-safety for legal information processing
  • File: VersionIdsValidator.java - Fixed version ID validation with more robust path parsing for record version management

Service Improvements

  • File: StorageFilter.java - Enhanced error handling in core storage filter with proper throwable logging
  • File: QueryApi.java - Improved Query API with better content-type handling for record retrieval

Test Infrastructure Improvements

  • File: TestUtils.java - Enhanced test reliability with retry policies for HTTP requests. Added new RetryPolicy class for handling network timeouts and service unavailability
  • File: AzureTestUtils.java - Enhanced test token management with environment variable support
  • File: OPAServiceImplTest.java - Improved mock handling with lenient mocking to reduce test flakiness
  • File: BulkUpdateRecordServiceImplTest.java - Enhanced test setup with better mock configuration
  • File: EntitlementsAndCacheServiceImplTest.java - Added new test cases for ACL validation edge cases
  • File: StorageFilterTest.java - Added test for proper error handling and logging
  • File: VersionIdsValidatorTest.java - Enhanced test coverage for version validation scenarios
  • File: TestRecordAccessAuthorization.java - Better authorization testing with flexible status code validation (401/403)
  • File: RecordAccessAuthorizationTests.java - Improved test reliability with retry mechanisms

Code Quality Improvements

Files: Multiple test and utility classes

  • Import organization and code cleanup across multiple files
  • Enhanced logging with structured error messages and exception details
  • Better exception handling patterns throughout the codebase
  • Enhanced test coverage for edge cases in validation

Impact: Core improvements with no breaking changes to public APIs.

Edited by Ayushi Srivastava

Merge request reports