Browse Source
Fixed detached object passed to persist error
Fixed detached object passed to persist error
Error was introduced after adding flyway migration Also made various optimizations to user service and session loggingmaster
nova
4 years ago
11 changed files with 414 additions and 125 deletions
-
315chatto/eclipse-formatter.xml
-
2chatto/src/main/java/org/ros/chatto/config/DataSourceConfig.java
-
6chatto/src/main/java/org/ros/chatto/dto/MessageCipherDTO.java
-
70chatto/src/main/java/org/ros/chatto/logged/LoggedUser.java
-
36chatto/src/main/java/org/ros/chatto/model/UserRole.java
-
3chatto/src/main/java/org/ros/chatto/model/UserSession.java
-
2chatto/src/main/java/org/ros/chatto/model/UserToken.java
-
19chatto/src/main/java/org/ros/chatto/security/TokenAuthenticationFilter.java
-
3chatto/src/main/java/org/ros/chatto/service/UserService.java
-
47chatto/src/main/java/org/ros/chatto/service/UserServiceImpl.java
-
36chatto/src/main/java/org/ros/chatto/service/UserTokenService.java
@ -0,0 +1,315 @@ |
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
|||
<profiles version="13"> |
|||
<profile kind="CodeFormatterProfile" name="Eclipse" version="13"> |
|||
<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_at_in_annotation_type_declaration" value="insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/> |
|||
<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.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.parentheses_positions_in_method_invocation" value="common_lines"/> |
|||
<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 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.parentheses_positions_in_switch_statement" value="common_lines"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/> |
|||
<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_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="2"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> |
|||
<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.comment.count_line_length_from_starting_position" value="true"/> |
|||
<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="do not 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_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_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_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.alignment_for_parameterized_type_references" value="0"/> |
|||
<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_closing_paren_in_parenthesized_expression" value="do not insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="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"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> |
|||
<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_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="80"/> |
|||
<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_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_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_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.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.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="do not 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.parentheses_positions_in_catch_clause" value="common_lines"/> |
|||
<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_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.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.brace_position_for_lambda_body" 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_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.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.alignment_for_type_parameters" value="0"/> |
|||
<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_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"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/> |
|||
<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_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.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.alignment_for_module_statements" value="16"/> |
|||
<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_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_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.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_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.wrap_before_conditional_operator" value="true"/> |
|||
<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_paren_in_synchronized" value="do not insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/> |
|||
<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.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.parentheses_positions_in_try_clause" value="common_lines"/> |
|||
<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="10"/> |
|||
<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_comma_in_constructor_declaration_throws" value="insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/> |
|||
<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_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_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="0"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/> |
|||
<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.wrap_before_assignment_operator" value="false"/> |
|||
<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="10"/> |
|||
<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_after_comma_in_method_declaration_parameters" value="insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" 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_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_closing_angle_bracket_in_type_parameters" value="insert"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/> |
|||
<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.alignment_for_type_arguments" value="0"/> |
|||
<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.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.keep_empty_array_initializer_on_one_line" value="false"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/> |
|||
<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.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.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 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_space_before_opening_bracket_in_array_type_reference" 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_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_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_before_lambda_arrow" value="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.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_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_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_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_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="10"/> |
|||
<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.parentheses_positions_in_lambda_declaration" value="common_lines"/> |
|||
<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_opening_brace_in_annotation_type_declaration" 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"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/> |
|||
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> |
|||
<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.alignment_for_expressions_in_for_loop_header" value="0"/> |
|||
<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_comma_in_explicitconstructorcall_arguments" 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_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_after_lambda_arrow" value="insert"/> |
|||
<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_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.tabulation.char" value="tab"/> |
|||
<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="120"/> |
|||
<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> |
@ -1,101 +1,49 @@ |
|||
package org.ros.chatto.logged; |
|||
|
|||
import java.time.Instant; |
|||
|
|||
import javax.servlet.http.HttpSessionBindingEvent; |
|||
import javax.servlet.http.HttpSessionBindingListener; |
|||
|
|||
import org.ros.chatto.model.ChatUser; |
|||
import org.ros.chatto.model.UserSession; |
|||
import org.ros.chatto.repository.UserSessionRepository; |
|||
import org.ros.chatto.service.UserService; |
|||
import org.ros.chatto.service.UserTokenService; |
|||
import org.slf4j.Logger; |
|||
import org.slf4j.LoggerFactory; |
|||
import org.springframework.security.authentication.InternalAuthenticationServiceException; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
import lombok.Getter; |
|||
import lombok.Setter; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
|
|||
@Component |
|||
@Getter |
|||
@Setter |
|||
@Slf4j |
|||
public class LoggedUser implements HttpSessionBindingListener { |
|||
|
|||
private final String username; |
|||
private final UserService userService; |
|||
private final UserTokenService userTokenService; |
|||
private final Logger logger = LoggerFactory.getLogger(LoggedUser.class); |
|||
|
|||
public LoggedUser(String username) { |
|||
this.username = username; |
|||
userService = BeanUtil.getBean(UserService.class); |
|||
userTokenService = BeanUtil.getBean(UserTokenService.class); |
|||
} |
|||
|
|||
public LoggedUser() { |
|||
username = null; |
|||
userService = BeanUtil.getBean(UserService.class); |
|||
userTokenService = BeanUtil.getBean(UserTokenService.class); |
|||
} |
|||
|
|||
@Override |
|||
public void valueBound(HttpSessionBindingEvent event) { |
|||
// UserService userService = getUserService(event); |
|||
UserService userService = BeanUtil.getBean(UserService.class); |
|||
// UserSessionRepository userSessionRepository = getUserSessionRepository(event); |
|||
UserSessionRepository userSessionRepository = BeanUtil.getBean(UserSessionRepository.class); |
|||
LoggedUser user = (LoggedUser) event.getValue(); |
|||
|
|||
Instant instant = Instant.now(); |
|||
ChatUser chatUser = userService.findByUserName(user.getUsername()); |
|||
LoggedUser user = (LoggedUser) event.getValue(); |
|||
|
|||
UserSession userSession = userSessionRepository.findByUserName(user.getUsername()); |
|||
log.debug("Incrementing session count for user {}", user.getUsername()); |
|||
|
|||
if (userSession == null) { |
|||
userSession = new UserSession(); |
|||
} |
|||
UserSession userSession = userService.incrementUserSession(user.getUsername()); |
|||
|
|||
userSession.setUser(chatUser); |
|||
userSession.setTimeStamp(instant); |
|||
userSession.setOnline(true); |
|||
userSession.setNumSessions(userSession.getNumSessions() + 1); |
|||
userSessionRepository.save(userSession); |
|||
log.trace("Username = {} with sessions = {}", userSession.getUser(), userSession.getNumSessions()); |
|||
} |
|||
|
|||
@Override |
|||
public void valueUnbound(HttpSessionBindingEvent event) { |
|||
LoggedUser user = (LoggedUser) event.getValue(); |
|||
|
|||
UserService userService = BeanUtil.getBean(UserService.class); |
|||
UserSessionRepository userSessionRepository = BeanUtil.getBean(UserSessionRepository.class); |
|||
Instant instant = Instant.now(); |
|||
|
|||
ChatUser chatUser = userService.findByUserName(user.getUsername()); |
|||
|
|||
UserSession userSession = userSessionRepository.findByUserName(user.getUsername()); |
|||
|
|||
if (userSession == null) { |
|||
// userSession = new UserSession(); |
|||
logger.error("User session is somehow null for user: " + username); |
|||
throw new InternalAuthenticationServiceException("User session not found"); |
|||
} |
|||
|
|||
int numSessions = userSession.getNumSessions(); |
|||
log.debug("Decrementing session count for user {}", user.getUsername()); |
|||
|
|||
if (--numSessions == 0) { |
|||
logger.info("Num sessions is 0 so setting user to offline"); |
|||
logger.info("Deleting token and evicting cache for user: " + chatUser.getUserName()); |
|||
userSession.setOnline(false); |
|||
userTokenService.deleteToken(chatUser.getUserName()); |
|||
TokenCacheUtil.evictSingleTokenValue(chatUser.getUserName()); |
|||
} |
|||
UserSession userSession = userService.decrementUserSession(user.getUsername()); |
|||
|
|||
userSession.setUser(chatUser); |
|||
userSession.setTimeStamp(instant); |
|||
userSession.setNumSessions(numSessions); |
|||
userSessionRepository.save(userSession); |
|||
log.trace("Username = {} with sessions = {}", userSession.getUser(), userSession.getNumSessions()); |
|||
|
|||
} |
|||
} |
Write
Preview
Loading…
Cancel
Save
Reference in new issue