Skip to content

attempt PR to merge code from original repo #34

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

Draft
wants to merge 71 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
250d234
Bump logback-core from 1.2.6 to 1.2.9
dependabot[bot] May 3, 2022
c2a69bf
Bump hazelcast from 5.0.3 to 5.0.4
dependabot[bot] Dec 27, 2022
54ee752
chore(CVEs): update lib versions for fixing CVEs
sgandon Sep 7, 2023
0a996d7
feat(#24): INCR with initial expiration
Nov 17, 2023
701dd8d
feat(#24): revert hazelcast test port
Nov 17, 2023
fba60ab
Merge pull request #20 from grrolland/dependabot/maven/ch.qos.logback…
grrolland Nov 20, 2023
67027b9
Merge pull request #21 from grrolland/dependabot/maven/com.hazelcast-…
grrolland Nov 20, 2023
4037f87
Merge branch 'master' into sgandon/fix_lib_CVEs
grrolland Nov 20, 2023
a63fd71
Merge pull request #22 from sgandon/sgandon/fix_lib_CVEs
grrolland Nov 20, 2023
9ac632c
Merge pull request #25 from alexist/feat/24-INCR-with-initial-TTL
grrolland Nov 20, 2023
17b9822
[maven-release-plugin] prepare release 1.0.9
actions-user Nov 20, 2023
7487a97
[maven-release-plugin] prepare for next development iteration
actions-user Nov 20, 2023
74e7c71
[maven-release-plugin] prepare release 1.0.9
actions-user Nov 20, 2023
1e77dde
Revert master to 1.0.9-SNAPSHOT
Nov 20, 2023
434be42
[maven-release-plugin] prepare release 1.0.9
actions-user Nov 20, 2023
33d9aaf
[maven-release-plugin] prepare for next development iteration
actions-user Nov 20, 2023
dc19fce
Fix sonar issues
Nov 20, 2023
e522409
[maven-release-plugin] prepare release 1.0.10
actions-user Nov 20, 2023
3fbda58
[maven-release-plugin] prepare for next development iteration
actions-user Nov 20, 2023
7dffd00
Fix sonar issues
Nov 20, 2023
542c151
[maven-release-plugin] prepare release 1.0.11
actions-user Nov 20, 2023
a520dd7
[maven-release-plugin] prepare for next development iteration
actions-user Nov 20, 2023
85c91b7
Fix sonar issues
Nov 20, 2023
b3661eb
Merge remote-tracking branch 'origin/master'
Nov 20, 2023
80f05d8
[maven-release-plugin] prepare release 1.0.12
actions-user Nov 20, 2023
c77e8f0
[maven-release-plugin] prepare for next development iteration
actions-user Nov 20, 2023
53bf264
[maven-release-plugin] prepare release 1.0.13
actions-user Nov 20, 2023
309429e
[maven-release-plugin] prepare for next development iteration
actions-user Nov 20, 2023
7965925
feat(#27): INCR command executed on each backup
Nov 20, 2023
821fa40
fix scm
Nov 20, 2023
70771a9
unit test cleanup
Nov 21, 2023
5dd862b
Merge pull request #28 from alexist/fix/#27
grrolland Nov 22, 2023
5b9df59
fix(#30): INCR command TTL issue due to lastingTime/deadline calculat…
Nov 22, 2023
9cf506d
comments
Nov 22, 2023
86db1c1
remove editor config
Nov 22, 2023
2c5454d
Merge pull request #31 from alexist/fix/30-incr-ttl-issues
grrolland Nov 22, 2023
2b39624
chore(editorconfig): add editorconfig and format code
Nov 22, 2023
70fda5d
Merge pull request #32 from alexist/chore/editorconfig
grrolland Nov 22, 2023
ba4d62a
feat(incr): decrease lasting time threshold deadline from 1000ms to 1…
Nov 24, 2023
28139ab
Merge pull request #33 from alexist/feat/lasting-time-min-deadline
grrolland Nov 24, 2023
ba0ead8
[maven-release-plugin] prepare release 1.0.14
actions-user Nov 24, 2023
6bc7f29
[maven-release-plugin] prepare for next development iteration
actions-user Nov 24, 2023
2ba6ce1
feat(rate-limiter): rate limiter
Nov 24, 2023
fdaafd0
feat(rate-limiter): cleanup
Nov 27, 2023
1409ca4
feat(rate-limiter): doc
Nov 27, 2023
444c589
feat(rate-limiter): doc
Nov 27, 2023
da03cd0
feat(rate-limiter): javadoc
Nov 27, 2023
8f05860
feat(rate-limiter): cleanup lua code
Nov 28, 2023
4735acc
Merge remote-tracking branch 'origin/master' into feat/rate-limiter
Nov 28, 2023
59ad196
feat(rate-limiter): add license info
Nov 28, 2023
84a4672
Bump ch.qos.logback:logback-core from 1.3.11 to 1.3.12
dependabot[bot] Nov 29, 2023
d5e3b03
Bump ch.qos.logback:logback-classic from 1.3.11 to 1.3.12
dependabot[bot] Nov 29, 2023
0f7e2d2
Merge pull request #35 from alexist/feat/rate-limiter
grrolland Jan 19, 2024
a5d3076
[maven-release-plugin] prepare release 1.0.15
actions-user Jan 19, 2024
5bdc503
[maven-release-plugin] prepare for next development iteration
actions-user Jan 19, 2024
700b387
fix(tu): fix unit test TouchTestCase.testUnexpire TTL
Jan 19, 2024
8078177
Merge pull request #36 from grrolland/dependabot/maven/ch.qos.logback…
grrolland Jan 19, 2024
3db9ffe
Merge pull request #37 from grrolland/dependabot/maven/ch.qos.logback…
grrolland Jan 19, 2024
3f0ef2f
Merge pull request #38 from alexist/fix/tu-testUnexpire-ttl
grrolland Jan 19, 2024
64676b6
Upgrade Actions
Jan 19, 2024
2571e7d
Upgrade Actions
Jan 19, 2024
427c958
Upgrade Actions
Jan 19, 2024
0052380
[maven-release-plugin] prepare release 1.0.16
actions-user Jan 19, 2024
59ac9b0
[maven-release-plugin] prepare for next development iteration
actions-user Jan 19, 2024
a758022
Upgrade Actions
Jan 19, 2024
42a0ab9
[maven-release-plugin] prepare release 1.0.17
actions-user Jan 19, 2024
461e6db
[maven-release-plugin] prepare for next development iteration
actions-user Jan 19, 2024
f498ddc
Upgrade Actions
Jan 22, 2024
9f32027
Merge remote-tracking branch 'origin/master'
Jan 22, 2024
93ec34a
[maven-release-plugin] prepare release 1.0.18
actions-user Jan 22, 2024
69ab5aa
[maven-release-plugin] prepare for next development iteration
actions-user Jan 22, 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
268 changes: 268 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,268 @@
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
max_line_length = 140
tab_width = 4
ij_continuation_indent_size = 8
ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
ij_formatter_tags_enabled = true
ij_smart_tabs = false
ij_wrap_on_typing = false
trim_trailing_whitespace = true

[*.java]
ij_java_align_consecutive_assignments = false
ij_java_align_consecutive_variable_declarations = false
ij_java_align_group_field_declarations = false
ij_java_align_multiline_annotation_parameters = true
ij_java_align_multiline_array_initializer_expression = false
ij_java_align_multiline_assignment = false
ij_java_align_multiline_binary_operation = false
ij_java_align_multiline_chained_methods = false
ij_java_align_multiline_extends_list = true
ij_java_align_multiline_for = false
ij_java_align_multiline_method_parentheses = false
ij_java_align_multiline_parameters = false
ij_java_align_multiline_parameters_in_calls = false
ij_java_align_multiline_parenthesized_expression = false
ij_java_align_multiline_resources = false
ij_java_align_multiline_ternary_operation = false
ij_java_align_multiline_text_blocks = false
ij_java_align_multiline_throws_list = false
ij_java_align_subsequent_simple_methods = false
ij_java_align_throws_keyword = false
ij_java_annotation_parameter_wrap = normal
ij_java_array_initializer_new_line_after_left_brace = false
ij_java_array_initializer_right_brace_on_new_line = false
ij_java_array_initializer_wrap = on_every_item
ij_java_assert_statement_colon_on_next_line = false
ij_java_assert_statement_wrap = off
ij_java_assignment_wrap = off
ij_java_binary_operation_sign_on_next_line = true
ij_java_binary_operation_wrap = normal
ij_java_blank_lines_after_anonymous_class_header = 0
ij_java_blank_lines_after_class_header = 0
ij_java_blank_lines_after_imports = 1
ij_java_blank_lines_after_package = 1
ij_java_blank_lines_around_class = 1
ij_java_blank_lines_around_field = 0
ij_java_blank_lines_around_field_in_interface = 0
ij_java_blank_lines_around_initializer = 1
ij_java_blank_lines_around_method = 1
ij_java_blank_lines_around_method_in_interface = 1
ij_java_blank_lines_before_class_end = 0
ij_java_blank_lines_before_imports = 1
ij_java_blank_lines_before_method_body = 0
ij_java_blank_lines_before_package = 0
ij_java_block_brace_style = end_of_line
ij_java_block_comment_at_first_column = true
ij_java_call_parameters_new_line_after_left_paren = false
ij_java_call_parameters_right_paren_on_new_line = false
ij_java_call_parameters_wrap = normal
ij_java_case_statement_on_separate_line = true
ij_java_catch_on_new_line = false
ij_java_class_annotation_wrap = split_into_lines
ij_java_class_brace_style = end_of_line
ij_java_class_count_to_use_import_on_demand = 999999
ij_java_class_names_in_javadoc = 2
ij_java_do_not_indent_top_level_class_members = false
ij_java_do_not_wrap_after_single_annotation = false
ij_java_do_while_brace_force = always
ij_java_doc_add_blank_line_after_description = true
ij_java_doc_add_blank_line_after_param_comments = false
ij_java_doc_add_blank_line_after_return = false
ij_java_doc_add_p_tag_on_empty_lines = true
ij_java_doc_align_exception_comments = true
ij_java_doc_align_param_comments = true
ij_java_doc_do_not_wrap_if_one_line = false
ij_java_doc_enable_formatting = true
ij_java_doc_enable_leading_asterisks = true
ij_java_doc_indent_on_continuation = false
ij_java_doc_keep_empty_lines = true
ij_java_doc_keep_empty_parameter_tag = true
ij_java_doc_keep_empty_return_tag = true
ij_java_doc_keep_empty_throws_tag = true
ij_java_doc_keep_invalid_tags = true
ij_java_doc_param_description_on_new_line = true
ij_java_doc_preserve_line_breaks = false
ij_java_doc_use_throws_not_exception_tag = true
ij_java_else_on_new_line = false
ij_java_entity_dd_suffix = EJB
ij_java_entity_eb_suffix = Bean
ij_java_entity_hi_suffix = Home
ij_java_entity_lhi_prefix = Local
ij_java_entity_lhi_suffix = Home
ij_java_entity_li_prefix = Local
ij_java_entity_pk_class = java.lang.String
ij_java_entity_vo_suffix = VO
ij_java_enum_constants_wrap = split_into_lines
ij_java_extends_keyword_wrap = off
ij_java_extends_list_wrap = normal
ij_java_field_annotation_wrap = split_into_lines
ij_java_finally_on_new_line = false
ij_java_for_brace_force = always
ij_java_for_statement_new_line_after_left_paren = false
ij_java_for_statement_right_paren_on_new_line = false
ij_java_for_statement_wrap = normal
ij_java_generate_final_locals = true
ij_java_generate_final_parameters = true
ij_java_if_brace_force = always
ij_java_imports_layout = *, |, javax.**, java.**, |, $*
ij_java_indent_case_from_switch = true
ij_java_insert_inner_class_imports = false
ij_java_insert_override_annotation = true
ij_java_keep_blank_lines_before_right_brace = 1
ij_java_keep_blank_lines_between_package_declaration_and_header = 2
ij_java_keep_blank_lines_in_code = 1
ij_java_keep_blank_lines_in_declarations = 1
ij_java_keep_control_statement_in_one_line = false
ij_java_keep_first_column_comment = true
ij_java_keep_indents_on_empty_lines = false
ij_java_keep_line_breaks = false
ij_java_keep_multiple_expressions_in_one_line = false
ij_java_keep_simple_blocks_in_one_line = false
ij_java_keep_simple_classes_in_one_line = false
ij_java_keep_simple_lambdas_in_one_line = false
ij_java_keep_simple_methods_in_one_line = false
ij_java_label_indent_absolute = false
ij_java_label_indent_size = 0
ij_java_lambda_brace_style = end_of_line
ij_java_layout_static_imports_separately = true
ij_java_line_comment_add_space = false
ij_java_line_comment_at_first_column = true
ij_java_message_dd_suffix = EJB
ij_java_message_eb_suffix = Bean
ij_java_method_annotation_wrap = split_into_lines
ij_java_method_brace_style = end_of_line
ij_java_method_call_chain_wrap = normal
ij_java_method_parameters_new_line_after_left_paren = false
ij_java_method_parameters_right_paren_on_new_line = false
ij_java_method_parameters_wrap = normal
ij_java_modifier_list_wrap = false
ij_java_names_count_to_use_import_on_demand = 999999
ij_java_parameter_annotation_wrap = off
ij_java_parameter_name_prefix = p
ij_java_parentheses_expression_new_line_after_left_paren = false
ij_java_parentheses_expression_right_paren_on_new_line = false
ij_java_place_assignment_sign_on_next_line = false
ij_java_prefer_longer_names = true
ij_java_prefer_parameters_wrap = false
ij_java_repeat_synchronized = true
ij_java_replace_instanceof_and_cast = false
ij_java_replace_null_check = true
ij_java_replace_sum_lambda_with_method_ref = true
ij_java_resource_list_new_line_after_left_paren = false
ij_java_resource_list_right_paren_on_new_line = false
ij_java_resource_list_wrap = off
ij_java_session_dd_suffix = EJB
ij_java_session_eb_suffix = Bean
ij_java_session_hi_suffix = Home
ij_java_session_lhi_prefix = Local
ij_java_session_lhi_suffix = Home
ij_java_session_li_prefix = Local
ij_java_session_si_suffix = Service
ij_java_space_after_closing_angle_bracket_in_type_argument = false
ij_java_space_after_colon = true
ij_java_space_after_comma = true
ij_java_space_after_comma_in_type_arguments = true
ij_java_space_after_for_semicolon = true
ij_java_space_after_quest = true
ij_java_space_after_type_cast = true
ij_java_space_before_annotation_array_initializer_left_brace = false
ij_java_space_before_annotation_parameter_list = false
ij_java_space_before_array_initializer_left_brace = false
ij_java_space_before_catch_keyword = true
ij_java_space_before_catch_left_brace = true
ij_java_space_before_catch_parentheses = true
ij_java_space_before_class_left_brace = true
ij_java_space_before_colon = true
ij_java_space_before_colon_in_foreach = true
ij_java_space_before_comma = false
ij_java_space_before_do_left_brace = true
ij_java_space_before_else_keyword = true
ij_java_space_before_else_left_brace = true
ij_java_space_before_finally_keyword = true
ij_java_space_before_finally_left_brace = true
ij_java_space_before_for_left_brace = true
ij_java_space_before_for_parentheses = true
ij_java_space_before_for_semicolon = false
ij_java_space_before_if_left_brace = true
ij_java_space_before_if_parentheses = true
ij_java_space_before_method_call_parentheses = false
ij_java_space_before_method_left_brace = true
ij_java_space_before_method_parentheses = false
ij_java_space_before_opening_angle_bracket_in_type_parameter = false
ij_java_space_before_quest = true
ij_java_space_before_switch_left_brace = true
ij_java_space_before_switch_parentheses = true
ij_java_space_before_synchronized_left_brace = true
ij_java_space_before_synchronized_parentheses = true
ij_java_space_before_try_left_brace = true
ij_java_space_before_try_parentheses = true
ij_java_space_before_type_parameter_list = false
ij_java_space_before_while_keyword = true
ij_java_space_before_while_left_brace = true
ij_java_space_before_while_parentheses = true
ij_java_space_inside_one_line_enum_braces = false
ij_java_space_within_empty_array_initializer_braces = false
ij_java_space_within_empty_method_call_parentheses = false
ij_java_space_within_empty_method_parentheses = false
ij_java_spaces_around_additive_operators = true
ij_java_spaces_around_assignment_operators = true
ij_java_spaces_around_bitwise_operators = true
ij_java_spaces_around_equality_operators = true
ij_java_spaces_around_lambda_arrow = true
ij_java_spaces_around_logical_operators = true
ij_java_spaces_around_method_ref_dbl_colon = false
ij_java_spaces_around_multiplicative_operators = true
ij_java_spaces_around_relational_operators = true
ij_java_spaces_around_shift_operators = true
ij_java_spaces_around_type_bounds_in_type_parameters = true
ij_java_spaces_around_unary_operator = false
ij_java_spaces_within_angle_brackets = false
ij_java_spaces_within_annotation_parentheses = false
ij_java_spaces_within_array_initializer_braces = false
ij_java_spaces_within_braces = false
ij_java_spaces_within_brackets = false
ij_java_spaces_within_cast_parentheses = false
ij_java_spaces_within_catch_parentheses = false
ij_java_spaces_within_for_parentheses = false
ij_java_spaces_within_if_parentheses = false
ij_java_spaces_within_method_call_parentheses = false
ij_java_spaces_within_method_parentheses = false
ij_java_spaces_within_parentheses = false
ij_java_spaces_within_switch_parentheses = false
ij_java_spaces_within_synchronized_parentheses = false
ij_java_spaces_within_try_parentheses = false
ij_java_spaces_within_while_parentheses = false
ij_java_special_else_if_treatment = true
ij_java_subclass_name_suffix = Impl
ij_java_ternary_operation_signs_on_next_line = false
ij_java_ternary_operation_wrap = normal
ij_java_test_name_suffix = TestCase
ij_java_throws_keyword_wrap = normal
ij_java_throws_list_wrap = normal
ij_java_use_external_annotations = false
ij_java_use_fq_class_names = false
ij_java_use_relative_indents = false
ij_java_use_single_class_imports = true
ij_java_variable_annotation_wrap = off
ij_java_visibility = public
ij_java_while_brace_force = always
ij_java_while_on_new_line = true
ij_java_wrap_comments = false
ij_java_wrap_first_method_in_call_chain = false
ij_java_wrap_long_lines = true

[.editorconfig]
ij_editorconfig_align_group_field_declarations = false
ij_editorconfig_space_after_colon = false
ij_editorconfig_space_after_comma = true
ij_editorconfig_space_before_colon = false
ij_editorconfig_space_before_comma = false
ij_editorconfig_spaces_around_assignment_operators = true

8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: maven
- name: Build
Expand Down
28 changes: 15 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ env:
IMAGE_NAME: ${{ github.repository }}
SONAR_URL: https://sonarcloud.io
SONAR_ORG: grrolland-github
SONAR_PROJECT_KEY: grrolland_ngx-distributed-shm

jobs:
release:
Expand All @@ -23,13 +24,13 @@ jobs:
##
# Perform Maven Release
#
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: master
- name: Set up JDK 11
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
cache: maven
- name: Configure Git user
Expand All @@ -44,7 +45,7 @@ jobs:
##
# Checkout and Build the Tag
#
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
ref: ${{ steps.get_tag_name.outputs.VERSION }}

Expand All @@ -57,8 +58,9 @@ jobs:
sonar:sonar \
-B -e -V \
-Dsonar.host.url=$SONAR_URL \
-Dsonar.login=$SONAR_TOKEN \
-Dsonar.token=$SONAR_TOKEN \
-Dsonar.organization=$SONAR_ORG \
-Dsonar.projectKey=$SONAR_PROJECT_KEY \
-Dsonar.sources=src/main \
-Dsonar.junit.reportPaths=target/surefire-reports \
-Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml
Expand All @@ -70,23 +72,23 @@ jobs:
# Publish to Github Docker Registry
#
- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
${{ steps.get_tag_name.outputs.VERSION }}
latest

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand All @@ -97,23 +99,23 @@ jobs:
# Publish to Alternate Docker Registry
#
- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
uses: docker/login-action@v3
with:
registry: ${{ env.ALTERNATE_REGISTRY }}
username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta_alt
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v5
with:
images: ${{ env.ALTERNATE_REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
${{ steps.get_tag_name.outputs.VERSION }}
latest

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand All @@ -127,4 +129,4 @@ jobs:
with:
body: Release version ${{ steps.get_tag_name.outputs.VERSION }}
tag: ${{ steps.get_tag_name.outputs.VERSION }}
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
target/
.idea/
dependency-reduced-pom.xml
*.iml
Loading