Fixed build

README.md

@@ -1,10 +1,13 @@
 # Gossip ![Build status](https://travis-ci.org/edwardcapriolo/incubator-gossip.svg?)
 
-Gossip protocol is a method for a group of nodes to discover and check the liveliness of a cluster. More information can be found at http://en.wikipedia.org/wiki/Gossip_protocol.
+Gossip protocol is a method for a group of nodes to discover and check the liveliness of a cluster. More information can
+be found at http://en.wikipedia.org/wiki/Gossip_protocol.
 
-The original implementation was forked from https://code.google.com/p/java-gossip/. Several bug fixes and changes have already been added.
+The original implementation was forked from https://code.google.com/p/java-gossip/. Several bug fixes and changes have
+already been added.
 
-A set of easily-run examples, illustrating various features of Gossip, are available in the gossip-examples module. The README.md file, in that module described how to run those examples.
+A set of easily-run examples, illustrating various features of Gossip, are available in the gossip-examples module. The
+README.md file, in that module described how to run those examples.
 
 Below, a list of code snippits which show how to incorproate Apache Gossip into your project.
 
@@ -23,7 +26,8 @@ To gossip you need one or more seed nodes. Seed is just a list of places to init
   }
 ```
 
-Here we start five gossip processes and check that they discover each other. (Normally these are on different hosts but here we give each process a distinct local ip.
+Here we start five gossip processes and check that they discover each other. (Normally these are on different hosts but
+here we give each process a distinct local ip.
 
 ```java
   List<GossipService> clients = new ArrayList<>();

eclipse_template.xml

@@ -4,25 +4,33 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+                id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
+                value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
 <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/>
@@ -37,23 +45,29 @@
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
 <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
         <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
@@ -61,50 +75,66 @@
         <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
         <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
+                 value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+                 value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
+                 value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
@@ -116,62 +146,78 @@
         <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
         <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
+                 value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
         <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
         <setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
@@ -181,84 +227,126 @@
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+                 value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+                 value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+                id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+                value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+                 value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+                 value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting
+                id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
+                value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
+                 value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration"
+                 value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+                 value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
@@ -267,25 +355,38 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting
+                id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
+                value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+                 value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+                 value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+                 value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
+                 value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
+                 value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration"
+                 value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
+                 value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
     </profile>
 </profiles>

gossip-base/pom.xml

@@ -16,8 +16,8 @@
  	See the License for the specific language governing permissions and
  	limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,11 +38,13 @@
             <artifactId>jackson-core</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-math3 -->
         <dependency>
-			<groupId>commons-math</groupId>
+            <groupId>org.apache.commons</groupId>
-			<artifactId>commons-math</artifactId>
+            <artifactId>commons-math3</artifactId>
-			<version>${commons-math.version}</version>
+            <version>3.6.1</version>
         </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -51,35 +53,14 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
-			<version>${metrics.version}</version></dependency>
+            <version>${metrics.version}</version>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
-			<type>jar</type>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-			</exclusions>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
         <dependency>
-			<groupId>org.mockito</groupId>
+            <groupId>org.apache.logging.log4j</groupId>
-			<artifactId>mockito-core</artifactId>
+            <artifactId>log4j-core</artifactId>
-			<version>${mockito.version}</version>
+            <version>2.22.0</version>
-			<scope>test</scope>
         </dependency>
-		
     </dependencies>
 
 </project>

gossip-base/src/main/java/org/apache/gossip/GossipSettings.java

@@ -17,10 +17,9 @@
  */
 package org.apache.gossip;
 
-import org.apache.gossip.lock.LockManagerSettings;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.gossip.lock.LockManagerSettings;
 
 /**
  * In this object the settings used by the GossipService are held.
@@ -107,17 +106,6 @@ public class GossipSettings {
     this.gossipInterval = gossipInterval;
   }
 
-  /**
-   * Set the cleanup interval. This is the time between the last heartbeat received from a member
-   * and when it will be marked as dead.
-   * 
-   * @param cleanupInterval
-   *          The cleanup interval in ms.
-   */
-  public void setCleanupInterval(int cleanupInterval) {
-    this.cleanupInterval = cleanupInterval;
-  }
-
   /**
    * Get the gossip interval.
    *
@@ -127,6 +115,10 @@ public class GossipSettings {
     return gossipInterval;
   }
 
+  public void setGossipInterval(int gossipInterval) {
+    this.gossipInterval = gossipInterval;
+  }
+
   /**
    * Get the clean interval.
    * 
@@ -136,6 +128,17 @@ public class GossipSettings {
     return cleanupInterval;
   }
 
+  /**
+   * Set the cleanup interval. This is the time between the last heartbeat received from a member
+   * and when it will be marked as dead.
+   *
+   * @param cleanupInterval
+   *          The cleanup interval in ms.
+   */
+  public void setCleanupInterval(int cleanupInterval) {
+    this.cleanupInterval = cleanupInterval;
+  }
+
   public int getMinimumSamples() {
     return minimumSamples;
   }
@@ -160,10 +163,6 @@ public class GossipSettings {
     this.convictThreshold = convictThreshold;
   }
 
-  public void setGossipInterval(int gossipInterval) {
-    this.gossipInterval = gossipInterval;
-  }
-
   public String getDistribution() {
     return distribution;
   }

gossip-base/src/main/java/org/apache/gossip/LocalMember.java

