[type:refactor] refactor e2e storage

[moremind]

Make sure that:

• You have read the contribution guidelines.
• You submit test cases (unit or integration tests) that back your changes.
• Your local test passed ./mvnw clean install -Dmaven.javadoc.skip=true.

[codecov-commenter]

Codecov Report

Merging #5284 (8be827b) into master (f02b31d) will increase coverage by 0.05%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #5284      +/-   ##
============================================
+ Coverage     61.63%   61.69%   +0.05%     
- Complexity     8737     8743       +6     
============================================
  Files          1252     1252              
  Lines         38586    38586              
  Branches       3691     3691              
============================================
+ Hits          23784    23804      +20     
+ Misses        12697    12682      -15     
+ Partials       2105     2100       -5     

see 5 files with indirect coverage changes

📣 Codecov offers a browser extension for seamless coverage viewing on GitHub. Try it in Chrome or Firefox today!