@@ -25,30 +25,30 @@ import org.apache.gossip.accrual.FailureDetector;
 /**
  * This object represent a gossip member with the properties known locally. These objects are stored
  * in the local list of gossip members.
- * 
  */
 public class LocalMember extends Member {
   /** The failure detector for this member */
   private transient FailureDetector detector;
 
   /**
-   * 
+   * @param uri The uri of the member
-   * @param uri
+   * @param id id of the node
-   *          The uri of the member
+   * @param heartbeat The current heartbeat
-   * @param id
-   *          id of the node
-   * @param heartbeat
-   *          The current heartbeat
    */
-  public LocalMember(String clusterName, URI uri, String id,
+  public LocalMember(
-          long heartbeat, Map<String,String> properties, int windowSize, int minSamples, String distribution) {
+      String clusterName,
+      URI uri,
+      String id,
+      long heartbeat,
+      Map<String, String> properties,
+      int windowSize,
+      int minSamples,
+      String distribution) {
     super(clusterName, uri, id, heartbeat, properties);
     detector = new FailureDetector(minSamples, windowSize, distribution);
   }
 
-  protected LocalMember(){
+  protected LocalMember() {}
-    
-  }
 
   public void recordHeartbeat(long now) {
     detector.recordHeartbeat(now);
@@ -63,9 +63,18 @@ public class LocalMember extends Member {
     Double d = null;
     try {
       d = detect(System.nanoTime());
-    } catch (RuntimeException ex) {}
+    } catch (RuntimeException ex) {
-    return "LocalGossipMember [uri=" + uri + ", heartbeat=" + heartbeat + ", clusterName="
+    }
-            + clusterName + ", id=" + id + ", currentdetect=" + d  +" ]";
+    return "LocalGossipMember [uri="
+        + uri
+        + ", heartbeat="
+        + heartbeat
+        + ", clusterName="
+        + clusterName
+        + ", id="
+        + id
+        + ", currentdetect="
+        + d
+        + " ]";
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/Member.java

@@ -21,13 +21,9 @@ import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.Map;
 
-/**
+/** An abstract class representing a gossip member. */
- * An abstract class representing a gossip member.
- * 
- */
 public abstract class Member implements Comparable<Member> {
 
-  
   protected URI uri;
 
   protected volatile long heartbeat;
@@ -47,16 +43,13 @@ public abstract class Member implements Comparable<Member> {
   /**
    * Constructor.
    *
-   * @param clusterName
+   * @param clusterName The name of the cluster
-   *          The name of the cluster 
+   * @param uri A URI object containing IP/hostname and port
-   * @param uri
+   * @param heartbeat The current heartbeat
-   *          A URI object containing IP/hostname and port
+   * @param id An id that may be replaced after contact
-   * @param heartbeat
-   *          The current heartbeat
-   * @param id
-   *          An id that may be replaced after contact
    */
-  public Member(String clusterName, URI uri, String id, long heartbeat, Map<String,String> properties) {
+  public Member(
+      String clusterName, URI uri, String id, long heartbeat, Map<String, String> properties) {
     this.clusterName = clusterName;
     this.id = id;
     this.heartbeat = heartbeat;
@@ -65,6 +58,7 @@ public abstract class Member implements Comparable<Member> {
   }
 
   protected Member() {}
+
   /**
    * Get the name of the cluster the member belongs to.
    *
@@ -74,10 +68,9 @@ public abstract class Member implements Comparable<Member> {
     return clusterName;
   }
 
- 
   /**
-   * @return The member address in the form IP/host:port Similar to the toString in
+   * @return The member address in the form IP/host:port Similar to the toString in {@link
-   * {@link InetSocketAddress}
+   *     InetSocketAddress}
    */
   public String computeAddress() {
     return uri.getHost() + ":" + uri.getPort();
@@ -95,8 +88,7 @@ public abstract class Member implements Comparable<Member> {
   /**
    * Set the heartbeat of this gossip member.
    *
-   * @param heartbeat
+   * @param heartbeat The new heartbeat.
-   *          The new heartbeat.
    */
   public void setHeartbeat(long heartbeat) {
     this.heartbeat = heartbeat;
@@ -130,8 +122,10 @@ public abstract class Member implements Comparable<Member> {
     final int prime = 31;
     int result = 1;
     String address = computeAddress();
-    result = prime * result + ((address == null) ? 0 : address.hashCode()) + (clusterName == null ? 0
+    result =
-            : clusterName.hashCode());
+        prime * result
+            + ((address == null) ? 0 : address.hashCode())
+            + (clusterName == null ? 0 : clusterName.hashCode());
     return result;
   }
 

gossip-base/src/main/java/org/apache/gossip/RemoteMember.java

@@ -24,24 +24,21 @@ import java.util.Map;
 /**
  * The object represents a gossip member with the properties as received from a remote gossip
  * member.
- * 
  */
 public class RemoteMember extends Member {
 
   /**
    * Constructor.
    *
-   * @param uri
+   * @param uri A URI object containing IP/hostname and port
-   *          A URI object containing IP/hostname and port
+   * @param heartbeat The current heartbeat
-   * @param heartbeat
-   *          The current heartbeat
    */
-  public RemoteMember(String clusterName, URI uri, String id, long heartbeat, Map<String,String> properties) {
+  public RemoteMember(
+      String clusterName, URI uri, String id, long heartbeat, Map<String, String> properties) {
     super(clusterName, uri, id, heartbeat, properties);
   }
 
   public RemoteMember(String clusterName, URI uri, String id) {
     super(clusterName, uri, id, System.nanoTime(), new HashMap<String, String>());
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/StartupSettings.java

@@ -17,6 +17,8 @@
  */
 package org.apache.gossip;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -28,36 +30,26 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
+import lombok.extern.slf4j.Slf4j;
-import org.apache.log4j.Logger;
-
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * This object represents the settings used when starting the gossip service.
  * 
  */
+@Slf4j
 public class StartupSettings {
-  private static final Logger log = Logger.getLogger(StartupSettings.class);
-
-  /** The id to use fo the service */
-  private String id;
-
-  private URI uri;
-  
-  private String cluster;
-
-  /** The gossip settings used at startup. */
-  private final GossipSettings gossipSettings;
-
-  /** The list with gossip members to start with. */
-  private final List<Member> gossipMembers;
 
+  public static final int DEFAULT_BULK_TRANSFER_SIZE = 100;
   /** Default setting values */
   private static final boolean DEFAULT_BULK_TRANSFER = false;
-  public static final int DEFAULT_BULK_TRANSFER_SIZE = 100;
+  /** The gossip settings used at startup. */
+  private final GossipSettings gossipSettings;
+  /** The list with gossip members to start with. */
+  private final List<Member> gossipMembers;
+  /** The id to use fo the service */
+  private String id;
+  private URI uri;
+  private String cluster;
 
   /**
    * Constructor.
@@ -73,14 +65,6 @@ public class StartupSettings {
     this(id, uri, new GossipSettings(), cluster);
   }
 
-  public URI getUri() {
-    return uri;
-  }
-
-  public void setUri(URI uri) {
-    this.uri = uri;
-  }
-
   /**
    * Constructor.
    *
@@ -97,61 +81,6 @@ public class StartupSettings {
     gossipMembers = new ArrayList<>();
   }
 
-  public void setCluster(String cluster) {
-    this.cluster = cluster;
-  }
-
-  public String getCluster() {
-    return cluster;
-  }
-
-  /**
-   * Set the id to be used for this service.
-   * 
-   * @param id
-   *          The id for this service.
-   */
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  /**
-   * Get the id for this service.
-   * 
-   * @return the service's id.
-   */
-  public String getId() {
-    return id;
-  }
-
-  /**
-   * Get the GossipSettings.
-   * 
-   * @return The GossipSettings object.
-   */
-  public GossipSettings getGossipSettings() {
-    return gossipSettings;
-  }
-
-  /**
-   * Add a gossip member to the list of members to start with.
-   * 
-   * @param member
-   *          The member to add.
-   */
-  public void addGossipMember(Member member) {
-    gossipMembers.add(member);
-  }
-
-  /**
-   * Get the list with gossip members.
-   * 
-   * @return The gossip members.
-   */
-  public List<Member> getGossipMembers() {
-    return gossipMembers;
-  }
-
   /**
    * Parse the settings for the gossip service from a JSON file.
    *
@@ -215,12 +144,11 @@ public class StartupSettings {
     StartupSettings settings = new StartupSettings(id, uri2, gossipSettings, cluster);
     String configMembersDetails = "Config-members [";
     JsonNode membersJSON = jsonObject.get("members");
-    Iterator<JsonNode> it = membersJSON.iterator();
+      for (JsonNode child : membersJSON) {
-    while (it.hasNext()){
-      JsonNode child = it.next();
           URI uri3 = new URI(child.get("uri").textValue());
           RemoteMember member = new RemoteMember(child.get("cluster").asText(),
-              uri3, "", 0, new HashMap<String,String>());
+                  uri3, "", 0, new HashMap<String, String>()
+          );
           settings.addGossipMember(member);
           configMembersDetails += member.computeAddress();
           configMembersDetails += ", ";
@@ -228,4 +156,67 @@ public class StartupSettings {
     log.info(configMembersDetails + "]");
     return settings;
   }
+
+  public URI getUri() {
+    return uri;
+  }
+
+  public void setUri(URI uri) {
+    this.uri = uri;
+  }
+
+  public String getCluster() {
+    return cluster;
+  }
+
+  public void setCluster(String cluster) {
+    this.cluster = cluster;
+  }
+
+  /**
+   * Get the id for this service.
+   * 
+   * @return the service's id.
+   */
+  public String getId() {
+    return id;
+  }
+
+  /**
+   * Set the id to be used for this service.
+   *
+   * @param id
+   *          The id for this service.
+   */
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  /**
+   * Get the GossipSettings.
+   *
+   * @return The GossipSettings object.
+   */
+  public GossipSettings getGossipSettings() {
+    return gossipSettings;
+  }
+
+  /**
+   * Add a gossip member to the list of members to start with.
+   *
+   * @param member
+   *          The member to add.
+   */
+  public void addGossipMember(Member member) {
+    gossipMembers.add(member);
+  }
+
+  /**
+   * Get the list with gossip members.
+   *
+   * @return The gossip members.
+   */
+  public List<Member> getGossipMembers() {
+    return gossipMembers;
+  }
 }

gossip-base/src/main/java/org/apache/gossip/accrual/FailureDetector.java

@@ -17,19 +17,19 @@
  */
 package org.apache.gossip.accrual;
 
-import org.apache.commons.math.MathException;
+import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.math.distribution.ExponentialDistributionImpl;
+import org.apache.commons.math3.distribution.ExponentialDistribution;
-import org.apache.commons.math.distribution.NormalDistributionImpl;
+import org.apache.commons.math3.distribution.NormalDistribution;
-import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.exception.MathArithmeticException;
-import org.apache.log4j.Logger;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 
+@Slf4j
 public class FailureDetector {
 
-  public static final Logger LOGGER = Logger.getLogger(FailureDetector.class);
   private final DescriptiveStatistics descriptiveStatistics;
   private final long minimumSamples;
-  private volatile long latestHeartbeatMs = -1;
   private final String distribution;
+  private volatile long latestHeartbeatMs = -1;
 
   public FailureDetector(long minimumSamples, int windowSize, String distribution) {
     descriptiveStatistics = new DescriptiveStatistics(windowSize);
@@ -62,18 +62,18 @@ public class FailureDetector {
       double probability;
       if (distribution.equals("normal")) {
         double standardDeviation = descriptiveStatistics.getStandardDeviation();
-        standardDeviation = standardDeviation < 0.1 ? 0.1 : standardDeviation;
+        standardDeviation = Math.max(standardDeviation, 0.1);
-        probability = new NormalDistributionImpl(descriptiveStatistics.getMean(), standardDeviation).cumulativeProbability(delta);
+        probability = new NormalDistribution(descriptiveStatistics.getMean(), standardDeviation).cumulativeProbability(delta);
       } else {
-        probability = new ExponentialDistributionImpl(descriptiveStatistics.getMean()).cumulativeProbability(delta);
+        probability = new ExponentialDistribution(descriptiveStatistics.getMean()).cumulativeProbability(delta);
       }
       final double eps = 1e-12;
       if (1 - probability < eps) {
         probability = 1.0;
       }
       return -1.0d * Math.log10(1.0d - probability);
-    } catch (MathException | IllegalArgumentException e) {
+    } catch (MathArithmeticException | IllegalArgumentException e) {
-      LOGGER.debug(e);
+      log.error("Error!", e);
       return null;
     }
   }

gossip-base/src/main/java/org/apache/gossip/crdt/Crdt.java

@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 package org.apache.gossip.crdt;
+
 /**
- * 
  * Immutable type
  *
  * @param <SetType>
@@ -25,15 +25,15 @@ package org.apache.gossip.crdt;
  */
 public interface Crdt<SetType, MergeReturnType extends Crdt<SetType, MergeReturnType>> {
 
- 
   MergeReturnType merge(MergeReturnType other);
+
   SetType value();
+
   /**
-   * Called to self optimize. Some CRDTs may use some mechanism to clean up be 
+   * Called to self optimize. Some CRDTs may use some mechanism to clean up be removing obsolete
-   * removing obsolete data outside the scope of merging. IE this could clean up 
+   * data outside the scope of merging. IE this could clean up temporal values, old copies etc.
-   * temporal values, old copies etc. 
+   *
    * @return the Crdt structure optimized
    */
   MergeReturnType optimize();
-
 }

gossip-base/src/main/java/org/apache/gossip/crdt/CrdtAddRemoveSet.java

@@ -19,10 +19,14 @@ package org.apache.gossip.crdt;
 
 import java.util.Set;
 
-// Interface extends CrdtSet interface with add and remove operation that are guaranteed to be immutable.
+// Interface extends CrdtSet interface with add and remove operation that are guaranteed to be
-// If your implementation provide immutable add/remove operations you can extend AbstractCRDTStringSetTest to check it in the most ways.
+// immutable.
+// If your implementation provide immutable add/remove operations you can extend
+// AbstractCRDTStringSetTest to check it in the most ways.
 
-public interface CrdtAddRemoveSet<T, SetType extends Set<T>, R extends CrdtAddRemoveSet<T, SetType, R>> extends CrdtSet<T, SetType, R> {
+public interface CrdtAddRemoveSet<
+        T, SetType extends Set<T>, R extends CrdtAddRemoveSet<T, SetType, R>>
+    extends CrdtSet<T, SetType, R> {
   R add(T element);
 
   R remove(T element);

gossip-base/src/main/java/org/apache/gossip/crdt/CrdtBiFunctionMerge.java

@@ -23,8 +23,7 @@ import java.util.function.BiFunction;
 public class CrdtBiFunctionMerge implements BiFunction<Crdt, Crdt, Crdt> {
 
   @SuppressWarnings("unchecked")
-  @Override
+  public static Crdt applyStatic(Crdt t, Crdt u) {
-  public Crdt apply(Crdt t, Crdt u) {
     if (t == null && u == null) {
       return null;
     } else if (t == null) {
@@ -39,7 +38,8 @@ public class CrdtBiFunctionMerge implements BiFunction<Crdt,Crdt,Crdt> {
   }
 
   @SuppressWarnings("unchecked")
-  public static Crdt applyStatic(Crdt t, Crdt u){
+  @Override
+  public Crdt apply(Crdt t, Crdt u) {
     if (t == null && u == null) {
       return null;
     } else if (t == null) {

gossip-base/src/main/java/org/apache/gossip/crdt/CrdtCounter.java

@@ -18,7 +18,4 @@
 package org.apache.gossip.crdt;
 
 public interface CrdtCounter<ValueType extends Number, R extends CrdtCounter<ValueType, R>>
-        extends Crdt<ValueType, R> {
+    extends Crdt<ValueType, R> {}
-  
-}
-

gossip-base/src/main/java/org/apache/gossip/crdt/CrdtModule.java

@@ -23,6 +23,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import org.apache.gossip.LocalMember;
 import org.apache.gossip.lock.vote.MajorityVote;
 import org.apache.gossip.lock.vote.Vote;
@@ -31,11 +35,6 @@ import org.apache.gossip.replication.BlackListReplicable;
 import org.apache.gossip.replication.Replicable;
 import org.apache.gossip.replication.WhiteListReplicable;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
 abstract class OrSetMixin<E> {
   @JsonCreator
   OrSetMixin(@JsonProperty("elements") Map<E, Set<UUID>> w, @JsonProperty("tombstones") Map<E, Set<UUID>> h) { }

gossip-base/src/main/java/org/apache/gossip/crdt/CrdtSet.java

@@ -19,8 +19,6 @@ package org.apache.gossip.crdt;
 
 import java.util.Set;
 
-public interface CrdtSet<ElementType, SetType extends Set<ElementType>, R extends CrdtSet<ElementType, SetType, R>>
+public interface CrdtSet<
-extends Crdt<SetType, R> {
+        ElementType, SetType extends Set<ElementType>, R extends CrdtSet<ElementType, SetType, R>>
-
+    extends Crdt<SetType, R> {}
-}
-

gossip-base/src/main/java/org/apache/gossip/crdt/GrowOnlyCounter.java

@@ -18,10 +18,9 @@
 
 package org.apache.gossip.crdt;
 
-import org.apache.gossip.manager.GossipManager;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.gossip.manager.GossipManager;
 
 public class GrowOnlyCounter implements CrdtCounter<Long, GrowOnlyCounter> {
   

gossip-base/src/main/java/org/apache/gossip/crdt/GrowOnlySet.java

@@ -24,7 +24,8 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-public class GrowOnlySet<ElementType> implements CrdtSet<ElementType, Set<ElementType>, GrowOnlySet<ElementType>>{
+public class GrowOnlySet<ElementType>
+    implements CrdtSet<ElementType, Set<ElementType>, GrowOnlySet<ElementType>> {
 
   private final Set<ElementType> hidden = new LinkedHashSet<>();
 
@@ -32,9 +33,7 @@ public class GrowOnlySet<ElementType> implements CrdtSet<ElementType, Set<Elemen
   /*
    * Used by SerDe
    */
-  private GrowOnlySet(){
+  private GrowOnlySet() {}
-    
-  }
 
   public GrowOnlySet(Set<ElementType> c) {
     hidden.addAll(c);
@@ -135,19 +134,14 @@ public class GrowOnlySet<ElementType> implements CrdtSet<ElementType, Set<Elemen
 
   @Override
   public boolean equals(Object obj) {
-    if (this == obj)
+    if (this == obj) return true;
-      return true;
+    if (obj == null) return false;
-    if (obj == null)
+    if (getClass() != obj.getClass()) return false;
-      return false;
-    if (getClass() != obj.getClass())
-      return false;
     @SuppressWarnings("rawtypes")
     GrowOnlySet other = (GrowOnlySet) obj;
     if (hidden == null) {
-      if (other.hidden != null)
+      if (other.hidden != null) return false;
-        return false;
+    } else if (!hidden.equals(other.hidden)) return false;
-    } else if (!hidden.equals(other.hidden))
-      return false;
     return true;
   }
 

gossip-base/src/main/java/org/apache/gossip/crdt/LwwSet.java

@@ -17,9 +17,6 @@
  */
 package org.apache.gossip.crdt;
 
-import org.apache.gossip.manager.Clock;
-import org.apache.gossip.manager.SystemClock;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,6 +25,8 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.apache.gossip.manager.Clock;
+import org.apache.gossip.manager.SystemClock;
 
 /*
   Last write wins CrdtSet
@@ -49,6 +48,82 @@ public class LwwSet<ElementType> implements CrdtAddRemoveSet<ElementType, Set<El
 
   private final Map<ElementType, Timestamps> struct;
 
+  public LwwSet(){
+    struct = new HashMap<>();
+  }
+
+
+  @SafeVarargs
+  public LwwSet(ElementType... elements){
+    this(new HashSet<>(Arrays.asList(elements)));
+  }
+
+  public LwwSet(Set<ElementType> set){
+    struct = new HashMap<>();
+    for (ElementType e : set){
+      struct.put(e, new Timestamps().updateAdd());
+    }
+  }
+
+  public LwwSet(LwwSet<ElementType> first, LwwSet<ElementType> second){
+    Function<ElementType, Timestamps> timestampsFor = p -> {
+      Timestamps firstTs = first.struct.get(p);
+      Timestamps secondTs = second.struct.get(p);
+      if (firstTs == null){
+        return secondTs;
+      }
+      return firstTs.merge(secondTs);
+    };
+    struct = Stream.concat(first.struct.keySet().stream(), second.struct.keySet().stream())
+        .distinct().collect(Collectors.toMap(p -> p, timestampsFor));
+  }
+
+  // for serialization
+  LwwSet(Map<ElementType, Timestamps> struct){
+    this.struct = struct;
+  }
+
+  public LwwSet<ElementType> add(ElementType e){
+    return this.merge(new LwwSet<>(e));
+  }
+
+  Map<ElementType, Timestamps> getStruct(){
+    return struct;
+  }
+
+  public LwwSet<ElementType> remove(ElementType e){
+    Timestamps eTimestamps = struct.get(e);
+    if (eTimestamps == null || !eTimestamps.isPresent()){
+      return this;
+    }
+    Map<ElementType, Timestamps> changeMap = new HashMap<>();
+    changeMap.put(e, eTimestamps.updateRemove());
+    return this.merge(new LwwSet<>(changeMap));
+  }
+
+  @Override
+  public LwwSet<ElementType> merge(LwwSet<ElementType> other){
+    return new LwwSet<>(this, other);
+  }
+
+  @Override
+  public Set<ElementType> value(){
+    return struct.entrySet().stream()
+        .filter(entry -> entry.getValue().isPresent())
+        .map(Map.Entry::getKey)
+        .collect(Collectors.toSet());
+  }
+
+  @Override
+  public LwwSet<ElementType> optimize(){
+    return this;
+  }
+
+  @Override
+  public boolean equals(Object obj){
+    return this == obj || (obj != null && getClass() == obj.getClass() && value().equals(((LwwSet) obj).value()));
+  }
+
   static class Timestamps {
     private final long latestAdd;
     private final long latestRemove;
@@ -91,81 +166,4 @@ public class LwwSet<ElementType> implements CrdtAddRemoveSet<ElementType, Set<El
       return new Timestamps(Math.max(latestAdd, other.latestAdd), Math.max(latestRemove, other.latestRemove));
     }
   }
-
-
-  public LwwSet(){
-    struct = new HashMap<>();
-  }
-
-  @SafeVarargs
-  public LwwSet(ElementType... elements){
-    this(new HashSet<>(Arrays.asList(elements)));
-  }
-
-  public LwwSet(Set<ElementType> set){
-    struct = new HashMap<>();
-    for (ElementType e : set){
-      struct.put(e, new Timestamps().updateAdd());
-    }
-  }
-
-  public LwwSet(LwwSet<ElementType> first, LwwSet<ElementType> second){
-    Function<ElementType, Timestamps> timestampsFor = p -> {
-      Timestamps firstTs = first.struct.get(p);
-      Timestamps secondTs = second.struct.get(p);
-      if (firstTs == null){
-        return secondTs;
-      }
-      return firstTs.merge(secondTs);
-    };
-    struct = Stream.concat(first.struct.keySet().stream(), second.struct.keySet().stream())
-        .distinct().collect(Collectors.toMap(p -> p, timestampsFor));
-  }
-
-  public LwwSet<ElementType> add(ElementType e){
-    return this.merge(new LwwSet<>(e));
-  }
-
-  // for serialization
-  LwwSet(Map<ElementType, Timestamps> struct){
-    this.struct = struct;
-  }
-
-  Map<ElementType, Timestamps> getStruct(){
-    return struct;
-  }
-
-
-  public LwwSet<ElementType> remove(ElementType e){
-    Timestamps eTimestamps = struct.get(e);
-    if (eTimestamps == null || !eTimestamps.isPresent()){
-      return this;
-    }
-    Map<ElementType, Timestamps> changeMap = new HashMap<>();
-    changeMap.put(e, eTimestamps.updateRemove());
-    return this.merge(new LwwSet<>(changeMap));
-  }
-
-  @Override
-  public LwwSet<ElementType> merge(LwwSet<ElementType> other){
-    return new LwwSet<>(this, other);
-  }
-
-  @Override
-  public Set<ElementType> value(){
-    return struct.entrySet().stream()
-        .filter(entry -> entry.getValue().isPresent())
-        .map(Map.Entry::getKey)
-        .collect(Collectors.toSet());
-  }
-
-  @Override
-  public LwwSet<ElementType> optimize(){
-    return this;
-  }
-
-  @Override
-  public boolean equals(Object obj){
-    return this == obj || (obj != null && getClass() == obj.getClass() && value().equals(((LwwSet) obj).value()));
-  }
 }

gossip-base/src/main/java/org/apache/gossip/crdt/MaxChangeSet.java

@@ -37,7 +37,8 @@ import java.util.stream.Stream;
   DataTest - integration test with 2 nodes, MaxChangeSet was serialized/deserialized, sent between nodes, merged
 */
 
-public class MaxChangeSet<ElementType> implements CrdtAddRemoveSet<ElementType, Set<ElementType>, MaxChangeSet<ElementType>> {
+public class MaxChangeSet<ElementType>
+    implements CrdtAddRemoveSet<ElementType, Set<ElementType>, MaxChangeSet<ElementType>> {
   private final Map<ElementType, Integer> struct;
 
   public MaxChangeSet() {
@@ -57,10 +58,13 @@ public class MaxChangeSet<ElementType> implements CrdtAddRemoveSet<ElementType,
   }
 
   public MaxChangeSet(MaxChangeSet<ElementType> first, MaxChangeSet<ElementType> second) {
-    Function<ElementType, Integer> valueFor = element ->
+    Function<ElementType, Integer> valueFor =
+        element ->
             Math.max(first.struct.getOrDefault(element, 0), second.struct.getOrDefault(element, 0));
-    struct = Stream.concat(first.struct.keySet().stream(), second.struct.keySet().stream())
+    struct =
-        .distinct().collect(Collectors.toMap(p -> p, valueFor));
+        Stream.concat(first.struct.keySet().stream(), second.struct.keySet().stream())
+            .distinct()
+            .collect(Collectors.toMap(p -> p, valueFor));
   }
 
   // for serialization
@@ -112,6 +116,9 @@ public class MaxChangeSet<ElementType> implements CrdtAddRemoveSet<ElementType,
 
   @Override
   public boolean equals(Object obj) {
-    return this == obj || (obj != null && getClass() == obj.getClass() && value().equals(((MaxChangeSet) obj).value()));
+    return this == obj
+        || (obj != null
+            && getClass() == obj.getClass()
+            && value().equals(((MaxChangeSet) obj).value()));
   }
 }

gossip-base/src/main/java/org/apache/gossip/crdt/OrSet.java

@@ -20,7 +20,6 @@ package org.apache.gossip.crdt;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.BiConsumer;
-
 import org.apache.gossip.crdt.OrSet.Builder.Operation;
 
 /*
@@ -83,6 +82,21 @@ public class OrSet<E>  implements CrdtAddRemoveSet<E, Set<E>, OrSet<E>> {
     val = computeValue();
   }
 
+  public OrSet(OrSet<E> left, OrSet<E> right){
+    BiConsumer<Map<E, Set<UUID>>, Map<E, Set<UUID>>> internalMerge = (items, other) -> {
+      for (Entry<E, Set<UUID>> l : other.entrySet()){
+        internalSetMerge(items, l.getKey(), l.getValue());
+      }
+    };
+
+    internalMerge.accept(elements, left.elements);
+    internalMerge.accept(elements, right.elements);
+    internalMerge.accept(tombstones, left.tombstones);
+    internalMerge.accept(tombstones, right.tombstones);
+
+    val = computeValue();
+  }
+
   static Set<UUID> mergeSets(Set<UUID> a, Set<UUID> b) {
     if ((a == null || a.isEmpty()) && (b == null || b.isEmpty())) {
       return null;
@@ -99,21 +113,6 @@ public class OrSet<E>  implements CrdtAddRemoveSet<E, Set<E>, OrSet<E>> {
     map.merge(key, value, OrSet::mergeSets);
   }
 
-  public OrSet(OrSet<E> left, OrSet<E> right){
-    BiConsumer<Map<E, Set<UUID>>, Map<E, Set<UUID>>> internalMerge = (items, other) -> {
-      for (Entry<E, Set<UUID>> l : other.entrySet()){
-        internalSetMerge(items, l.getKey(), l.getValue());
-      }
-    };
-
-    internalMerge.accept(elements, left.elements);
-    internalMerge.accept(elements, right.elements);
-    internalMerge.accept(tombstones, left.tombstones);
-    internalMerge.accept(tombstones, right.tombstones);
-
-    val = computeValue();
-  }
-
   public OrSet<E> add(E e) {
     return this.merge(new OrSet<>(e));
   }
@@ -166,55 +165,18 @@ public class OrSet<E>  implements CrdtAddRemoveSet<E, Set<E>, OrSet<E>> {
     return this;
   }
   
-  public static class Builder<E> {
-    public static enum Operation {
-      ADD, REMOVE
-    };
-
-    private class OrSetElement<EL> {
-      EL element;
-      Operation operation;
-
-      private OrSetElement(EL element, Operation operation) {
-        this.element = element;
-        this.operation = operation;
-      }
-    }
-
-    private List<OrSetElement<E>> elements = new ArrayList<>();
-
-    public Builder<E> add(E element) {
-      elements.add(new OrSetElement<E>(element, Operation.ADD));
-      return this;
-    }
-
-    public Builder<E> remove(E element) {
-      elements.add(new OrSetElement<E>(element, Operation.REMOVE));
-      return this;
-    }
-
-    public Builder<E> mutate(E element, Operation operation) {
-      elements.add(new OrSetElement<E>(element, operation));
-      return this;
-    }
-  }
-
-  
   public int size() {
     return value().size();
   }
 
-  
   public boolean isEmpty() {
     return value().size() == 0;
   }
 
-  
   public boolean contains(Object o) {
     return value().contains(o);
   }
 
-  
   public Iterator<E> iterator() {
     Iterator<E> managed = value().iterator();
     return new Iterator<E>() {
@@ -304,4 +266,37 @@ public class OrSet<E>  implements CrdtAddRemoveSet<E, Set<E>, OrSet<E>> {
     return tombstones;
   }
 
+  public static class Builder<E> {
+        private List<OrSetElement<E>> elements = new ArrayList<>();;
+
+    public Builder<E> add(E element) {
+      elements.add(new OrSetElement<E>(element, Operation.ADD));
+      return this;
+    }
+
+    public Builder<E> remove(E element) {
+      elements.add(new OrSetElement<E>(element, Operation.REMOVE));
+      return this;
+    }
+
+    public Builder<E> mutate(E element, Operation operation) {
+      elements.add(new OrSetElement<E>(element, operation));
+      return this;
+    }
+
+public static enum Operation {
+      ADD, REMOVE
+    }
+
+    private class OrSetElement<EL> {
+      EL element;
+      Operation operation;
+
+      private OrSetElement(EL element, Operation operation) {
+        this.element = element;
+        this.operation = operation;
+      }
+    }
+  }
+
 }

gossip-base/src/main/java/org/apache/gossip/crdt/PNCounter.java

@@ -18,7 +18,6 @@
 package org.apache.gossip.crdt;
 
 import java.util.Map;
-
 import org.apache.gossip.manager.GossipManager;
 
 public class PNCounter implements CrdtCounter<Long, PNCounter> {

gossip-base/src/main/java/org/apache/gossip/crdt/TwoPhaseSet.java

@@ -36,7 +36,8 @@ import java.util.stream.Stream;
   DataTest - integration test with 2 nodes, TwoPhaseSet was serialized/deserialized, sent between nodes, merged
 */
 
-public class TwoPhaseSet<ElementType> implements CrdtAddRemoveSet<ElementType, Set<ElementType>, TwoPhaseSet<ElementType>> {
+public class TwoPhaseSet<ElementType>
+    implements CrdtAddRemoveSet<ElementType, Set<ElementType>, TwoPhaseSet<ElementType>> {
   private final Set<ElementType> added;
   private final Set<ElementType> removed;
 
@@ -58,8 +59,8 @@ public class TwoPhaseSet<ElementType> implements CrdtAddRemoveSet<ElementType, S
   }
 
   public TwoPhaseSet(TwoPhaseSet<ElementType> first, TwoPhaseSet<ElementType> second) {
-    BiFunction<Set<ElementType>, Set<ElementType>, Set<ElementType>> mergeSets = (f, s) ->
+    BiFunction<Set<ElementType>, Set<ElementType>, Set<ElementType>> mergeSets =
-        Stream.concat(f.stream(), s.stream()).collect(Collectors.toSet());
+        (f, s) -> Stream.concat(f.stream(), s.stream()).collect(Collectors.toSet());
 
     added = mergeSets.apply(first.added, second.added);
     removed = mergeSets.apply(first.removed, second.removed);
@@ -110,6 +111,9 @@ public class TwoPhaseSet<ElementType> implements CrdtAddRemoveSet<ElementType, S
 
   @Override
   public boolean equals(Object obj) {
-    return this == obj || (obj != null && getClass() == obj.getClass() && value().equals(((TwoPhaseSet) obj).value()));
+    return this == obj
+        || (obj != null
+            && getClass() == obj.getClass()
+            && value().equals(((TwoPhaseSet) obj).value()));
   }
 }

gossip-base/src/main/java/org/apache/gossip/event/GossipState.java

@@ -18,7 +18,9 @@
 package org.apache.gossip.event;
 
 public enum GossipState {
-  UP("up"), DOWN("down");
+  UP("up"),
+  DOWN("down");
+
   @SuppressWarnings("unused")
   private final String state;
 

gossip-base/src/main/java/org/apache/gossip/event/data/DataEventConstants.java

@@ -20,14 +20,14 @@ package org.apache.gossip.event.data;
 public class DataEventConstants {
 
   // MetricRegistry
-  public static final String PER_NODE_DATA_SUBSCRIBERS_SIZE
+  public static final String PER_NODE_DATA_SUBSCRIBERS_SIZE =
-          = "gossip.event.data.pernode.subscribers.size";
+      "gossip.event.data.pernode.subscribers.size";
-  public static final String PER_NODE_DATA_SUBSCRIBERS_QUEUE_SIZE
+  public static final String PER_NODE_DATA_SUBSCRIBERS_QUEUE_SIZE =
-          = "gossip.event.data.pernode.subscribers.queue.size";
+      "gossip.event.data.pernode.subscribers.queue.size";
-  public static final String SHARED_DATA_SUBSCRIBERS_SIZE
+  public static final String SHARED_DATA_SUBSCRIBERS_SIZE =
-          = "gossip.event.data.shared.subscribers.size";
+      "gossip.event.data.shared.subscribers.size";
-  public static final String SHARED_DATA_SUBSCRIBERS_QUEUE_SIZE
+  public static final String SHARED_DATA_SUBSCRIBERS_QUEUE_SIZE =
-          = "gossip.event.data.shared.subscribers.queue.size";
+      "gossip.event.data.shared.subscribers.queue.size";
 
   // Thread pool
   public static final int PER_NODE_DATA_QUEUE_SIZE = 64;
@@ -38,5 +38,4 @@ public class DataEventConstants {
   public static final int SHARED_DATA_CORE_POOL_SIZE = 1;
   public static final int SHARED_DATA_MAX_POOL_SIZE = 30;
   public static final int SHARED_DATA_KEEP_ALIVE_TIME_SECONDS = 1;
-  
 }

gossip-base/src/main/java/org/apache/gossip/event/data/DataEventManager.java

@@ -40,39 +40,52 @@ public class DataEventManager {
   public DataEventManager(MetricRegistry metrics) {
     perNodeDataHandlers = new CopyOnWriteArrayList<>();
     perNodeDataHandlerQueue = new ArrayBlockingQueue<>(DataEventConstants.PER_NODE_DATA_QUEUE_SIZE);
-    perNodeDataEventExecutor = new ThreadPoolExecutor(
+    perNodeDataEventExecutor =
+        new ThreadPoolExecutor(
             DataEventConstants.PER_NODE_DATA_CORE_POOL_SIZE,
             DataEventConstants.PER_NODE_DATA_MAX_POOL_SIZE,
-            DataEventConstants.PER_NODE_DATA_KEEP_ALIVE_TIME_SECONDS, TimeUnit.SECONDS,
+            DataEventConstants.PER_NODE_DATA_KEEP_ALIVE_TIME_SECONDS,
-            perNodeDataHandlerQueue, new ThreadPoolExecutor.DiscardOldestPolicy());
+            TimeUnit.SECONDS,
+            perNodeDataHandlerQueue,
+            new ThreadPoolExecutor.DiscardOldestPolicy());
 
     sharedDataHandlers = new CopyOnWriteArrayList<>();
     sharedDataHandlerQueue = new ArrayBlockingQueue<>(DataEventConstants.SHARED_DATA_QUEUE_SIZE);
-    sharedDataEventExecutor = new ThreadPoolExecutor(DataEventConstants.SHARED_DATA_CORE_POOL_SIZE,
+    sharedDataEventExecutor =
+        new ThreadPoolExecutor(
+            DataEventConstants.SHARED_DATA_CORE_POOL_SIZE,
             DataEventConstants.SHARED_DATA_MAX_POOL_SIZE,
-            DataEventConstants.SHARED_DATA_KEEP_ALIVE_TIME_SECONDS, TimeUnit.SECONDS,
+            DataEventConstants.SHARED_DATA_KEEP_ALIVE_TIME_SECONDS,
-            sharedDataHandlerQueue, new ThreadPoolExecutor.DiscardOldestPolicy());
+            TimeUnit.SECONDS,
+            sharedDataHandlerQueue,
+            new ThreadPoolExecutor.DiscardOldestPolicy());
 
-    metrics.register(DataEventConstants.PER_NODE_DATA_SUBSCRIBERS_SIZE,
+    metrics.register(
+        DataEventConstants.PER_NODE_DATA_SUBSCRIBERS_SIZE,
         (Gauge<Integer>) () -> perNodeDataHandlers.size());
-    metrics.register(DataEventConstants.PER_NODE_DATA_SUBSCRIBERS_QUEUE_SIZE,
+    metrics.register(
+        DataEventConstants.PER_NODE_DATA_SUBSCRIBERS_QUEUE_SIZE,
         (Gauge<Integer>) () -> perNodeDataHandlerQueue.size());
-    metrics.register(DataEventConstants.SHARED_DATA_SUBSCRIBERS_SIZE,
+    metrics.register(
+        DataEventConstants.SHARED_DATA_SUBSCRIBERS_SIZE,
         (Gauge<Integer>) () -> sharedDataHandlers.size());
-    metrics.register(DataEventConstants.SHARED_DATA_SUBSCRIBERS_QUEUE_SIZE,
+    metrics.register(
+        DataEventConstants.SHARED_DATA_SUBSCRIBERS_QUEUE_SIZE,
         (Gauge<Integer>) () -> sharedDataHandlerQueue.size());
-    
   }
 
   public void notifySharedData(final String key, final Object newValue, final Object oldValue) {
-    sharedDataHandlers.forEach(handler -> sharedDataEventExecutor
+    sharedDataHandlers.forEach(
-            .execute(() -> handler.onUpdate(key, oldValue, newValue)));
+        handler ->
+            sharedDataEventExecutor.execute(() -> handler.onUpdate(key, oldValue, newValue)));
   }
 
-  public void notifyPerNodeData(final String nodeId, final String key, final Object newValue,
+  public void notifyPerNodeData(
-          final Object oldValue) {
+      final String nodeId, final String key, final Object newValue, final Object oldValue) {
-    perNodeDataHandlers.forEach(handler -> perNodeDataEventExecutor
+    perNodeDataHandlers.forEach(
-            .execute(() -> handler.onUpdate(nodeId, key, oldValue, newValue)));
+        handler ->
+            perNodeDataEventExecutor.execute(
+                () -> handler.onUpdate(nodeId, key, oldValue, newValue)));
   }
 
   public void registerPerNodeDataSubscriber(UpdateNodeDataEventHandler handler) {
@@ -98,5 +111,4 @@ public class DataEventManager {
   public int getSharedDataSubscribersSize() {
     return sharedDataHandlers.size();
   }
-  
 }

gossip-base/src/main/java/org/apache/gossip/event/data/UpdateNodeDataEventHandler.java

@@ -18,8 +18,8 @@
 package org.apache.gossip.event.data;
 
 /**
- * Event handler interface for the per node data items.
+ * Event handler interface for the per node data items. Classes which implement this interface get
- * Classes which implement this interface get notifications when per node data item get changed.
+ * notifications when per node data item get changed.
  */
 public interface UpdateNodeDataEventHandler {
 
@@ -28,10 +28,9 @@ public interface UpdateNodeDataEventHandler {
    *
    * @param nodeId id of the node that change the value
    * @param key key of the datum
-   * @param oldValue previous value of the datum or null if the datum is discovered
+   * @param oldValue previous value of the datum or null if the datum is discovered for the first
-   *                 for the first time
+   *     time
    * @param newValue updated value of the datum
    */
   void onUpdate(String nodeId, String key, Object oldValue, Object newValue);
-  
 }

gossip-base/src/main/java/org/apache/gossip/event/data/UpdateSharedDataEventHandler.java

@@ -18,8 +18,8 @@
 package org.apache.gossip.event.data;
 
 /**
- * Event handler interface for shared data items.
+ * Event handler interface for shared data items. Classes which implement this interface get
- * Classes which implement this interface get notifications when shared data get changed.
+ * notifications when shared data get changed.
  */
 public interface UpdateSharedDataEventHandler {
   /**
@@ -30,5 +30,4 @@ public interface UpdateSharedDataEventHandler {
    * @param newValue updated value of the data item
    */
   void onUpdate(String key, Object oldValue, Object newValue);
-  
 }

gossip-base/src/main/java/org/apache/gossip/lock/LockManager.java

@@ -20,15 +20,6 @@ package org.apache.gossip.lock;
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
-import org.apache.gossip.Member;
-import org.apache.gossip.lock.exceptions.VoteFailedException;
-import org.apache.gossip.lock.vote.MajorityVote;
-import org.apache.gossip.lock.vote.Vote;
-import org.apache.gossip.lock.vote.VoteCandidate;
-import org.apache.gossip.manager.GossipManager;
-import org.apache.gossip.model.SharedDataMessage;
-import org.apache.log4j.Logger;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -43,19 +34,27 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.gossip.Member;
+import org.apache.gossip.lock.exceptions.VoteFailedException;
+import org.apache.gossip.lock.vote.MajorityVote;
+import org.apache.gossip.lock.vote.Vote;
+import org.apache.gossip.lock.vote.VoteCandidate;
+import org.apache.gossip.manager.GossipManager;
+import org.apache.gossip.model.SharedDataMessage;
 
+@Slf4j
 public class LockManager {
 
-  public static final Logger LOGGER = Logger.getLogger(LockManager.class);
 
+  // For MetricRegistry
+  public static final String LOCK_KEY_SET_SIZE = "gossip.lock.key_set_size";
+  public static final String LOCK_TIME = "gossip.lock.time";
   private final GossipManager gossipManager;
   private final LockManagerSettings lockSettings;
   private final ScheduledExecutorService voteService;
   private final AtomicInteger numberOfNodes;
   private final Set<String> lockKeys;
-  // For MetricRegistry
-  public static final String LOCK_KEY_SET_SIZE = "gossip.lock.key_set_size";
-  public static final String LOCK_TIME = "gossip.lock.time";
   private final Timer lockTimeMetric;
 
   public LockManager(GossipManager gossipManager, final LockManagerSettings lockManagerSettings,
@@ -95,20 +94,16 @@ public class LockManager {
 
       long passedCandidates = voteResultMap.values().stream().filter(aBoolean -> aBoolean).count();
       String myNodeId = gossipManager.getMyself().getId();
-      if (LOGGER.isDebugEnabled()) {
+        log.debug("NodeId=" + myNodeId + ", VoteMap=" + voteResultMap + ", WinnerCount="
-        LOGGER.debug("NodeId=" + myNodeId + ", VoteMap=" + voteResultMap + ", WinnerCount="
                 + passedCandidates);
-      }
       // Check for possible dead lock when no candidates were won
       if (passedCandidates == 0) {
         if (isDeadLock(voteCandidatesMap)) {
           deadlockDetectCount++;
           // Testing for deadlock is not always correct, therefore test for continues deadlocks
           if (deadlockDetectCount >= lockSettings.getDeadlockDetectionThreshold()) {
-            if (LOGGER.isDebugEnabled()) {
+              log.debug("Deadlock detected from node " + myNodeId + ". VoteCandidatesMap="
-              LOGGER.debug("Deadlock detected from node " + myNodeId + ". VoteCandidatesMap="
                       + voteCandidatesMap);
-            }
             preventDeadLock(voteCandidatesMap);
           }
         } else {
@@ -251,9 +246,7 @@ public class LockManager {
         }
       }
     }
-    if (LOGGER.isDebugEnabled()) {
+      log.debug("Node " + myNodeId + " give up votes to node " + selectedCandidateId);
-      LOGGER.debug("Node " + myNodeId + " give up votes to node " + selectedCandidateId);
-    }
   }
 
   private String getVotedCandidateNodeId(String nodeId,

gossip-base/src/main/java/org/apache/gossip/lock/LockManagerSettings.java

@@ -20,9 +20,7 @@ package org.apache.gossip.lock;
 import org.apache.gossip.lock.vote.RandomVoteSelector;
 import org.apache.gossip.lock.vote.VoteSelector;
 
-/**
+/** Stores the lock manager related settings. */
- * Stores the lock manager related settings.
- */
 public class LockManagerSettings {
   // Time between vote updates in ms. Default is 1 second.
   private final int voteUpdateInterval;
@@ -35,30 +33,32 @@ public class LockManagerSettings {
   // Wait time between vote result calculation. Default is 1000
   private final int resultCalculationDelay;
 
-  /**
-   * Construct LockManagerSettings with default settings.
-   */
-  public static LockManagerSettings getLockManagerDefaultSettings() {
-    return new LockManagerSettings(1000, new RandomVoteSelector(), -1, 3, 1000);
-  }
-
   /**
    * Construct a custom LockManagerSettings
    *
    * @param voteUpdateInterval Time between vote updates in milliseconds.
    * @param voteSelector Vote selection algorithm. Cannot be null
-   * @param numberOfNodes              Number of nodes available for voting. Set to negative value for auto calculate
+   * @param numberOfNodes Number of nodes available for voting. Set to negative value for auto
+   *     calculate
    * @param deadlockDetectionThreshold Number of times to test for deadlock before preventing
    * @param resultCalculationDelay Wait time between vote result calculation
    */
-  public LockManagerSettings(int voteUpdateInterval, VoteSelector voteSelector, int numberOfNodes,
+  public LockManagerSettings(
-          int deadlockDetectionThreshold, int resultCalculationDelay) {
+      int voteUpdateInterval,
+      VoteSelector voteSelector,
+      int numberOfNodes,
+      int deadlockDetectionThreshold,
+      int resultCalculationDelay) {
     this.voteUpdateInterval = voteUpdateInterval;
     this.voteSelector = voteSelector;
     this.numberOfNodes = numberOfNodes;
     this.deadlockDetectionThreshold = deadlockDetectionThreshold;
     this.resultCalculationDelay = resultCalculationDelay;
+  }
 
+  /** Construct LockManagerSettings with default settings. */
+  public static LockManagerSettings getLockManagerDefaultSettings() {
+    return new LockManagerSettings(1000, new RandomVoteSelector(), -1, 3, 1000);
   }
 
   public int getVoteUpdateInterval() {

gossip-base/src/main/java/org/apache/gossip/lock/exceptions/VoteFailedException.java

@@ -17,9 +17,7 @@
  */
 package org.apache.gossip.lock.exceptions;
 
-/**
+/** This exception is thrown when the lock based voting is failed. */
- * This exception is thrown when the lock based voting is failed.
- */
 public class VoteFailedException extends Exception {
   /**
    * Constructs a new VoteFailedException with the specified detail message.
@@ -31,8 +29,7 @@ public class VoteFailedException extends Exception {
   }
 
   /**
-   * Constructs a new VoteFailedException with the specified detail message and
+   * Constructs a new VoteFailedException with the specified detail message and cause.
-   * cause.
    *
    * @param message the detail message
    * @param cause the cause for this exception

gossip-base/src/main/java/org/apache/gossip/lock/vote/MajorityVote.java

@@ -17,14 +17,13 @@
  */
 package org.apache.gossip.lock.vote;
 
-import org.apache.gossip.crdt.Crdt;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import org.apache.gossip.crdt.Crdt;
 
 /**
  * CRDT which used for distribute a votes for a given key.

gossip-base/src/main/java/org/apache/gossip/lock/vote/RandomVoteSelector.java

@@ -22,9 +22,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
-/**
+/** VoteSelector implementation which randomly select a voting node. */
- * VoteSelector implementation which randomly select a voting node.
- */
 public class RandomVoteSelector implements VoteSelector {
 
   @Override

gossip-base/src/main/java/org/apache/gossip/lock/vote/Vote.java

@@ -25,9 +25,9 @@ import java.util.List;
 public class Vote {
   private final String votingNode;
   private final Boolean voteValue; // TODO: 7/16/17  weight?
-  private Boolean voteExchange;
   private final List<String> liveMembers;
   private final List<String> deadMembers;
+  private Boolean voteExchange;
 
   public Vote(String votingNode, Boolean voteValue, Boolean voteExchange, List<String> liveMembers,
           List<String> deadMembers) {

gossip-base/src/main/java/org/apache/gossip/lock/vote/VoteCandidate.java

@@ -20,9 +20,7 @@ package org.apache.gossip.lock.vote;
 import java.util.Map;
 import java.util.Objects;
 
-/**
+/** Stores the vote candidate details and its votes. */
- * Stores the vote candidate details and its votes.
- */
 public class VoteCandidate {
 
   private final String candidateNodeId;
@@ -59,13 +57,11 @@ public class VoteCandidate {
 
   @Override
   public boolean equals(Object obj) {
-    if (!(obj instanceof VoteCandidate))
+    if (!(obj instanceof VoteCandidate)) return false;
-      return false;
+    if (obj == this) return true;
-    if (obj == this)
-      return true;
     VoteCandidate other = (VoteCandidate) obj;
-    return this.candidateNodeId.equals(other.candidateNodeId) && this.votingKey
+    return this.candidateNodeId.equals(other.candidateNodeId)
-            .equals(other.votingKey);
+        && this.votingKey.equals(other.votingKey);
   }
 
   @Override

gossip-base/src/main/java/org/apache/gossip/lock/vote/VoteSelector.java

@@ -19,12 +19,11 @@ package org.apache.gossip.lock.vote;
 
 import java.util.Set;
 
-/**
+/** This interface defines vote selection algorithm for the vote based locking. */
- * This interface defines vote selection algorithm for the vote based locking.
- */
 public interface VoteSelector {
   /**
-   * This method get call by the lock manager of a node to decide which candidate need to be choose for voting.
+   * This method get call by the lock manager of a node to decide which candidate need to be choose
+   * for voting.
    *
    * @param voteCandidateIds node id set for the vote candidates
    * @return selected node id to vote from the given vote candidate set.

gossip-base/src/main/java/org/apache/gossip/manager/AbstractActiveGossiper.java

@@ -17,33 +17,32 @@
  */
 package org.apache.gossip.manager;
 
-import java.util.Map.Entry;
+import static com.codahale.metrics.MetricRegistry.name;
+
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.MetricRegistry;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import com.codahale.metrics.Histogram;
+import lombok.extern.slf4j.Slf4j;
-import com.codahale.metrics.MetricRegistry;
 import org.apache.gossip.GossipSettings;
 import org.apache.gossip.LocalMember;
 import org.apache.gossip.model.ActiveGossipOk;
-import org.apache.gossip.model.PerNodeDataMessage;
 import org.apache.gossip.model.Member;
+import org.apache.gossip.model.PerNodeDataMessage;
 import org.apache.gossip.model.Response;
 import org.apache.gossip.model.SharedDataMessage;
 import org.apache.gossip.model.ShutdownMessage;
 import org.apache.gossip.udp.*;
-import org.apache.log4j.Logger;
-
-import static com.codahale.metrics.MetricRegistry.name;
 
 /**
  * The ActiveGossipThread sends information. Pick a random partner and send the membership list to that partner
  */
+@Slf4j
 public abstract class AbstractActiveGossiper {
 
-  protected static final Logger LOGGER = Logger.getLogger(AbstractActiveGossiper.class);
-
   protected final GossipManager gossipManager;
   protected final GossipCore gossipCore;
   private final Histogram sharedDataHistogram;
@@ -128,7 +127,7 @@ public abstract class AbstractActiveGossiper {
         udpMessage.setUriFrom(me.getId());
       }
     }
-    if (udpMessage.getMessages().size() > 0) {
+    if (!udpMessage.getMessages().isEmpty()) {
       gossipCore.sendOneWay(udpMessage, member.getUri());
     }
   }
@@ -229,7 +228,7 @@ public abstract class AbstractActiveGossiper {
     if (r instanceof ActiveGossipOk){
       //maybe count metrics here
     } else {
-      LOGGER.debug("Message " + message + " generated response " + r);
+      log.debug("Message " + message + " generated response " + r);
     }
     sendMembershipHistogram.update(System.currentTimeMillis() - startTime);
   }
@@ -252,7 +251,7 @@ public abstract class AbstractActiveGossiper {
    */
   protected LocalMember selectPartner(List<LocalMember> memberList) {
     LocalMember member = null;
-    if (memberList.size() > 0) {
+    if (!memberList.isEmpty()) {
       int randomNeighborIndex = random.nextInt(memberList.size());
       member = memberList.get(randomNeighborIndex);
     }

gossip-base/src/main/java/org/apache/gossip/manager/Clock.java

@@ -20,6 +20,6 @@ package org.apache.gossip.manager;
 public interface Clock {
 
   long currentTimeMillis();
-  long nanoTime();
 
+  long nanoTime();
 }

gossip-base/src/main/java/org/apache/gossip/manager/DataReaper.java

@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.gossip.model.PerNodeDataMessage;
 import org.apache.gossip.model.SharedDataMessage;
 

gossip-base/src/main/java/org/apache/gossip/manager/DatacenterRackAwareActiveGossiper.java

@@ -17,20 +17,19 @@
  */
 package org.apache.gossip.manager;
 
-import java.util.List;
+import com.codahale.metrics.MetricRegistry;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.gossip.LocalMember;
 
-import com.codahale.metrics.MetricRegistry;
-
 /**
  * Sends gossip traffic at different rates to other racks and data-centers.
  * This implementation controls the rate at which gossip traffic is shared. 
@@ -38,18 +37,17 @@ import com.codahale.metrics.MetricRegistry;
  * in the rack than in the the datacenter. We can adjust the rate at which we send messages to each group.
  * 
  */
+@Slf4j
 public class DatacenterRackAwareActiveGossiper extends AbstractActiveGossiper {
 
   public static final String DATACENTER = "datacenter";
   public static final String RACK = "rack";
-  
+  private final BlockingQueue<Runnable> workQueue;
   private int sameRackGossipIntervalMs = 100;
   private int sameDcGossipIntervalMs = 500;
   private int differentDatacenterGossipIntervalMs = 1000;
   private int randomDeadMemberSendIntervalMs = 250;
-  
   private ScheduledExecutorService scheduledExecutorService;
-  private final BlockingQueue<Runnable> workQueue;
   private ThreadPoolExecutor threadService;
   
   public DatacenterRackAwareActiveGossiper(GossipManager gossipManager, GossipCore gossipCore,
@@ -220,14 +218,14 @@ public class DatacenterRackAwareActiveGossiper extends AbstractActiveGossiper {
     try {
       scheduledExecutorService.awaitTermination(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      LOGGER.debug("Issue during shutdown", e);
+      log.debug("Issue during shutdown", e);
     }
     sendShutdownMessage();
     threadService.shutdown();
     try {
       threadService.awaitTermination(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      LOGGER.debug("Issue during shutdown", e);
+      log.debug("Issue during shutdown", e);
     }
   }
   

gossip-base/src/main/java/org/apache/gossip/manager/GossipCore.java

@@ -20,6 +20,13 @@ package org.apache.gossip.manager;
 import com.codahale.metrics.Gauge;
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.concurrent.*;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.gossip.LocalMember;
 import org.apache.gossip.Member;
 import org.apache.gossip.RemoteMember;
@@ -33,35 +40,20 @@ import org.apache.gossip.model.PerNodeDataMessage;
 import org.apache.gossip.model.Response;
 import org.apache.gossip.model.SharedDataMessage;
 import org.apache.gossip.udp.Trackable;
-import org.apache.log4j.Logger;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.concurrent.*;
 
+@Slf4j
 public class GossipCore implements GossipCoreConstants {
 
-  class LatchAndBase {
-    private final CountDownLatch latch;
-    private volatile Base base;
-    
-    LatchAndBase(){
-      latch = new CountDownLatch(1);
-    }
-    
-  }
-  public static final Logger LOGGER = Logger.getLogger(GossipCore.class);
   private final GossipManager gossipManager;
-  private ConcurrentHashMap<String, LatchAndBase> requests;
+  @Getter
   private final ConcurrentHashMap<String, ConcurrentHashMap<String, PerNodeDataMessage>> perNodeData;
+  @Getter
   private final ConcurrentHashMap<String, SharedDataMessage> sharedData;
   private final Meter messageSerdeException;
   private final Meter transmissionException;
   private final Meter transmissionSuccess;
   private final DataEventManager eventManager;
-  
+  private ConcurrentHashMap<String, LatchAndBase> requests;
   public GossipCore(GossipManager manager, MetricRegistry metrics){
     this.gossipManager = manager;
     requests = new ConcurrentHashMap<>();
@@ -135,20 +127,12 @@ public class GossipCore implements GossipCoreConstants {
     }
   }
 
-  public ConcurrentHashMap<String, ConcurrentHashMap<String, PerNodeDataMessage>> getPerNodeData(){
-    return perNodeData;
-  }
-
-  public ConcurrentHashMap<String, SharedDataMessage> getSharedData() {
-    return sharedData;
-  }
-
   public void shutdown(){
   }
 
   public void receive(Base base) {
     if (!gossipManager.getMessageHandler().invoke(this, gossipManager, base)) {
-      LOGGER.warn("received message can not be handled");
+      log.warn("received message can not be handled");
     }
   }
 
@@ -177,10 +161,8 @@ public class GossipCore implements GossipCoreConstants {
   }
 
   public Response send(Base message, URI uri){
-    if (LOGGER.isDebugEnabled()){
+      log.debug("Sending " + message);
-      LOGGER.debug("Sending " + message);
+      log.debug("Current request queue " + requests);
-      LOGGER.debug("Current request queue " + requests);
-    }
 
     final Trackable t;
     LatchAndBase latchAndBase = null;
@@ -206,11 +188,9 @@ public class GossipCore implements GossipCoreConstants {
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     } finally {
-      if (latchAndBase != null){
         requests.remove(t.getUuid() + "/" + t.getUriFrom());
     }
   }
-  }
 
   /**
    * Sends a message across the network while blocking. Catches and ignores IOException in transmission. Used
@@ -222,7 +202,7 @@ public class GossipCore implements GossipCoreConstants {
     try {
       sendInternal(message, u);
     } catch (RuntimeException ex) {
-      LOGGER.debug("Send one way failed", ex);
+      log.debug("Send one way failed", ex);
     }
   }
 
@@ -240,12 +220,12 @@ public class GossipCore implements GossipCoreConstants {
    *
    */
   public void mergeLists(RemoteMember senderMember, List<Member> remoteList) {
-    if (LOGGER.isDebugEnabled()){
+    if (log.isDebugEnabled()){
       debugState(senderMember, remoteList);
     }
     for (LocalMember i : gossipManager.getDeadMembers()) {
       if (i.getId().equals(senderMember.getId())) {
-        LOGGER.debug(gossipManager.getMyself() + " contacted by dead member " + senderMember.getUri());
+        log.debug(gossipManager.getMyself() + " contacted by dead member " + senderMember.getUri());
         i.recordHeartbeat(senderMember.getHeartbeat());
         i.setHeartbeat(senderMember.getHeartbeat());
         //TODO consider forcing an UP here
@@ -275,14 +255,14 @@ public class GossipCore implements GossipCoreConstants {
         }
       }
     }
-    if (LOGGER.isDebugEnabled()){
+    if (log.isDebugEnabled()){
       debugState(senderMember, remoteList);
     }
   }
 
   private void debugState(RemoteMember senderMember,
           List<Member> remoteList){
-    LOGGER.warn(
+    log.warn(
           "-----------------------\n" +
           "Me " + gossipManager.getMyself() + "\n" +
           "Sender " + senderMember + "\n" +
@@ -329,4 +309,14 @@ public class GossipCore implements GossipCoreConstants {
   void unregisterSharedDataSubscriber(UpdateSharedDataEventHandler handler){
     eventManager.unregisterSharedDataSubscriber(handler);
   }
+  
+  class LatchAndBase {
+    private final CountDownLatch latch;
+    private volatile Base base;
+
+    LatchAndBase(){
+      latch = new CountDownLatch(1);
+    }
+
+  }
 }

gossip-base/src/main/java/org/apache/gossip/manager/GossipManager.java

@@ -20,6 +20,22 @@ package org.apache.gossip.manager;
 import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.File;
+import java.io.Serial;
+import java.net.URI;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.gossip.GossipSettings;
 import org.apache.gossip.LocalMember;
 import org.apache.gossip.Member;
@@ -36,29 +52,14 @@ import org.apache.gossip.model.SharedDataMessage;
 import org.apache.gossip.protocol.ProtocolManager;
 import org.apache.gossip.transport.TransportManager;
 import org.apache.gossip.utils.ReflectionUtils;
-import org.apache.log4j.Logger;
 
-import java.io.File;
+@Slf4j
-import java.net.URI;
+public class GossipManager {
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
-public abstract class GossipManager {
-
-  public static final Logger LOGGER = Logger.getLogger(GossipManager.class);
 
   // this mapper is used for ring and user-data persistence only. NOT messages.
   public static final ObjectMapper metdataObjectMapper = new ObjectMapper() {
+    @Serial
     private static final long serialVersionUID = 1L;
   {
     enableDefaultTyping();
@@ -69,10 +70,6 @@ public abstract class GossipManager {
   private final LocalMember me;
   private final GossipSettings settings;
   private final AtomicBoolean gossipServiceRunning;
-  
-  private TransportManager transportManager;
-  private ProtocolManager protocolManager;
-  
   private final GossipCore gossipCore;
   private final DataReaper dataReaper;
   private final Clock clock;
@@ -81,9 +78,10 @@ public abstract class GossipManager {
   private final RingStatePersister ringState;
   private final UserDataPersister userDataState;
   private final GossipMemberStateRefresher memberStateRefresher;
-  
   private final MessageHandler messageHandler;
   private final LockManager lockManager;
+  private TransportManager transportManager;
+  private ProtocolManager protocolManager;
 
   public GossipManager(String cluster,
                        URI uri, String id, Map<String, String> properties, GossipSettings settings,
@@ -122,6 +120,21 @@ public abstract class GossipManager {
     readSavedDataState();
   }
 
+  public static File buildRingStatePath(GossipManager manager) {
+    return new File(manager.getSettings().getPathToRingState(), "ringstate." + manager.getMyself().getClusterName() + "."
+        + manager.getMyself().getId() + ".json");
+  }
+
+  public static File buildSharedDataPath(GossipManager manager){
+    return new File(manager.getSettings().getPathToDataState(), "shareddata."
+            + manager.getMyself().getClusterName() + "." + manager.getMyself().getId() + ".json");
+  }
+
+  public static File buildPerNodeDataPath(GossipManager manager) {
+    return new File(manager.getSettings().getPathToDataState(), "pernodedata."
+            + manager.getMyself().getClusterName() + "." + manager.getMyself().getId() + ".json");
+  }
+
   public MessageHandler getMessageHandler() {
     return messageHandler;
   }
@@ -194,7 +207,7 @@ public abstract class GossipManager {
       scheduledServiced.scheduleAtFixedRate(userDataState, 60, 60, TimeUnit.SECONDS);
     }
     memberStateRefresher.init();
-    LOGGER.debug("The GossipManager is started.");
+    log.debug("The GossipManager is started.");
   }
 
   private void readSavedRingState() {
@@ -238,7 +251,7 @@ public abstract class GossipManager {
     try {
       scheduledServiced.awaitTermination(1, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      LOGGER.error(e);
+      log.error("Error!", e);
     }
     scheduledServiced.shutdownNow();
   }
@@ -332,6 +345,8 @@ public abstract class GossipManager {
     return clock;
   }
   
+  // todo: consider making these path methods part of GossipSettings
+  
   public MetricRegistry getRegistry() {
     return registry;
   }
@@ -344,23 +359,6 @@ public abstract class GossipManager {
     return transportManager;
   }
   
-  // todo: consider making these path methods part of GossipSettings
-  
-  public static File buildRingStatePath(GossipManager manager) {
-    return new File(manager.getSettings().getPathToRingState(), "ringstate." + manager.getMyself().getClusterName() + "."
-        + manager.getMyself().getId() + ".json");
-  }
-  
-  public static File buildSharedDataPath(GossipManager manager){
-    return new File(manager.getSettings().getPathToDataState(), "shareddata."
-            + manager.getMyself().getClusterName() + "." + manager.getMyself().getId() + ".json");
-  }
-  
-  public static File buildPerNodeDataPath(GossipManager manager) {
-    return new File(manager.getSettings().getPathToDataState(), "pernodedata."
-            + manager.getMyself().getClusterName() + "." + manager.getMyself().getId() + ".json");
-  }
-  
   public void registerPerNodeDataSubscriber(UpdateNodeDataEventHandler handler){
     gossipCore.registerPerNodeDataSubscriber(handler);
   }

gossip-base/src/main/java/org/apache/gossip/manager/GossipManagerBuilder.java

@@ -132,8 +132,16 @@ public class GossipManagerBuilder {
       if (messageHandler == null) {
         messageHandler = MessageHandlerFactory.defaultHandler();
       }
-      return new GossipManager(cluster, uri, id, properties, settings, gossipMembers, listener, registry, messageHandler) {} ;
+      return new GossipManager(
+          cluster,
+          uri,
+          id,
+          properties,
+          settings,
+          gossipMembers,
+          listener,
+          registry,
+          messageHandler) {};
     }
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/manager/GossipMemberStateRefresher.java

@@ -18,22 +18,21 @@
 
 package org.apache.gossip.manager;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.*;
+import java.util.function.BiFunction;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.gossip.GossipSettings;
 import org.apache.gossip.LocalMember;
 import org.apache.gossip.event.GossipListener;
 import org.apache.gossip.event.GossipState;
 import org.apache.gossip.model.PerNodeDataMessage;
 import org.apache.gossip.model.ShutdownMessage;
-import org.apache.log4j.Logger;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.*;
-import java.util.function.BiFunction;
 
+@Slf4j
 public class GossipMemberStateRefresher {
-  public static final Logger LOGGER = Logger.getLogger(GossipMemberStateRefresher.class);
 
   private final Map<LocalMember, GossipState> members;
   private final GossipSettings settings;
@@ -66,7 +65,7 @@ public class GossipMemberStateRefresher {
     try {
       runOnce();
     } catch (RuntimeException ex) {
-      LOGGER.warn("scheduled state had exception", ex);
+      log.warn("scheduled state had exception", ex);
     }
   }
 
@@ -144,13 +143,13 @@ public class GossipMemberStateRefresher {
     try {
       scheduledExecutor.awaitTermination(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      LOGGER.debug("Issue during shutdown", e);
+      log.debug("Issue during shutdown", e);
     }
     listenerExecutor.shutdown();
     try {
       listenerExecutor.awaitTermination(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      LOGGER.debug("Issue during shutdown", e);
+      log.debug("Issue during shutdown", e);
     }
     listenerExecutor.shutdownNow();
   }

gossip-base/src/main/java/org/apache/gossip/manager/RingStatePersister.java

@@ -17,6 +17,7 @@
  */ 
 package org.apache.gossip.manager;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -24,14 +25,12 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NavigableSet;
-
+import lombok.extern.slf4j.Slf4j;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.gossip.LocalMember;
-import org.apache.log4j.Logger;
 
+@Slf4j
 public class RingStatePersister implements Runnable {
 
-  private static final Logger LOGGER = Logger.getLogger(RingStatePersister.class);
   private final File path;
   // NOTE: this is a different instance than what gets used for message marshalling.
   private final ObjectMapper objectMapper;
@@ -53,7 +52,7 @@ public class RingStatePersister implements Runnable {
     try (FileOutputStream fos = new FileOutputStream(path)){
       objectMapper.writeValue(fos, i);
     } catch (IOException e) {
-      LOGGER.debug(e);
+      log.error("Error!", e);
     }
   }
 
@@ -65,7 +64,7 @@ public class RingStatePersister implements Runnable {
     try (FileInputStream fos = new FileInputStream(path)){
       return objectMapper.readValue(fos, ArrayList.class);
     } catch (IOException e) {
-      LOGGER.debug(e);
+      log.error("Error", e);
     }
     return new ArrayList<>();
   }

gossip-base/src/main/java/org/apache/gossip/manager/SimpleActiveGossiper.java

@@ -25,48 +25,58 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.gossip.LocalMember;
 
 import com.codahale.metrics.MetricRegistry;
 
-/**
+/** Base implementation gossips randomly to live nodes periodically gossips to dead ones */
- * Base implementation gossips randomly to live nodes periodically gossips to dead ones
+@Slf4j
- *
- */
 public class SimpleActiveGossiper extends AbstractActiveGossiper {
 
-  private ScheduledExecutorService scheduledExecutorService;
   private final BlockingQueue<Runnable> workQueue;
+  private ScheduledExecutorService scheduledExecutorService;
   private ThreadPoolExecutor threadService;
 
-  public SimpleActiveGossiper(GossipManager gossipManager, GossipCore gossipCore,
+  public SimpleActiveGossiper(
-                              MetricRegistry registry) {
+      GossipManager gossipManager, GossipCore gossipCore, MetricRegistry registry) {
     super(gossipManager, gossipCore, registry);
     scheduledExecutorService = Executors.newScheduledThreadPool(2);
     workQueue = new ArrayBlockingQueue<Runnable>(1024);
-    threadService = new ThreadPoolExecutor(1, 30, 1, TimeUnit.SECONDS, workQueue,
+    threadService =
-            new ThreadPoolExecutor.DiscardOldestPolicy());
+        new ThreadPoolExecutor(
+            1, 30, 1, TimeUnit.SECONDS, workQueue, new ThreadPoolExecutor.DiscardOldestPolicy());
   }
 
   @Override
   public void init() {
     super.init();
-    scheduledExecutorService.scheduleAtFixedRate(() -> {
-      threadService.execute(() -> {
-        sendToALiveMember();
-      });
-    }, 0, gossipManager.getSettings().getGossipInterval(), TimeUnit.MILLISECONDS);
-    scheduledExecutorService.scheduleAtFixedRate(() -> {
-      sendToDeadMember();
-    }, 0, gossipManager.getSettings().getGossipInterval(), TimeUnit.MILLISECONDS);
     scheduledExecutorService.scheduleAtFixedRate(
-            () -> sendPerNodeData(gossipManager.getMyself(),
+        () -> {
-                    selectPartner(gossipManager.getLiveMembers())),
+          threadService.execute(this::sendToALiveMember);
-            0, gossipManager.getSettings().getGossipInterval(), TimeUnit.MILLISECONDS);
+        },
+        0,
+        gossipManager.getSettings().getGossipInterval(),
+        TimeUnit.MILLISECONDS);
     scheduledExecutorService.scheduleAtFixedRate(
-            () -> sendSharedData(gossipManager.getMyself(),
+        this::sendToDeadMember,
-                    selectPartner(gossipManager.getLiveMembers())),
+        0,
-            0, gossipManager.getSettings().getGossipInterval(), TimeUnit.MILLISECONDS);
+        gossipManager.getSettings().getGossipInterval(),
+        TimeUnit.MILLISECONDS);
+    scheduledExecutorService.scheduleAtFixedRate(
+        () ->
+            sendPerNodeData(
+                gossipManager.getMyself(), selectPartner(gossipManager.getLiveMembers())),
+        0,
+        gossipManager.getSettings().getGossipInterval(),
+        TimeUnit.MILLISECONDS);
+    scheduledExecutorService.scheduleAtFixedRate(
+        () ->
+            sendSharedData(
+                gossipManager.getMyself(), selectPartner(gossipManager.getLiveMembers())),
+        0,
+        gossipManager.getSettings().getGossipInterval(),
+        TimeUnit.MILLISECONDS);
   }
 
   @Override
@@ -76,14 +86,14 @@ public class SimpleActiveGossiper extends AbstractActiveGossiper {
     try {
       scheduledExecutorService.awaitTermination(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      LOGGER.debug("Issue during shutdown", e);
+      log.debug("Issue during shutdown", e);
     }
     sendShutdownMessage();
     threadService.shutdown();
     try {
       threadService.awaitTermination(5, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      LOGGER.debug("Issue during shutdown", e);
+      log.debug("Issue during shutdown", e);
     }
   }
 
@@ -97,9 +107,7 @@ public class SimpleActiveGossiper extends AbstractActiveGossiper {
     sendMembershipList(gossipManager.getMyself(), member);
   }
 
-  /**
+  /** sends an optimistic shutdown message to several clusters nodes */
-   * sends an optimistic shutdown message to several clusters nodes
-   */
   protected void sendShutdownMessage() {
     List<LocalMember> l = gossipManager.getLiveMembers();
     int sendTo = l.size() < 3 ? 1 : l.size() / 2;

gossip-base/src/main/java/org/apache/gossip/manager/SystemClock.java

@@ -28,5 +28,4 @@ public class SystemClock implements Clock {
   public long nanoTime() {
     return System.nanoTime();
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/manager/UserDataPersister.java

@@ -24,13 +24,14 @@ import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.java.Log;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.gossip.model.PerNodeDataMessage;
 import org.apache.gossip.model.SharedDataMessage;
-import org.apache.log4j.Logger;
 
+@Slf4j
 public class UserDataPersister implements Runnable {
 
-  private static final Logger LOGGER = Logger.getLogger(UserDataPersister.class);
   private final GossipCore gossipCore;
 
   private final File perNodePath;
@@ -52,7 +53,7 @@ public class UserDataPersister implements Runnable {
     try (FileInputStream fos = new FileInputStream(perNodePath)) {
       return objectMapper.readValue(fos, ConcurrentHashMap.class);
     } catch (IOException e) {
-      LOGGER.debug(e);
+      log.error("Error!", e);
     }
     return new ConcurrentHashMap<String, ConcurrentHashMap<String, PerNodeDataMessage>>();
   }
@@ -61,7 +62,7 @@ public class UserDataPersister implements Runnable {
     try (FileOutputStream fos = new FileOutputStream(perNodePath)) {
       objectMapper.writeValue(fos, gossipCore.getPerNodeData());
     } catch (IOException e) {
-      LOGGER.warn(e);
+      log.error("Error!", e);
     }
   }
 
@@ -69,7 +70,7 @@ public class UserDataPersister implements Runnable {
     try (FileOutputStream fos = new FileOutputStream(sharedPath)) {
       objectMapper.writeValue(fos, gossipCore.getSharedData());
     } catch (IOException e) {
-      LOGGER.warn(e);
+      log.error("Error!", e);
     }
   }
 
@@ -81,14 +82,12 @@ public class UserDataPersister implements Runnable {
     try (FileInputStream fos = new FileInputStream(sharedPath)) {
       return objectMapper.readValue(fos, ConcurrentHashMap.class);
     } catch (IOException e) {
-      LOGGER.debug(e);
+      log.error("Error!", e);
     }
-    return new ConcurrentHashMap<String, SharedDataMessage>();
+    return new ConcurrentHashMap<>();
   }
 
-  /**
+  /** Writes all pernode and shared data to disk */
-   * Writes all pernode and shared data to disk 
-   */
   @Override
   public void run() {
     writePerNodeToDisk();

gossip-base/src/main/java/org/apache/gossip/manager/handlers/ActiveGossipMessageHandler.java

@@ -17,6 +17,11 @@
  */
 package org.apache.gossip.manager.handlers;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.gossip.Member;
 import org.apache.gossip.RemoteMember;
 import org.apache.gossip.manager.GossipCore;
@@ -26,11 +31,7 @@ import org.apache.gossip.udp.UdpActiveGossipMessage;
 import org.apache.gossip.udp.UdpActiveGossipOk;
 import org.apache.gossip.udp.UdpNotAMemberFault;
 
-import java.net.URI;
+@Slf4j
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
 public class ActiveGossipMessageHandler implements MessageHandler {
   
   /**
@@ -49,7 +50,7 @@ public class ActiveGossipMessageHandler implements MessageHandler {
       try {
         u = new URI(activeGossipMessage.getMembers().get(i).getUri());
       } catch (URISyntaxException e) {
-        GossipCore.LOGGER.debug("Gossip message with faulty URI", e);
+        log.debug("Gossip message with faulty URI", e);
         continue;
       }
       RemoteMember member = new RemoteMember(
@@ -66,7 +67,7 @@ public class ActiveGossipMessageHandler implements MessageHandler {
         f.setException("Not a member of this cluster " + i);
         f.setUriFrom(activeGossipMessage.getUriFrom());
         f.setUuid(activeGossipMessage.getUuid());
-        GossipCore.LOGGER.warn(f);
+        log.warn("Warn", f);
         gossipCore.sendOneWay(f, member.getUri());
         continue;
       }

gossip-base/src/main/java/org/apache/gossip/manager/handlers/MessageHandlerFactory.java

@@ -18,40 +18,35 @@
 
 package org.apache.gossip.manager.handlers;
 
-import org.apache.gossip.manager.GossipCore;
-import org.apache.gossip.manager.GossipManager;
-import org.apache.gossip.model.*;
-
 import java.util.Arrays;
+import java.util.Objects;
+import java.util.stream.Stream;
+import org.apache.gossip.model.*;
 
 public class MessageHandlerFactory {
 
   public static MessageHandler defaultHandler() {
     return concurrentHandler(
-        new TypedMessageHandler(Response.class, new ResponseHandler()),
+        new TypedMessageHandlerWrapper(Response.class, new ResponseHandler()),
-        new TypedMessageHandler(ShutdownMessage.class, new ShutdownMessageHandler()),
+        new TypedMessageHandlerWrapper(ShutdownMessage.class, new ShutdownMessageHandler()),
-        new TypedMessageHandler(PerNodeDataMessage.class, new PerNodeDataMessageHandler()),
+        new TypedMessageHandlerWrapper(PerNodeDataMessage.class, new PerNodeDataMessageHandler()),
-        new TypedMessageHandler(SharedDataMessage.class, new SharedDataMessageHandler()),
+        new TypedMessageHandlerWrapper(SharedDataMessage.class, new SharedDataMessageHandler()),
-        new TypedMessageHandler(ActiveGossipMessage.class, new ActiveGossipMessageHandler()),
+        new TypedMessageHandlerWrapper(ActiveGossipMessage.class, new ActiveGossipMessageHandler()),
-        new TypedMessageHandler(PerNodeDataBulkMessage.class, new PerNodeDataBulkMessageHandler()),
+        new TypedMessageHandlerWrapper(
-        new TypedMessageHandler(SharedDataBulkMessage.class, new SharedDataBulkMessageHandler())
+            PerNodeDataBulkMessage.class, new PerNodeDataBulkMessageHandler()),
-    );
+        new TypedMessageHandlerWrapper(
+            SharedDataBulkMessage.class, new SharedDataBulkMessageHandler()));
   }
 
   public static MessageHandler concurrentHandler(MessageHandler... handlers) {
-    if (handlers == null)
+    if (handlers == null) throw new NullPointerException("handlers cannot be null");
-      throw new NullPointerException("handlers cannot be null");
+    if (Arrays.stream(handlers).filter(Objects::nonNull).count() != handlers.length) {
-    if (Arrays.asList(handlers).stream().filter(i -> i != null).count() != handlers.length) {
       throw new NullPointerException("found at least one null handler");
     }
-    return new MessageHandler() {
+    return (gossipCore, gossipManager, base) -> {
-      @Override public boolean invoke(GossipCore gossipCore, GossipManager gossipManager,
-              Base base) {
       // return true if at least one of the component handlers return true.
-        return Arrays.asList(handlers).stream()
+      return Stream.of(handlers).filter((mi) -> mi.invoke(gossipCore, gossipManager, base)).count()
-                .filter((mi) -> mi.invoke(gossipCore, gossipManager, base)).count() > 0;
+          > 0;
-      }
     };
   }
 }
-

gossip-base/src/main/java/org/apache/gossip/manager/handlers/PerNodeDataBulkMessageHandler.java

@@ -34,8 +34,7 @@ public class PerNodeDataBulkMessageHandler implements MessageHandler {
   @Override
   public boolean invoke(GossipCore gossipCore, GossipManager gossipManager, Base base) {
     UdpPerNodeDataBulkMessage udpMessage = (UdpPerNodeDataBulkMessage) base;
-    for (PerNodeDataMessage dataMsg: udpMessage.getMessages())
+    for (PerNodeDataMessage dataMsg : udpMessage.getMessages()) gossipCore.addPerNodeData(dataMsg);
-      gossipCore.addPerNodeData(dataMsg);
     return true;
   }
 }

gossip-base/src/main/java/org/apache/gossip/manager/handlers/SharedDataBulkMessageHandler.java

@@ -34,8 +34,7 @@ public class SharedDataBulkMessageHandler implements MessageHandler{
   @Override
   public boolean invoke(GossipCore gossipCore, GossipManager gossipManager, Base base) {
     UdpSharedDataBulkMessage udpMessage = (UdpSharedDataBulkMessage) base;
-    for (SharedDataMessage dataMsg: udpMessage.getMessages())
+    for (SharedDataMessage dataMsg : udpMessage.getMessages()) gossipCore.addSharedData(dataMsg);
-      gossipCore.addSharedData(dataMsg);
     return true;
   }
 }

gossip-base/src/main/java/org/apache/gossip/manager/handlers/TypedMessageHandlerWrapper.java

@@ -21,11 +21,11 @@ import org.apache.gossip.manager.GossipCore;
 import org.apache.gossip.manager.GossipManager;
 import org.apache.gossip.model.Base;
 
-public class TypedMessageHandler implements MessageHandler {
+public class TypedMessageHandlerWrapper implements MessageHandler {
-  final private Class<?> messageClass;
+  private final Class<?> messageClass;
-  final private MessageHandler messageHandler;
+  private final MessageHandler messageHandler;
 
-  public TypedMessageHandler(Class<?> messageClass, MessageHandler messageHandler) {
+  public TypedMessageHandlerWrapper(Class<?> messageClass, MessageHandler messageHandler) {
     if (messageClass == null || messageHandler == null) {
       throw new NullPointerException();
     }

gossip-base/src/main/java/org/apache/gossip/model/ActiveGossipMessage.java

@@ -24,9 +24,7 @@ public class ActiveGossipMessage extends Base {
 
   private List<Member> members = new ArrayList<>();
 
-  public ActiveGossipMessage(){
+  public ActiveGossipMessage() {}
-    
-  }
 
   public List<Member> getMembers() {
     return members;
@@ -35,5 +33,4 @@ public class ActiveGossipMessage extends Base {
   public void setMembers(List<Member> members) {
     this.members = members;
   }
-  
 }

gossip-base/src/main/java/org/apache/gossip/model/ActiveGossipOk.java

@@ -17,6 +17,4 @@
  */
 package org.apache.gossip.model;
 
-public class ActiveGossipOk extends Response {
+public class ActiveGossipOk extends Response {}
-
-}

gossip-base/src/main/java/org/apache/gossip/model/Base.java

@@ -17,16 +17,14 @@
  */
 package org.apache.gossip.model;
 
-import org.apache.gossip.udp.UdpActiveGossipMessage;
-import org.apache.gossip.udp.UdpActiveGossipOk;
-import org.apache.gossip.udp.UdpPerNodeDataBulkMessage;
-import org.apache.gossip.udp.UdpNotAMemberFault;
-import org.apache.gossip.udp.UdpSharedDataBulkMessage;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
-
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.apache.gossip.udp.UdpActiveGossipMessage;
+import org.apache.gossip.udp.UdpActiveGossipOk;
+import org.apache.gossip.udp.UdpNotAMemberFault;
+import org.apache.gossip.udp.UdpPerNodeDataBulkMessage;
+import org.apache.gossip.udp.UdpSharedDataBulkMessage;
 
 @JsonTypeInfo(  
         use = JsonTypeInfo.Id.CLASS,  

gossip-base/src/main/java/org/apache/gossip/model/Fault.java

@@ -35,6 +35,4 @@ public abstract class Fault extends Response {
   public String toString() {
     return "Fault [exception=" + exception + "]";
   }
-
 }
-

gossip-base/src/main/java/org/apache/gossip/model/Member.java

@@ -27,9 +27,7 @@ public class Member {
   private Long heartbeat;
   private Map<String, String> properties;
 
-  public Member(){
+  public Member() {}
-    
-  }
 
   public Member(String cluster, String uri, String id, Long heartbeat) {
     this.cluster = cluster;
@@ -80,8 +78,16 @@ public class Member {
 
   @Override
   public String toString() {
-    return "Member [cluster=" + cluster + ", uri=" + uri + ", id=" + id + ", heartbeat="
+    return "Member [cluster="
-            + heartbeat + ", properties=" + properties + "]";
+        + cluster
+        + ", uri="
+        + uri
+        + ", id="
+        + id
+        + ", heartbeat="
+        + heartbeat
+        + ", properties="
+        + properties
+        + "]";
   }
-  
 }

gossip-base/src/main/java/org/apache/gossip/model/Message.java

@@ -17,6 +17,4 @@
  */
 package org.apache.gossip.model;
 
-public class Message extends Base {
+public class Message extends Base {}
-
-}

gossip-base/src/main/java/org/apache/gossip/model/NotAMemberFault.java

@@ -19,9 +19,7 @@ package org.apache.gossip.model;
 
 public class NotAMemberFault extends Fault {
 
-  public NotAMemberFault(){
+  public NotAMemberFault() {}
-    
-  }
 
   public NotAMemberFault(String message) {
     this.setException(message);

gossip-base/src/main/java/org/apache/gossip/model/PerNodeDataBulkMessage.java

@@ -32,8 +32,10 @@ public class PerNodeDataBulkMessage extends Base {
     return messages;
   }
 
-  @Override public String toString() {
+  @Override
-    return "GossipDataBulkMessage[" + messages.stream().map(Object::toString)
+  public String toString() {
-            .collect(Collectors.joining(",")) + "]";
+    return "GossipDataBulkMessage["
+        + messages.stream().map(Object::toString).collect(Collectors.joining(","))
+        + "]";
   }
 }

gossip-base/src/main/java/org/apache/gossip/model/PerNodeDataMessage.java

@@ -31,30 +31,39 @@ public class PerNodeDataMessage extends Base {
   public String getNodeId() {
     return nodeId;
   }
+
   public void setNodeId(String nodeId) {
     this.nodeId = nodeId;
   }
+
   public String getKey() {
     return key;
   }
+
   public void setKey(String key) {
     this.key = key;
   }
+
   public Object getPayload() {
     return payload;
   }
+
   public void setPayload(Object payload) {
     this.payload = payload;
   }
+
   public Long getTimestamp() {
     return timestamp;
   }
+
   public void setTimestamp(Long timestamp) {
     this.timestamp = timestamp;
   }
+
   public Long getExpireAt() {
     return expireAt;
   }
+
   public void setExpireAt(Long expireAt) {
     this.expireAt = expireAt;
   }
@@ -69,11 +78,18 @@ public class PerNodeDataMessage extends Base {
 
   @Override
   public String toString() {
-    return "GossipDataMessage [nodeId=" + nodeId + ", key=" + key + ", payload=" + payload
+    return "GossipDataMessage [nodeId="
-            + ", timestamp=" + timestamp + ", expireAt=" + expireAt
+        + nodeId
-            + ", replicable=" + replicable + "]";
+        + ", key="
+        + key
+        + ", payload="
+        + payload
+        + ", timestamp="
+        + timestamp
+        + ", expireAt="
+        + expireAt
+        + ", replicable="
+        + replicable
+        + "]";
   }
-
-  
-  
 }

gossip-base/src/main/java/org/apache/gossip/model/Response.java

@@ -17,6 +17,4 @@
  */
 package org.apache.gossip.model;
 
-public abstract class Response extends Base {
+public abstract class Response extends Base {}
-
-}

gossip-base/src/main/java/org/apache/gossip/model/SharedDataBulkMessage.java

@@ -32,8 +32,10 @@ public class SharedDataBulkMessage extends Base {
     return messages;
   }
 
-  @Override public String toString() {
+  @Override
-    return "SharedGossipDataBulkMessage[" + messages.stream().map(Object::toString)
+  public String toString() {
-            .collect(Collectors.joining(",")) + "]";
+    return "SharedGossipDataBulkMessage["
+        + messages.stream().map(Object::toString).collect(Collectors.joining(","))
+        + "]";
   }
 }

gossip-base/src/main/java/org/apache/gossip/model/SharedDataMessage.java

@@ -17,7 +17,6 @@
  */
 package org.apache.gossip.model;
 
-import org.apache.gossip.replication.AllReplicable;
 import org.apache.gossip.replication.Replicable;
 
 public class SharedDataMessage extends Base {

gossip-base/src/main/java/org/apache/gossip/model/ShutdownMessage.java

@@ -23,9 +23,7 @@ public class ShutdownMessage extends Message {
   private long shutdownAtNanos;
   private String nodeId;
 
-  public ShutdownMessage(){
+  public ShutdownMessage() {}
-    
-  }
 
   public String getNodeId() {
     return nodeId;
@@ -47,5 +45,4 @@ public class ShutdownMessage extends Message {
   public String toString() {
     return "ShutdownMessage [shutdownAtNanos=" + shutdownAtNanos + ", nodeId=" + nodeId + "]";
   }
-  
 }

gossip-base/src/main/java/org/apache/gossip/model/SignedPayload.java

@@ -20,17 +20,20 @@ package org.apache.gossip.model;
 public class SignedPayload extends Base {
   private byte[] data;
   private byte[] signature;
+
   public byte[] getData() {
     return data;
   }
+
   public void setData(byte[] data) {
     this.data = data;
   }
+
   public byte[] getSignature() {
     return signature;
   }
+
   public void setSignature(byte[] signature) {
     this.signature = signature;
   }
-  
 }

gossip-base/src/main/java/org/apache/gossip/protocol/ProtocolManager.java

@@ -17,9 +17,8 @@
  */
 package org.apache.gossip.protocol;
 
-import org.apache.gossip.model.Base;
-
 import java.io.IOException;
+import org.apache.gossip.model.Base;
 
 /** interface for managing message marshaling. */
 public interface ProtocolManager {

gossip-base/src/main/java/org/apache/gossip/replication/DataCenterReplicable.java

@@ -34,12 +34,14 @@ public class DataCenterReplicable<T extends Base> implements Replicable<T> {
     if (!me.getProperties().containsKey(DatacenterRackAwareActiveGossiper.DATACENTER)) {
       // replicate to others if I am not belong to any data center
       return true;
-    } else if (!destination.getProperties()
+    } else if (!destination
+        .getProperties()
         .containsKey(DatacenterRackAwareActiveGossiper.DATACENTER)) {
       // Do not replicate if the destination data center is not defined
       return false;
     } else {
-      return me.getProperties().get(DatacenterRackAwareActiveGossiper.DATACENTER)
+      return me.getProperties()
+          .get(DatacenterRackAwareActiveGossiper.DATACENTER)
           .equals(destination.getProperties().get(DatacenterRackAwareActiveGossiper.DATACENTER));
     }
   }

gossip-base/src/main/java/org/apache/gossip/replication/Replicable.java

@@ -21,14 +21,15 @@ import org.apache.gossip.LocalMember;
 import org.apache.gossip.model.Base;
 
 /**
- * This interface is used to determine whether a data item needs to be replicated to
+ * This interface is used to determine whether a data item needs to be replicated to another gossip
- * another gossip member.
+ * member.
  *
  * @param <T> A subtype of the class {@link org.apache.gossip.model.Base} which uses this interface
  */
 public interface Replicable<T extends Base> {
   /**
    * Test for a given data item needs to be replicated.
+   *
    * @param me node that the data item is going to transmit from.
    * @param destination target node to replicate.
    * @param message this parameter is currently ignored

gossip-base/src/main/java/org/apache/gossip/replication/WhiteListReplicable.java

@@ -17,11 +17,10 @@
  */
 package org.apache.gossip.replication;
 
-import org.apache.gossip.LocalMember;
-import org.apache.gossip.model.Base;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.gossip.LocalMember;
+import org.apache.gossip.model.Base;
 
 /**
  * Replicable implementation which replicates data to given set of nodes.

gossip-base/src/main/java/org/apache/gossip/secure/KeyTool.java

@@ -50,8 +50,8 @@ public class KeyTool {
     }
   }
 
-  public static void main (String [] args) throws 
+  public static void main(String[] args)
-    NoSuchAlgorithmException, NoSuchProviderException, IOException{
+      throws NoSuchAlgorithmException, NoSuchProviderException, IOException {
     generatePubandPrivateKeyFiles(args[0], args[1]);
   }
 }

gossip-base/src/main/java/org/apache/gossip/transport/AbstractTransportManager.java

@@ -18,27 +18,25 @@
 package org.apache.gossip.transport;
 
 import com.codahale.metrics.MetricRegistry;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.gossip.manager.AbstractActiveGossiper;
 import org.apache.gossip.manager.GossipCore;
 import org.apache.gossip.manager.GossipManager;
 import org.apache.gossip.utils.ReflectionUtils;
-import org.apache.log4j.Logger;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Manage the protcol threads (active and passive gossipers).
  */
+@Slf4j
 public abstract class AbstractTransportManager implements TransportManager {
 
-  public static final Logger LOGGER = Logger.getLogger(AbstractTransportManager.class);
-  
-  private final ExecutorService gossipThreadExecutor;
-  private final AbstractActiveGossiper activeGossipThread;
   protected final GossipManager gossipManager;
   protected final GossipCore gossipCore;
+  private final ExecutorService gossipThreadExecutor;
+  private final AbstractActiveGossiper activeGossipThread;
   
   public AbstractTransportManager(GossipManager gossipManager, GossipCore gossipCore) {
     this.gossipManager = gossipManager;
@@ -65,10 +63,10 @@ public abstract class AbstractTransportManager implements TransportManager {
       boolean result = gossipThreadExecutor.awaitTermination(10, TimeUnit.MILLISECONDS);
       if (!result) {
         // common when blocking patterns are used to read data from a socket.
-        LOGGER.warn("executor shutdown timed out");
+        log.warn("executor shutdown timed out");
       }
     } catch (InterruptedException e) {
-      LOGGER.error(e);
+      log.error("Error!", e);
     }
     gossipThreadExecutor.shutdownNow();
   }

gossip-base/src/main/java/org/apache/gossip/transport/TransportManager.java

@@ -23,10 +23,16 @@ import java.net.URI;
 /** interface for manager that sends and receives messages that have already been serialized. */
 public interface TransportManager {
 
-  /** starts the active gossip thread responsible for reaching out to remote nodes. Not related to `startEndpoint()` */
+  /**
+   * starts the active gossip thread responsible for reaching out to remote nodes. Not related to
+   * `startEndpoint()`
+   */
   void startActiveGossiper();
 
-  /** starts the passive gossip thread that receives messages from remote nodes. Not related to `startActiveGossiper()` */
+  /**
+   * starts the passive gossip thread that receives messages from remote nodes. Not related to
+   * `startActiveGossiper()`
+   */
   void startEndpoint();
 
   /** attempts to shutdown all threads. */

gossip-base/src/main/java/org/apache/gossip/udp/Trackable.java

@@ -26,5 +26,4 @@ public interface Trackable {
   String getUuid();
 
   void setUuid(String uuid);
-  
 }

gossip-base/src/main/java/org/apache/gossip/udp/UdpActiveGossipMessage.java

@@ -42,8 +42,12 @@ public class UdpActiveGossipMessage extends ActiveGossipMessage implements Track
 
   @Override
   public String toString() {
-    return "UdpActiveGossipMessage [uriFrom=" + uriFrom + ", uuid=" + uuid + ", getMembers()="
+    return "UdpActiveGossipMessage [uriFrom="
-            + getMembers() + "]";
+        + uriFrom
+        + ", uuid="
+        + uuid
+        + ", getMembers()="
+        + getMembers()
+        + "]";
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/udp/UdpActiveGossipOk.java

@@ -21,7 +21,6 @@ import org.apache.gossip.model.ActiveGossipOk;
 
 public class UdpActiveGossipOk extends ActiveGossipOk implements Trackable {
 
-
   private String uriFrom;
   private String uuid;
 
@@ -40,5 +39,4 @@ public class UdpActiveGossipOk extends ActiveGossipOk implements Trackable {
   public void setUuid(String uuid) {
     this.uuid = uuid;
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/udp/UdpNotAMemberFault.java

@@ -21,11 +21,9 @@ import org.apache.gossip.model.NotAMemberFault;
 
 public class UdpNotAMemberFault extends NotAMemberFault implements Trackable {
 
-  public UdpNotAMemberFault(){
-    
-  }
   private String uriFrom;
   private String uuid;
+  public UdpNotAMemberFault() {}
 
   public String getUriFrom() {
     return uriFrom;
@@ -42,5 +40,4 @@ public class UdpNotAMemberFault extends NotAMemberFault implements Trackable{
   public void setUuid(String uuid) {
     this.uuid = uuid;
   }
-  
 }

gossip-base/src/main/java/org/apache/gossip/udp/UdpPerNodeDataBulkMessage.java

@@ -42,8 +42,12 @@ public class UdpPerNodeDataBulkMessage extends PerNodeDataBulkMessage implements
 
   @Override
   public String toString() {
-    return "UdpGossipDataMessage [uriFrom=" + uriFrom + ", uuid=" + uuid
+    return "UdpGossipDataMessage [uriFrom="
-            + ", messages=[" + super.toString() + "] ]";
+        + uriFrom
+        + ", uuid="
+        + uuid
+        + ", messages=["
+        + super.toString()
+        + "] ]";
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/udp/UdpPerNodeDataMessage.java

@@ -42,8 +42,12 @@ public class UdpPerNodeDataMessage extends PerNodeDataMessage implements Trackab
 
   @Override
   public String toString() {
-    return "UdpGossipDataMessage [uriFrom=" + uriFrom + ", uuid=" + uuid
+    return "UdpGossipDataMessage [uriFrom="
-            + ", getReplicable()=" + getReplicable() + "]";
+        + uriFrom
+        + ", uuid="
+        + uuid
+        + ", getReplicable()="
+        + getReplicable()
+        + "]";
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/udp/UdpSharedDataBulkMessage.java

@@ -42,8 +42,13 @@ public class UdpSharedDataBulkMessage extends SharedDataBulkMessage implements T
 
   @Override
   public String toString() {
-    return "UdpSharedGossipDataMessage [uriFrom=" + uriFrom + ", uuid=" + uuid + ", getNodeId()="
+    return "UdpSharedGossipDataMessage [uriFrom="
-            + ", messages=[" + super.toString() + "] ]";
+        + uriFrom
+        + ", uuid="
+        + uuid
+        + ", getNodeId()="
+        + ", messages=["
+        + super.toString()
+        + "] ]";
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/udp/UdpSharedDataMessage.java

@@ -42,10 +42,22 @@ public class UdpSharedDataMessage extends SharedDataMessage implements Trackable
 
   @Override
   public String toString() {
-    return "UdpSharedGossipDataMessage [uriFrom=" + uriFrom + ", uuid=" + uuid + ", getNodeId()="
+    return "UdpSharedGossipDataMessage [uriFrom="
-            + getNodeId() + ", getKey()=" + getKey() + ", getPayload()=" + getPayload()
+        + uriFrom
-            + ", getTimestamp()=" + getTimestamp() + ", getExpireAt()=" + getExpireAt()
+        + ", uuid="
-            + ", getReplicable()=" + getReplicable() + "]";
+        + uuid
+        + ", getNodeId()="
+        + getNodeId()
+        + ", getKey()="
+        + getKey()
+        + ", getPayload()="
+        + getPayload()
+        + ", getTimestamp()="
+        + getTimestamp()
+        + ", getExpireAt()="
+        + getExpireAt()
+        + ", getReplicable()="
+        + getReplicable()
+        + "]";
   }
-
 }

gossip-base/src/main/java/org/apache/gossip/utils/ReflectionUtils.java

@@ -23,8 +23,9 @@ import java.lang.reflect.InvocationTargetException;
 public class ReflectionUtils {
 
   /**
-   * Create an instance of a thing. This method essentially makes code more readable by handing the various exception
+   * Create an instance of a thing. This method essentially makes code more readable by handing the
-   * trapping.
+   * various exception trapping.
+   *
    * @param className
    * @param constructorTypes
    * @param constructorArgs
@@ -32,20 +33,23 @@ public class ReflectionUtils {
    * @return constructed instance of a thing.
    */
   @SuppressWarnings("unchecked")
-  public static <T> T constructWithReflection(String className, Class<?>[] constructorTypes, Object[] constructorArgs) {
+  public static <T> T constructWithReflection(
+      String className, Class<?>[] constructorTypes, Object[] constructorArgs) {
     try {
       Constructor<?> c = Class.forName(className).getConstructor(constructorTypes);
       c.setAccessible(true);
       return (T) c.newInstance(constructorArgs);
     } catch (InvocationTargetException e) {
       // catch ITE and throw the target if it is a RTE.
-      if (e.getTargetException() != null && RuntimeException.class.isAssignableFrom(e.getTargetException().getClass())) {
+      if (e.getTargetException() != null
+          && RuntimeException.class.isAssignableFrom(e.getTargetException().getClass())) {
         throw (RuntimeException) e.getTargetException();
       } else {
         throw new RuntimeException(e);
       }
     } catch (ReflectiveOperationException others) {
-      // Note: No class in the above list should be a descendent of RuntimeException. Otherwise, we're just wrapping
+      // Note: No class in the above list should be a descendent of RuntimeException. Otherwise,
+      // we're just wrapping
       //       and making stack traces confusing.
       throw new RuntimeException(others);
     }

gossip-base/src/main/resources/log4j.properties

@@ -9,12 +9,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
 log4j.rootLogger=INFO,stdout
-
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
-
 log4j.logger.io.teknek=DEBUG
 log4j.logger.com.google.code.gossip=INFO

gossip-base/src/test/java/org/apache/gossip/AbstractIntegrationBase.java

@@ -55,12 +55,19 @@ public abstract class AbstractIntegrationBase {
 
     for (int i = 1; i < memberCount + 1; ++i) {
       URI uri = new URI("udp://" + "127.0.0.1" + ":" + (50000 + i));
-      GossipManager gossipService = GossipManagerBuilder.newBuilder().cluster(cluster).uri(uri)
+      GossipManager gossipService =
-              .id(i + "").gossipMembers(startupMembers).gossipSettings(settings).build();
+          GossipManagerBuilder.newBuilder()
+              .cluster(cluster)
+              .uri(uri)
+              .id(i + "")
+              .gossipMembers(startupMembers)
+              .gossipSettings(settings)
+              .build();
       gossipService.init();
       register(gossipService);
     }
   }
+
   @Before
   public void before() {
     nodes = new ArrayList<>();
@@ -74,5 +81,4 @@ public abstract class AbstractIntegrationBase {
       }
     }
   }
-  
 }

gossip-base/src/test/java/org/apache/gossip/MemberTest.java

@@ -20,21 +20,31 @@ package org.apache.gossip;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
-
+import org.junit.jupiter.api.Assertions;
-import org.junit.Assert;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 public class MemberTest {
 
   @Test
   public void testHashCodeFromGossip40() throws URISyntaxException {
-    Assert.assertNotEquals(
+    Assertions.assertNotEquals(new LocalMember(
-            new LocalMember("mycluster", new URI("udp://4.4.4.4:1000"), "myid", 1, new HashMap<String,String>(), 10, 5, "exponential")
+            "mycluster",
-                    .hashCode(),
+            new URI("udp://4.4.4.4:1000"),
-            new LocalMember("mycluster", new URI("udp://4.4.4.5:1005"), "yourid", 11, new HashMap<String,String>(), 11, 6, "exponential")
+            "myid",
+            1,
+            new HashMap<>(),
+            10,
+            5,
+            "exponential")
+        .hashCode(), new LocalMember(
+                "mycluster",
+                new URI("udp://4.4.4.5:1005"),
+                "yourid",
+                11,
+                new HashMap<>(),
+                11,
+                6,
+                "exponential")
             .hashCode());
   }
 }

gossip-base/src/test/java/org/apache/gossip/accrual/FailureDetectorTest.java

@@ -17,24 +17,15 @@
  */
 package org.apache.gossip.accrual;
 
-import org.apache.gossip.GossipSettings;
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+import org.apache.gossip.GossipSettings;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-@RunWith(JUnitPlatform.class)
 public class FailureDetectorTest {
 
-  @FunctionalInterface
-  interface TriConsumer<A, B, C> {
-    void accept(A a, B b, C c);
-  }
-
   static final Double failureThreshold = new GossipSettings().getConvictThreshold();
 
   List<Integer> generateTimeList(int begin, int end, int step) {
@@ -52,8 +43,8 @@ public class FailureDetectorTest {
   public void normalDistribution() {
     FailureDetector fd = new FailureDetector(1, 1000, "normal");
     List<Integer> values = generateTimeList(0, 10000, 100);
-    Double deltaSum = 0.0;
+    double deltaSum = 0.0;
-    Integer deltaCount = 0;
+    int deltaCount = 0;
     for (int i = 0; i < values.size() - 1; i++) {
       fd.recordHeartbeat(values.get(i));
       if (i != 0) {
@@ -64,21 +55,23 @@ public class FailureDetectorTest {
     Integer lastRecorded = values.get(values.size() - 2);
 
     //after "step" delay we need to be considered UP
-    Assert.assertTrue(fd.computePhiMeasure(values.get(values.size() - 1)) < failureThreshold);
+    Assertions.assertTrue(fd.computePhiMeasure(values.get(values.size() - 1)) < failureThreshold);
 
     //if we check phi-measure after mean delay we get value for 0.5 probability(normal distribution)
-    Assert.assertEquals(fd.computePhiMeasure(lastRecorded + Math.round(deltaSum / deltaCount)), -Math.log10(0.5), 0.1);
+    Assertions.assertEquals(fd.computePhiMeasure(lastRecorded + Math.round(deltaSum / deltaCount)),
+            -Math.log10(0.5),
+            0.1);
   }
 
   @Test
   public void checkMinimumSamples() {
-    Integer minimumSamples = 5;
+    int minimumSamples = 5;
     FailureDetector fd = new FailureDetector(minimumSamples, 1000, "normal");
     for (int i = 0; i < minimumSamples + 1; i++) { // +1 because we don't place first heartbeat into structure
-      Assert.assertNull(fd.computePhiMeasure(100));
+      Assertions.assertNull(fd.computePhiMeasure(100));
       fd.recordHeartbeat(i);
     }
-    Assert.assertNotNull(fd.computePhiMeasure(100));
+    Assertions.assertNotNull(fd.computePhiMeasure(100));
   }
 
   @Test
@@ -86,22 +79,22 @@ public class FailureDetectorTest {
     final FailureDetector fd = new FailureDetector(5, 1000, "normal");
     TriConsumer<Integer, Integer, Integer> checkAlive = (begin, end, step) -> {
       List<Integer> times = generateTimeList(begin, end, step);
-      for (int i = 0; i < times.size(); i++) {
+        for (Integer time : times) {
-        Double current = fd.computePhiMeasure(times.get(i));
+            Double current = fd.computePhiMeasure(time);
             if (current != null) {
-          Assert.assertTrue(current < failureThreshold);
+                Assertions.assertTrue(current < failureThreshold);
             }
-        fd.recordHeartbeat(times.get(i));
+            fd.recordHeartbeat(time);
         }
     };
 
     TriConsumer<Integer, Integer, Integer> checkDeadMonotonic = (begin, end, step) -> {
       List<Integer> times = generateTimeList(begin, end, step);
       Double prev = null;
-      for (int i = 0; i < times.size(); i++) {
+        for (Integer time : times) {
-        Double current = fd.computePhiMeasure(times.get(i));
+            Double current = fd.computePhiMeasure(time);
             if (current != null && prev != null) {
-          Assert.assertTrue(current >= prev);
+                Assertions.assertTrue(current >= prev);
             }
             prev = current;
         }
@@ -110,4 +103,9 @@ public class FailureDetectorTest {
     checkAlive.accept(0, 20000, 100);
     checkDeadMonotonic.accept(20000, 20500, 5);
   }
+
+  @FunctionalInterface
+  interface TriConsumer<A, B, C> {
+    void accept(A a, B b, C c);
+  }
 }

gossip-base/src/test/java/org/apache/gossip/crdt/AddRemoveStringSetTest.java

@@ -39,14 +39,15 @@ import java.util.stream.Stream;
 */
 
 @Ignore
-public abstract class AddRemoveStringSetTest<SetType extends CrdtAddRemoveSet<String, Set<String>, SetType>> {
+public abstract class AddRemoveStringSetTest<
+    SetType extends CrdtAddRemoveSet<String, Set<String>, SetType>> {
+
+  private Set<String> sampleSet;
 
   abstract SetType construct(Set<String> set);
 
   abstract SetType construct();
 
-  private Set<String> sampleSet;
-
   @Before
   public void setup() {
     sampleSet = new HashSet<>();
@@ -68,7 +69,8 @@ public abstract class AddRemoveStringSetTest<SetType extends CrdtAddRemoveSet<St
       SetType newSet;
       if (it % 5 == 1) {
         // deleting existing
-        String forDelete = hashSet.stream().skip((long) (hashSet.size() * Math.random())).findFirst().get();
+        String forDelete =
+            hashSet.stream().skip((long) (hashSet.size() * Math.random())).findFirst().get();
         newSet = set.remove(forDelete);
         Assert.assertEquals(set.value(), hashSet); // check old version is immutable
         hashSet.remove(forDelete);
@@ -108,7 +110,8 @@ public abstract class AddRemoveStringSetTest<SetType extends CrdtAddRemoveSet<St
 
   @Test
   public void abstractStressMergeTest() {
-    // in one-process context, add, remove and merge operations of lww are equal to operations of Set
+    // in one-process context, add, remove and merge operations of lww are equal to operations of
+    // Set
     // we've already checked it. Now just check merge
     Set<String> hashSet1 = new HashSet<>(), hashSet2 = new HashSet<>();
     SetType set1 = construct(), set2 = construct();
@@ -125,7 +128,8 @@ public abstract class AddRemoveStringSetTest<SetType extends CrdtAddRemoveSet<St
     }
     Assert.assertEquals(set1.value(), hashSet1);
     Assert.assertEquals(set2.value(), hashSet2);
-    Set<String> mergedSet = Stream.concat(hashSet1.stream(), hashSet2.stream()).collect(Collectors.toSet());
+    Set<String> mergedSet =
+        Stream.concat(hashSet1.stream(), hashSet2.stream()).collect(Collectors.toSet());
     Assert.assertEquals(set1.merge(set2).value(), mergedSet);
   }
 

gossip-base/src/test/java/org/apache/gossip/crdt/GrowOnlyCounterTest.java

@@ -17,11 +17,10 @@
  */
 package org.apache.gossip.crdt;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class GrowOnlyCounterTest {
   

gossip-base/src/test/java/org/apache/gossip/crdt/GrowOnlySetTest.java

@@ -32,7 +32,8 @@ public class GrowOnlySetTest {
     GrowOnlySet<String> gset = new GrowOnlySet<>(Arrays.asList("a", "b"));
     Assert.assertEquals(gset, a.merge("a", gset, new CrdtBiFunctionMerge()));
     GrowOnlySet<String> over = new GrowOnlySet<>(Arrays.asList("b", "d"));
-    Assert.assertEquals(new GrowOnlySet<>(Arrays.asList("a", "b", "d")), 
+    Assert.assertEquals(
+        new GrowOnlySet<>(Arrays.asList("a", "b", "d")),
         a.merge("a", over, CrdtBiFunctionMerge::applyStatic));
   }
 }

gossip-base/src/test/java/org/apache/gossip/crdt/LwwSetTest.java

@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.Set;
 
 public class LwwSetTest extends AddRemoveStringSetTest<LwwSet<String>> {
-  static private Clock clock = new SystemClock();
+  private static Clock clock = new SystemClock();
 
   LwwSet<String> construct(Set<String> set) {
     return new LwwSet<>(set);
@@ -53,7 +53,8 @@ public class LwwSetTest extends AddRemoveStringSetTest<LwwSet<String>> {
 
   @Test
   public void fakeTimeMergeTest() {
-    // try to create LWWSet with time from future (simulate other process with its own clock) and validate result
+    // try to create LWWSet with time from future (simulate other process with its own clock) and
+    // validate result
     // check remove from the future
     Map<Integer, LwwSet.Timestamps> map = new HashMap<>();
     map.put(25, new LwwSet.Timestamps(clock.nanoTime(), Long.MAX_VALUE));

gossip-base/src/test/java/org/apache/gossip/crdt/MaxChangeSetTest.java

@@ -17,13 +17,12 @@
  */
 package org.apache.gossip.crdt;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class MaxChangeSetTest extends AddRemoveStringSetTest<MaxChangeSet<String>> {
   MaxChangeSet<String> construct(Set<String> set){

gossip-base/src/test/java/org/apache/gossip/crdt/OrSetTest.java

@@ -17,13 +17,12 @@
  */
 package org.apache.gossip.crdt;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.util.Arrays;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class OrSetTest extends AddRemoveStringSetTest<OrSet<String>> {
   OrSet<String> construct(){

gossip-base/src/test/java/org/apache/gossip/crdt/PNCounterTest.java

@@ -133,5 +133,4 @@ public class PNCounterTest {
     counter2 = counter2.merge(counter3);
     Assert.assertEquals(1, (long) counter3.value());
   }
-
 }

gossip-base/src/test/java/org/apache/gossip/crdt/TwoPhaseSetTest.java

@@ -71,7 +71,8 @@ public class TwoPhaseSetTest {
 
   @Test
   public void removeMissingAddExistingLimitsTest() {
-    BiConsumer<TwoPhaseSet<?>, TwoPhaseSet<?>> checkInternals = (f, s) -> {
+    BiConsumer<TwoPhaseSet<?>, TwoPhaseSet<?>> checkInternals =
+        (f, s) -> {
           Assert.assertEquals(s, f);
           Assert.assertEquals(s.getRemoved(), f.getRemoved());
           Assert.assertEquals(s.getAdded(), f.getAdded());
@@ -83,7 +84,9 @@ public class TwoPhaseSetTest {
     checkInternals.accept(set, set.add("a"));
     // limits
     TwoPhaseSet<String> newSet = set.remove("a"); // allow this remove
-    Assert.assertEquals(newSet.add("a"), new TwoPhaseSet<>("b", "d")); // discard this add, "a" was added and removed
+    Assert.assertEquals(
+        newSet.add("a"),
+        new TwoPhaseSet<>("b", "d")); // discard this add, "a" was added and removed
   }
 
   @Test

gossip-base/src/test/java/org/apache/gossip/event/data/DataEventManagerTest.java

@@ -21,13 +21,10 @@ import com.codahale.metrics.MetricRegistry;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-@RunWith(JUnitPlatform.class)
 public class DataEventManagerTest {
 
   private static Semaphore semaphore;
@@ -45,8 +42,7 @@ public class DataEventManagerTest {
   public void perNodeDataEventHandlerAddRemoveTest() {
     DataEventManager eventManager = new DataEventManager(new MetricRegistry());
 
-    UpdateNodeDataEventHandler nodeDataEventHandler = (nodeId, key, oldValue, newValue) -> {
+    UpdateNodeDataEventHandler nodeDataEventHandler = (nodeId, key, oldValue, newValue) -> {};
-    };
 
     eventManager.registerPerNodeDataSubscriber(nodeDataEventHandler);
     Assert.assertEquals(1, eventManager.getPerNodeSubscribersSize());
@@ -61,7 +57,8 @@ public class DataEventManagerTest {
     resetData();
 
     // A new subscriber "Juliet" is like to notified when per node data change for the key "Romeo"
-    UpdateNodeDataEventHandler juliet = (nodeId, key, oldValue, newValue) -> {
+    UpdateNodeDataEventHandler juliet =
+        (nodeId, key, oldValue, newValue) -> {
           if (!key.equals("Romeo")) return;
           receivedNodeId = nodeId;
           receivedKey = key;
@@ -88,14 +85,12 @@ public class DataEventManagerTest {
   public void sharedDataEventHandlerAddRemoveTest() {
     DataEventManager eventManager = new DataEventManager(new MetricRegistry());
 
-    UpdateSharedDataEventHandler sharedDataEventHandler = (key, oldValue, newValue) -> {
+    UpdateSharedDataEventHandler sharedDataEventHandler = (key, oldValue, newValue) -> {};
 
-    };
     eventManager.registerSharedDataSubscriber(sharedDataEventHandler);
     Assert.assertEquals(1, eventManager.getSharedDataSubscribersSize());
     eventManager.unregisterSharedDataSubscriber(sharedDataEventHandler);
     Assert.assertEquals(0, eventManager.getSharedDataSubscribersSize());
-    
   }
 
   // Test whether the shared data events are fired
@@ -105,7 +100,8 @@ public class DataEventManagerTest {
     resetData();
 
     // A new subscriber "Alice" is like to notified when shared data change for the key "technology"
-    UpdateSharedDataEventHandler alice = (key, oldValue, newValue) -> {
+    UpdateSharedDataEventHandler alice =
+        (key, oldValue, newValue) -> {
           if (!key.equals("technology")) return;
           receivedKey = key;
           receivedNewValue = newValue;
@@ -134,26 +130,26 @@ public class DataEventManagerTest {
 
     DataEventManager eventManager = new DataEventManager(registry);
 
-    UpdateNodeDataEventHandler nodeDataEventHandler = (nodeId, key, oldValue, newValue) -> {
+    UpdateNodeDataEventHandler nodeDataEventHandler = (nodeId, key, oldValue, newValue) -> {};
-    };
 
-    UpdateSharedDataEventHandler sharedDataEventHandler = (key, oldValue, newValue) -> {
+    UpdateSharedDataEventHandler sharedDataEventHandler = (key, oldValue, newValue) -> {};
-    };
 
     eventManager.registerPerNodeDataSubscriber(nodeDataEventHandler);
     eventManager.registerSharedDataSubscriber(sharedDataEventHandler);
 
-    Assert.assertEquals(1,
+    Assert.assertEquals(
-            registry.getGauges().get(DataEventConstants.PER_NODE_DATA_SUBSCRIBERS_SIZE).getValue());
+        1, registry.getGauges().get(DataEventConstants.PER_NODE_DATA_SUBSCRIBERS_SIZE).getValue());
-    Assert.assertEquals(0,
+    Assert.assertEquals(
-            registry.getGauges().get(DataEventConstants.PER_NODE_DATA_SUBSCRIBERS_QUEUE_SIZE)
+        0,
+        registry
+            .getGauges()
+            .get(DataEventConstants.PER_NODE_DATA_SUBSCRIBERS_QUEUE_SIZE)
             .getValue());
-    Assert.assertEquals(1,
+    Assert.assertEquals(
-            registry.getGauges().get(DataEventConstants.SHARED_DATA_SUBSCRIBERS_SIZE).getValue());
+        1, registry.getGauges().get(DataEventConstants.SHARED_DATA_SUBSCRIBERS_SIZE).getValue());
-    Assert.assertEquals(0,
+    Assert.assertEquals(
-            registry.getGauges().get(DataEventConstants.SHARED_DATA_SUBSCRIBERS_QUEUE_SIZE)
+        0,
-                    .getValue());
+        registry.getGauges().get(DataEventConstants.SHARED_DATA_SUBSCRIBERS_QUEUE_SIZE).getValue());
-    
   }
 
   private void resetData() {
@@ -162,5 +158,4 @@ public class DataEventManagerTest {
     receivedNewValue = null;
     receivedOldValue = null;
   }
-  
 }

gossip-base/src/test/java/org/apache/gossip/lock/vote/MajorityVoteTest.java

@@ -19,14 +19,11 @@ package org.apache.gossip.lock.vote;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-@RunWith(JUnitPlatform.class)
 public class MajorityVoteTest {
 
   @Test
@@ -45,7 +42,6 @@ public class MajorityVoteTest {
 
     Assert.assertTrue(result.value().get("1").getVotes().get("2").getVoteValue());
     Assert.assertTrue(!result.value().get("3").getVotes().get("4").getVoteValue());
-
   }
 
   @Test
@@ -64,7 +60,6 @@ public class MajorityVoteTest {
 
     Assert.assertTrue(result.value().get("1").getVotes().get("2").getVoteValue());
     Assert.assertTrue(!result.value().get("1").getVotes().get("4").getVoteValue());
-
   }
 
   @Test
@@ -75,8 +70,8 @@ public class MajorityVoteTest {
     MajorityVote first = new MajorityVote(voteCandidateMap1);
 
     Map<String, VoteCandidate> voteCandidateMap2 = new HashMap<>();
-    VoteCandidate candidateB = new VoteCandidate("1", "key1",
+    VoteCandidate candidateB =
-            generateVotes(2, 4, true, false, true));
+        new VoteCandidate("1", "key1", generateVotes(2, 4, true, false, true));
     voteCandidateMap2.put("1", candidateB);
     MajorityVote second = new MajorityVote(voteCandidateMap2);
 
@@ -92,10 +87,10 @@ public class MajorityVoteTest {
     }
     for (int i = startingNodeId; i <= endNodeId; i++) {
       String nodeId = i + "";
-      voteMap.put(nodeId, new Vote(nodeId, votes[i - startingNodeId], false, new ArrayList<>(),
+      voteMap.put(
-              new ArrayList<>()));
+          nodeId,
+          new Vote(nodeId, votes[i - startingNodeId], false, new ArrayList<>(), new ArrayList<>()));
     }
     return voteMap;
   }
-
 }

gossip-base/src/test/java/org/apache/gossip/manager/DataReaperTest.java

@@ -42,8 +42,14 @@ public class DataReaperTest {
     settings.setPersistDataState(false);
     settings.setTransportManagerClass("org.apache.gossip.transport.UnitTestTransportManager");
     settings.setProtocolManagerClass("org.apache.gossip.protocol.UnitTestProtocolManager");
-    GossipManager gm = GossipManagerBuilder.newBuilder().cluster("abc").gossipSettings(settings)
+    GossipManager gm =
-            .id(myId).uri(URI.create("udp://localhost:6000")).registry(registry).build();
+        GossipManagerBuilder.newBuilder()
+            .cluster("abc")
+            .gossipSettings(settings)
+            .id(myId)
+            .uri(URI.create("udp://localhost:6000"))
+            .registry(registry)
+            .build();
     gm.init();
     gm.gossipPerNodeData(perNodeDatum(key, value));
     gm.gossipSharedData(sharedDatum(key, value));
@@ -56,9 +62,11 @@ public class DataReaperTest {
 
   private void assertDataIsAtCorrectValue(GossipManager gm) {
     Assert.assertEquals(value, gm.findPerNodeGossipData(myId, key).getPayload());
-    Assert.assertEquals(1, registry.getGauges().get(GossipCoreConstants.PER_NODE_DATA_SIZE).getValue());
+    Assert.assertEquals(
+        1, registry.getGauges().get(GossipCoreConstants.PER_NODE_DATA_SIZE).getValue());
     Assert.assertEquals(value, gm.findSharedGossipData(key).getPayload());
-    Assert.assertEquals(1, registry.getGauges().get(GossipCoreConstants.SHARED_DATA_SIZE).getValue());
+    Assert.assertEquals(
+        1, registry.getGauges().get(GossipCoreConstants.SHARED_DATA_SIZE).getValue());
   }
 
   private void assertDataIsRemoved(GossipManager gm) {
@@ -92,8 +100,14 @@ public class DataReaperTest {
     GossipSettings settings = new GossipSettings();
     settings.setTransportManagerClass("org.apache.gossip.transport.UnitTestTransportManager");
     settings.setProtocolManagerClass("org.apache.gossip.protocol.UnitTestProtocolManager");
-    GossipManager gm = GossipManagerBuilder.newBuilder().cluster("abc").gossipSettings(settings)
+    GossipManager gm =
-            .id(myId).uri(URI.create("udp://localhost:7000")).registry(registry).build();
+        GossipManagerBuilder.newBuilder()
+            .cluster("abc")
+            .gossipSettings(settings)
+            .id(myId)
+            .uri(URI.create("udp://localhost:7000"))
+            .registry(registry)
+            .build();
     gm.init();
     PerNodeDataMessage before = perNodeDatum(key, value);
     PerNodeDataMessage after = perNodeDatum(key, "b");
@@ -104,5 +118,4 @@ public class DataReaperTest {
     Assert.assertEquals(value, gm.findPerNodeGossipData(myId, key).getPayload());
     gm.shutdown();
   }
-
 }

gossip-base/src/test/java/org/apache/gossip/manager/GossipManagerBuilderTest.java

@@ -17,38 +17,32 @@
  */
 package org.apache.gossip.manager;
 
-import com.codahale.metrics.MetricRegistry;
+import static org.junit.jupiter.api.Assertions.*;
-import org.apache.gossip.Member;
-import org.apache.gossip.GossipSettings;
-import org.apache.gossip.LocalMember;
-import org.apache.gossip.manager.handlers.MessageHandler;
-import org.apache.gossip.manager.handlers.ResponseHandler;
-import org.apache.gossip.manager.handlers.TypedMessageHandler;
-import org.junit.Assert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-import javax.xml.ws.Response;
+import com.codahale.metrics.MetricRegistry;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import org.apache.gossip.GossipSettings;
+import org.apache.gossip.LocalMember;
+import org.apache.gossip.Member;
+import org.apache.gossip.manager.handlers.MessageHandler;
+import org.apache.gossip.manager.handlers.ResponseHandler;
+import org.apache.gossip.manager.handlers.TypedMessageHandlerWrapper;
+import org.apache.gossip.model.Response;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.expectThrows;
-
-@RunWith(JUnitPlatform.class)
 public class GossipManagerBuilderTest {
 
   private GossipManagerBuilder.ManagerBuilder builder;
 
   @BeforeEach
   public void setup() throws Exception {
-    builder = GossipManagerBuilder.newBuilder()
+    builder =
+        GossipManagerBuilder.newBuilder()
             .id("id")
             .cluster("aCluster")
             .uri(new URI("udp://localhost:2000"))
@@ -57,57 +51,74 @@ public class GossipManagerBuilderTest {
 
   @Test
   public void idShouldNotBeNull() {
-    expectThrows(IllegalArgumentException.class,() -> {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
           GossipManagerBuilder.newBuilder().cluster("aCluster").build();
         });
   }
 
   @Test
   public void clusterShouldNotBeNull() {
-      expectThrows(IllegalArgumentException.class,() -> {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
           GossipManagerBuilder.newBuilder().id("id").build();
         });
   }
 
   @Test
   public void settingsShouldNotBeNull() {
-      expectThrows(IllegalArgumentException.class,() -> {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
           GossipManagerBuilder.newBuilder().id("id").cluster("aCluster").build();
         });
   }
 
   @Test
-  public void createMembersListIfNull() throws URISyntaxException {
+  public void createMembersListIfNull() {
-    GossipManager gossipManager = builder.gossipMembers(null).registry(new MetricRegistry()).build();
+    GossipManager gossipManager =
+        builder.gossipMembers(null).registry(new MetricRegistry()).build();
     assertNotNull(gossipManager.getLiveMembers());
   }
 
   @Test
-  public void createDefaultMessageHandlerIfNull() throws URISyntaxException {
+  public void createDefaultMessageHandlerIfNull() {
-    GossipManager gossipManager = builder.messageHandler(null).registry(new MetricRegistry()).build();
+    GossipManager gossipManager =
+        builder.messageHandler(null).registry(new MetricRegistry()).build();
     assertNotNull(gossipManager.getMessageHandler());
   }
 
   @Test
-  public void testMessageHandlerKeeping() throws URISyntaxException {
+  public void testMessageHandlerKeeping() {
-    MessageHandler mi = new TypedMessageHandler(Response.class, new ResponseHandler());
+    MessageHandler mi = new TypedMessageHandlerWrapper(Response.class, new ResponseHandler());
     GossipManager gossipManager = builder.messageHandler(mi).registry(new MetricRegistry()).build();
     assertNotNull(gossipManager.getMessageHandler());
-    Assert.assertEquals(gossipManager.getMessageHandler(), mi);
+    assertEquals(gossipManager.getMessageHandler(), mi);
   }
 
   @Test
   public void useMemberListIfProvided() throws URISyntaxException {
-    LocalMember member = new LocalMember(
+    LocalMember member =
-            "aCluster", new URI("udp://localhost:2000"), "aGossipMember",
+        new LocalMember(
-            System.nanoTime(), new HashMap<String, String>(), 1000, 1, "exponential");
+            "aCluster",
+            new URI("udp://localhost:2000"),
+            "aGossipMember",
+            System.nanoTime(),
+            new HashMap<String, String>(),
+            1000,
+            1,
+            "exponential");
     List<Member> memberList = new ArrayList<>();
     memberList.add(member);
-    GossipManager gossipManager = builder
+    GossipManager gossipManager =
+        builder
             .uri(new URI("udp://localhost:8000"))
-        .gossipMembers(memberList).registry(new MetricRegistry()).build();
+            .gossipMembers(memberList)
+            .registry(new MetricRegistry())
+            .build();
     assertEquals(1, gossipManager.getDeadMembers().size());
     assertEquals(member.getId(), gossipManager.getDeadMembers().get(0).getId());
   }
-
 }

gossip-base/src/test/java/org/apache/gossip/manager/RingPersistenceTest.java

@@ -30,7 +30,8 @@ import org.junit.Test;
 public class RingPersistenceTest {
 
   @Test
-  public void givenThatRingIsPersisted() throws UnknownHostException, InterruptedException, URISyntaxException {
+  public void givenThatRingIsPersisted()
+      throws UnknownHostException, InterruptedException, URISyntaxException {
     GossipSettings settings = new GossipSettings();
     File f = aGossiperPersists(settings);
     Assert.assertTrue(f.exists());
@@ -38,8 +39,10 @@ public class RingPersistenceTest {
     f.delete();
   }
 
-  private File aGossiperPersists(GossipSettings settings) throws UnknownHostException, InterruptedException, URISyntaxException {
+  private File aGossiperPersists(GossipSettings settings)
-    GossipManager gossipService = GossipManagerBuilder.newBuilder()
+      throws UnknownHostException, InterruptedException, URISyntaxException {
+    GossipManager gossipService =
+        GossipManagerBuilder.newBuilder()
             .cluster("a")
             .uri(new URI("udp://" + "127.0.0.1" + ":" + (29000 + 1)))
             .id("1")
@@ -47,18 +50,22 @@ public class RingPersistenceTest {
             .gossipMembers(
                 Arrays.asList(
                     new RemoteMember("a", new URI("udp://" + "127.0.0.1" + ":" + (29000 + 0)), "0"),
-                            new RemoteMember("a", new URI("udp://" + "127.0.0.1" + ":" + (29000 + 2)), "2"))).build();
+                    new RemoteMember(
+                        "a", new URI("udp://" + "127.0.0.1" + ":" + (29000 + 2)), "2")))
+            .build();
     gossipService.getRingState().writeToDisk();
     return GossipManager.buildRingStatePath(gossipService);
   }
 
-  private void aNewInstanceGetsRingInfo(GossipSettings settings) throws UnknownHostException, InterruptedException, URISyntaxException {
+  private void aNewInstanceGetsRingInfo(GossipSettings settings)
-    GossipManager gossipService2 = GossipManagerBuilder.newBuilder()
+      throws UnknownHostException, InterruptedException, URISyntaxException {
+    GossipManager gossipService2 =
+        GossipManagerBuilder.newBuilder()
             .cluster("a")
             .uri(new URI("udp://" + "127.0.0.1" + ":" + (29000 + 1)))
             .id("1")
-            .gossipSettings(settings).build();
+            .gossipSettings(settings)
+            .build();
     Assert.assertEquals(2, gossipService2.getMembers().size());
   }
-  
 }

gossip-base/src/test/java/org/apache/gossip/manager/UserDataPersistenceTest.java

@@ -41,11 +41,13 @@ public class UserDataPersistenceTest {
         .cluster("a")
         .uri(new URI("udp://" + "127.0.0.1" + ":" + (29000 + 1)))
         .id(nodeId)
-            .gossipSettings(settings).build();
+        .gossipSettings(settings)
+        .build();
   }
 
   @Test
-  public void givenThatRingIsPersisted() throws UnknownHostException, InterruptedException, URISyntaxException {
+  public void givenThatRingIsPersisted()
+      throws UnknownHostException, InterruptedException, URISyntaxException {
 
     { // Create a gossip service and force it to persist its user data
       GossipManager gossipService = sameService();
@@ -55,7 +57,8 @@ public class UserDataPersistenceTest {
       gossipService.getUserDataState().writePerNodeToDisk();
       gossipService.getUserDataState().writeSharedToDisk();
       { // read the raw data and confirm
-        ConcurrentHashMap<String, ConcurrentHashMap<String, PerNodeDataMessage>> l = gossipService.getUserDataState().readPerNodeFromDisk();
+        ConcurrentHashMap<String, ConcurrentHashMap<String, PerNodeDataMessage>> l =
+            gossipService.getUserDataState().readPerNodeFromDisk();
         Assert.assertEquals("red", ((AToothpick) l.get(nodeId).get("a").getPayload()).getColor());
       }
       {
@@ -68,8 +71,11 @@ public class UserDataPersistenceTest {
     { // recreate the service and see that the data is read back in
       GossipManager gossipService = sameService();
       gossipService.init();
-      Assert.assertEquals("red", ((AToothpick) gossipService.findPerNodeGossipData(nodeId, "a").getPayload()).getColor());
+      Assert.assertEquals(
-      Assert.assertEquals("blue", ((AToothpick) gossipService.findSharedGossipData("a").getPayload()).getColor());
+          "red",
+          ((AToothpick) gossipService.findPerNodeGossipData(nodeId, "a").getPayload()).getColor());
+      Assert.assertEquals(
+          "blue", ((AToothpick) gossipService.findSharedGossipData("a").getPayload()).getColor());
       File f = GossipManager.buildSharedDataPath(gossipService);
       File g = GossipManager.buildPerNodeDataPath(gossipService);
       gossipService.shutdown();
@@ -102,15 +108,15 @@ public class UserDataPersistenceTest {
 
   public static class AToothpick {
     private String color;
-    public AToothpick(){
 
-    }
+    public AToothpick() {}
+
     public String getColor() {
       return color;
     }
+
     public void setColor(String color) {
       this.color = color;
     }
-    
   }
 }