adding spotless, re-importing customer.jdl and spotlessApply
This commit is contained in:
parent
2a4ee0507c
commit
2c94d6a985
@ -49,7 +49,7 @@
|
|||||||
"otherEntityField": "admissionDocumentDate"
|
"otherEntityField": "admissionDocumentDate"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"changelogDate": "20190424123258",
|
"changelogDate": "20190430150327",
|
||||||
"entityTableName": "asset",
|
"entityTableName": "asset",
|
||||||
"dto": "mapstruct",
|
"dto": "mapstruct",
|
||||||
"pagination": "infinite-scroll",
|
"pagination": "infinite-scroll",
|
||||||
|
@ -142,7 +142,7 @@
|
|||||||
"relationshipName": "sepamandate"
|
"relationshipName": "sepamandate"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"changelogDate": "20190424123255",
|
"changelogDate": "20190430150324",
|
||||||
"entityTableName": "customer",
|
"entityTableName": "customer",
|
||||||
"dto": "mapstruct",
|
"dto": "mapstruct",
|
||||||
"pagination": "infinite-scroll",
|
"pagination": "infinite-scroll",
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
"otherEntityField": "prefix"
|
"otherEntityField": "prefix"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"changelogDate": "20190424123256",
|
"changelogDate": "20190430150325",
|
||||||
"entityTableName": "membership",
|
"entityTableName": "membership",
|
||||||
"dto": "mapstruct",
|
"dto": "mapstruct",
|
||||||
"pagination": "infinite-scroll",
|
"pagination": "infinite-scroll",
|
||||||
|
@ -72,7 +72,7 @@
|
|||||||
"otherEntityField": "prefix"
|
"otherEntityField": "prefix"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"changelogDate": "20190424123259",
|
"changelogDate": "20190430150328",
|
||||||
"entityTableName": "sepa_mandate",
|
"entityTableName": "sepa_mandate",
|
||||||
"dto": "mapstruct",
|
"dto": "mapstruct",
|
||||||
"pagination": "infinite-scroll",
|
"pagination": "infinite-scroll",
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
"otherEntityField": "admissionDocumentDate"
|
"otherEntityField": "admissionDocumentDate"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"changelogDate": "20190424123257",
|
"changelogDate": "20190430150326",
|
||||||
"entityTableName": "share",
|
"entityTableName": "share",
|
||||||
"dto": "mapstruct",
|
"dto": "mapstruct",
|
||||||
"pagination": "infinite-scroll",
|
"pagination": "infinite-scroll",
|
||||||
|
15
build-spotless.gradle
Normal file
15
build-spotless.gradle
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
// apply and check standard formatting of files
|
||||||
|
|
||||||
|
apply plugin: "com.diffplug.gradle.spotless"
|
||||||
|
|
||||||
|
spotless {
|
||||||
|
// automatically format source files, see https://github.com/diffplug/spotless
|
||||||
|
java {
|
||||||
|
licenseHeader '// Licensed under Apache-2.0'
|
||||||
|
importOrderFile 'cfg/spotless/hsadminng.importorder'
|
||||||
|
eclipse().configFile 'cfg/spotless/eclipse_formatter.xml'
|
||||||
|
target 'src/main/**/*.java', 'src/test/**/*.java'
|
||||||
|
removeUnusedImports()
|
||||||
|
endWithNewline()
|
||||||
|
}
|
||||||
|
}
|
@ -13,6 +13,8 @@ buildscript {
|
|||||||
classpath "org.openapitools:openapi-generator-gradle-plugin:3.3.0"
|
classpath "org.openapitools:openapi-generator-gradle-plugin:3.3.0"
|
||||||
classpath "gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:1.5.2"
|
classpath "gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:1.5.2"
|
||||||
//jhipster-needle-gradle-buildscript-dependency - JHipster will add additional gradle build script plugins here
|
//jhipster-needle-gradle-buildscript-dependency - JHipster will add additional gradle build script plugins here
|
||||||
|
|
||||||
|
classpath "com.diffplug.spotless:spotless-plugin-gradle:3.22.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,6 +43,8 @@ apply plugin: 'com.moowork.node'
|
|||||||
apply plugin: 'io.spring.dependency-management'
|
apply plugin: 'io.spring.dependency-management'
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
|
|
||||||
|
apply from: 'build-spotless.gradle'
|
||||||
|
|
||||||
idea {
|
idea {
|
||||||
module {
|
module {
|
||||||
excludeDirs += files('node_modules')
|
excludeDirs += files('node_modules')
|
||||||
|
315
cfg/spotless/eclipse_formatter.xml
Normal file
315
cfg/spotless/eclipse_formatter.xml
Normal file
@ -0,0 +1,315 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<profiles version="13">
|
||||||
|
<profile kind="CodeFormatterProfile" name="Eclipse Formatter" 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="do not 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="49"/>
|
||||||
|
<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="82"/>
|
||||||
|
<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="128"/>
|
||||||
|
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
|
||||||
|
<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="82"/>
|
||||||
|
<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.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="82"/>
|
||||||
|
<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="48"/>
|
||||||
|
<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="48"/>
|
||||||
|
<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="48"/>
|
||||||
|
<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="1"/>
|
||||||
|
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="48"/>
|
||||||
|
<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="48"/>
|
||||||
|
<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="false"/>
|
||||||
|
<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="82"/>
|
||||||
|
<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="80"/>
|
||||||
|
<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.8"/>
|
||||||
|
<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="1.8"/>
|
||||||
|
<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="48"/>
|
||||||
|
<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="48"/>
|
||||||
|
<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="true"/>
|
||||||
|
<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="48"/>
|
||||||
|
<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="1.8"/>
|
||||||
|
<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="false"/>
|
||||||
|
<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="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.blank_lines_between_import_groups" value="1"/>
|
||||||
|
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="128"/>
|
||||||
|
<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>
|
8
cfg/spotless/hsadminng.importorder
Normal file
8
cfg/spotless/hsadminng.importorder
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
#Organize Import Order
|
||||||
|
6=javax
|
||||||
|
5=java
|
||||||
|
4=org
|
||||||
|
3=com
|
||||||
|
2=
|
||||||
|
1=org.hostsharing
|
||||||
|
0=\#
|
@ -1,6 +1,8 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng;
|
package org.hostsharing.hsadminng;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.config.DefaultProfileUtil;
|
import org.hostsharing.hsadminng.config.DefaultProfileUtil;
|
||||||
|
|
||||||
import org.springframework.boot.builder.SpringApplicationBuilder;
|
import org.springframework.boot.builder.SpringApplicationBuilder;
|
||||||
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng;
|
package org.hostsharing.hsadminng;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.config.ApplicationProperties;
|
import org.hostsharing.hsadminng.config.ApplicationProperties;
|
||||||
@ -14,12 +15,13 @@ import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
|
|||||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.core.env.Environment;
|
import org.springframework.core.env.Environment;
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
|
import javax.annotation.PostConstruct;
|
||||||
|
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@EnableConfigurationProperties({ LiquibaseProperties.class, ApplicationProperties.class })
|
@EnableConfigurationProperties({ LiquibaseProperties.class, ApplicationProperties.class })
|
||||||
public class HsadminNgApp {
|
public class HsadminNgApp {
|
||||||
@ -37,17 +39,22 @@ public class HsadminNgApp {
|
|||||||
* <p>
|
* <p>
|
||||||
* Spring profiles can be configured with a program argument --spring.profiles.active=your-active-profile
|
* Spring profiles can be configured with a program argument --spring.profiles.active=your-active-profile
|
||||||
* <p>
|
* <p>
|
||||||
* You can find more information on how profiles work with JHipster on <a href="https://www.jhipster.tech/profiles/">https://www.jhipster.tech/profiles/</a>.
|
* You can find more information on how profiles work with JHipster on
|
||||||
|
* <a href="https://www.jhipster.tech/profiles/">https://www.jhipster.tech/profiles/</a>.
|
||||||
*/
|
*/
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
public void initApplication() {
|
public void initApplication() {
|
||||||
Collection<String> activeProfiles = Arrays.asList(env.getActiveProfiles());
|
Collection<String> activeProfiles = Arrays.asList(env.getActiveProfiles());
|
||||||
if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
|
if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)
|
||||||
log.error("You have misconfigured your application! It should not run " +
|
&& activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
|
||||||
|
log.error(
|
||||||
|
"You have misconfigured your application! It should not run " +
|
||||||
"with both the 'dev' and 'prod' profiles at the same time.");
|
"with both the 'dev' and 'prod' profiles at the same time.");
|
||||||
}
|
}
|
||||||
if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT) && activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_CLOUD)) {
|
if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)
|
||||||
log.error("You have misconfigured your application! It should not " +
|
&& activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_CLOUD)) {
|
||||||
|
log.error(
|
||||||
|
"You have misconfigured your application! It should not " +
|
||||||
"run with both the 'dev' and 'cloud' profiles at the same time.");
|
"run with both the 'dev' and 'cloud' profiles at the same time.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -80,7 +87,8 @@ public class HsadminNgApp {
|
|||||||
} catch (UnknownHostException e) {
|
} catch (UnknownHostException e) {
|
||||||
log.warn("The host name could not be determined, using `localhost` as fallback");
|
log.warn("The host name could not be determined, using `localhost` as fallback");
|
||||||
}
|
}
|
||||||
log.info("\n----------------------------------------------------------\n\t" +
|
log.info(
|
||||||
|
"\n----------------------------------------------------------\n\t" +
|
||||||
"Application '{}' is running! Access URLs:\n\t" +
|
"Application '{}' is running! Access URLs:\n\t" +
|
||||||
"Local: \t\t{}://localhost:{}{}\n\t" +
|
"Local: \t\t{}://localhost:{}{}\n\t" +
|
||||||
"External: \t{}://{}:{}{}\n\t" +
|
"External: \t{}://{}:{}{}\n\t" +
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.aop.logging;
|
package org.hostsharing.hsadminng.aop.logging;
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterConstants;
|
import io.github.jhipster.config.JHipsterConstants;
|
||||||
@ -59,12 +60,20 @@ public class LoggingAspect {
|
|||||||
@AfterThrowing(pointcut = "applicationPackagePointcut() && springBeanPointcut()", throwing = "e")
|
@AfterThrowing(pointcut = "applicationPackagePointcut() && springBeanPointcut()", throwing = "e")
|
||||||
public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
|
public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
|
||||||
if (env.acceptsProfiles(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) {
|
if (env.acceptsProfiles(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) {
|
||||||
log.error("Exception in {}.{}() with cause = \'{}\' and exception = \'{}\'", joinPoint.getSignature().getDeclaringTypeName(),
|
log.error(
|
||||||
joinPoint.getSignature().getName(), e.getCause() != null? e.getCause() : "NULL", e.getMessage(), e);
|
"Exception in {}.{}() with cause = \'{}\' and exception = \'{}\'",
|
||||||
|
joinPoint.getSignature().getDeclaringTypeName(),
|
||||||
|
joinPoint.getSignature().getName(),
|
||||||
|
e.getCause() != null ? e.getCause() : "NULL",
|
||||||
|
e.getMessage(),
|
||||||
|
e);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
log.error("Exception in {}.{}() with cause = {}", joinPoint.getSignature().getDeclaringTypeName(),
|
log.error(
|
||||||
joinPoint.getSignature().getName(), e.getCause() != null? e.getCause() : "NULL");
|
"Exception in {}.{}() with cause = {}",
|
||||||
|
joinPoint.getSignature().getDeclaringTypeName(),
|
||||||
|
joinPoint.getSignature().getName(),
|
||||||
|
e.getCause() != null ? e.getCause() : "NULL");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,19 +87,28 @@ public class LoggingAspect {
|
|||||||
@Around("applicationPackagePointcut() && springBeanPointcut()")
|
@Around("applicationPackagePointcut() && springBeanPointcut()")
|
||||||
public Object logAround(ProceedingJoinPoint joinPoint) throws Throwable {
|
public Object logAround(ProceedingJoinPoint joinPoint) throws Throwable {
|
||||||
if (log.isDebugEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.debug("Enter: {}.{}() with argument[s] = {}", joinPoint.getSignature().getDeclaringTypeName(),
|
log.debug(
|
||||||
joinPoint.getSignature().getName(), Arrays.toString(joinPoint.getArgs()));
|
"Enter: {}.{}() with argument[s] = {}",
|
||||||
|
joinPoint.getSignature().getDeclaringTypeName(),
|
||||||
|
joinPoint.getSignature().getName(),
|
||||||
|
Arrays.toString(joinPoint.getArgs()));
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
Object result = joinPoint.proceed();
|
Object result = joinPoint.proceed();
|
||||||
if (log.isDebugEnabled()) {
|
if (log.isDebugEnabled()) {
|
||||||
log.debug("Exit: {}.{}() with result = {}", joinPoint.getSignature().getDeclaringTypeName(),
|
log.debug(
|
||||||
joinPoint.getSignature().getName(), result);
|
"Exit: {}.{}() with result = {}",
|
||||||
|
joinPoint.getSignature().getDeclaringTypeName(),
|
||||||
|
joinPoint.getSignature().getName(),
|
||||||
|
result);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
log.error("Illegal argument: {} in {}.{}()", Arrays.toString(joinPoint.getArgs()),
|
log.error(
|
||||||
joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName());
|
"Illegal argument: {} in {}.{}()",
|
||||||
|
Arrays.toString(joinPoint.getArgs()),
|
||||||
|
joinPoint.getSignature().getDeclaringTypeName(),
|
||||||
|
joinPoint.getSignature().getName());
|
||||||
|
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import io.github.jhipster.async.ExceptionHandlingAsyncTaskExecutor;
|
import io.github.jhipster.async.ExceptionHandlingAsyncTaskExecutor;
|
||||||
@ -10,8 +11,8 @@ import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
|
|||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.scheduling.annotation.*;
|
import org.springframework.scheduling.annotation.*;
|
||||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
|
||||||
import org.springframework.scheduling.annotation.SchedulingConfigurer;
|
import org.springframework.scheduling.annotation.SchedulingConfigurer;
|
||||||
|
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||||
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
|
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
|
||||||
|
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import java.time.Duration;
|
|
||||||
|
|
||||||
import org.ehcache.config.builders.*;
|
|
||||||
import org.ehcache.jsr107.Eh107Configuration;
|
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterProperties;
|
import io.github.jhipster.config.JHipsterProperties;
|
||||||
|
|
||||||
|
import org.ehcache.config.builders.*;
|
||||||
|
import org.ehcache.jsr107.Eh107Configuration;
|
||||||
import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
|
import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
|
||||||
import org.springframework.cache.annotation.EnableCaching;
|
import org.springframework.cache.annotation.EnableCaching;
|
||||||
import org.springframework.context.annotation.*;
|
import org.springframework.context.annotation.*;
|
||||||
|
|
||||||
|
import java.time.Duration;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableCaching
|
@EnableCaching
|
||||||
public class CacheConfiguration {
|
public class CacheConfiguration {
|
||||||
@ -18,13 +18,15 @@ public class CacheConfiguration {
|
|||||||
private final javax.cache.configuration.Configuration<Object, Object> jcacheConfiguration;
|
private final javax.cache.configuration.Configuration<Object, Object> jcacheConfiguration;
|
||||||
|
|
||||||
public CacheConfiguration(JHipsterProperties jHipsterProperties) {
|
public CacheConfiguration(JHipsterProperties jHipsterProperties) {
|
||||||
JHipsterProperties.Cache.Ehcache ehcache =
|
JHipsterProperties.Cache.Ehcache ehcache = jHipsterProperties.getCache().getEhcache();
|
||||||
jHipsterProperties.getCache().getEhcache();
|
|
||||||
|
|
||||||
jcacheConfiguration = Eh107Configuration.fromEhcacheCacheConfiguration(
|
jcacheConfiguration = Eh107Configuration.fromEhcacheCacheConfiguration(
|
||||||
CacheConfigurationBuilder.newCacheConfigurationBuilder(Object.class, Object.class,
|
CacheConfigurationBuilder.newCacheConfigurationBuilder(
|
||||||
|
Object.class,
|
||||||
|
Object.class,
|
||||||
ResourcePoolsBuilder.heap(ehcache.getMaxEntries()))
|
ResourcePoolsBuilder.heap(ehcache.getMaxEntries()))
|
||||||
.withExpiry(ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofSeconds(ehcache.getTimeToLiveSeconds())))
|
.withExpiry(
|
||||||
|
ExpiryPolicyBuilder.timeToLiveExpiration(Duration.ofSeconds(ehcache.getTimeToLiveSeconds())))
|
||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterConstants;
|
import io.github.jhipster.config.JHipsterConstants;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
import org.springframework.cloud.config.java.AbstractCloudConfig;
|
import org.springframework.cloud.config.java.AbstractCloudConfig;
|
||||||
import org.springframework.context.annotation.*;
|
import org.springframework.context.annotation.*;
|
||||||
|
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
|
||||||
|
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@Profile(JHipsterConstants.SPRING_PROFILE_CLOUD)
|
@Profile(JHipsterConstants.SPRING_PROFILE_CLOUD)
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterConstants;
|
import io.github.jhipster.config.JHipsterConstants;
|
||||||
import io.github.jhipster.config.h2.H2ConfigurationHelper;
|
import io.github.jhipster.config.h2.H2ConfigurationHelper;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Profile;
|
import org.springframework.context.annotation.Profile;
|
||||||
|
|
||||||
import org.springframework.core.env.Environment;
|
import org.springframework.core.env.Environment;
|
||||||
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
|
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
|
||||||
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
|
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterConstants;
|
import io.github.jhipster.config.JHipsterConstants;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
|
import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
|
||||||
@ -15,6 +16,7 @@ public class JacksonConfiguration {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Support for Java date and time API.
|
* Support for Java date and time API.
|
||||||
|
*
|
||||||
* @return the corresponding Jackson module.
|
* @return the corresponding Jackson module.
|
||||||
*/
|
*/
|
||||||
@Bean
|
@Bean
|
||||||
@ -27,7 +29,6 @@ public class JacksonConfiguration {
|
|||||||
return new Jdk8Module();
|
return new Jdk8Module();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Support for Hibernate types in Jackson.
|
* Support for Hibernate types in Jackson.
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import javax.sql.DataSource;
|
import io.github.jhipster.config.JHipsterConstants;
|
||||||
|
import io.github.jhipster.config.liquibase.AsyncSpringLiquibase;
|
||||||
|
import liquibase.integration.spring.SpringLiquibase;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -11,9 +14,7 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
import org.springframework.core.env.Environment;
|
import org.springframework.core.env.Environment;
|
||||||
import org.springframework.core.task.TaskExecutor;
|
import org.springframework.core.task.TaskExecutor;
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterConstants;
|
import javax.sql.DataSource;
|
||||||
import io.github.jhipster.config.liquibase.AsyncSpringLiquibase;
|
|
||||||
import liquibase.integration.spring.SpringLiquibase;
|
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class LiquibaseConfiguration {
|
public class LiquibaseConfiguration {
|
||||||
@ -22,14 +23,15 @@ public class LiquibaseConfiguration {
|
|||||||
|
|
||||||
private final Environment env;
|
private final Environment env;
|
||||||
|
|
||||||
|
|
||||||
public LiquibaseConfiguration(Environment env) {
|
public LiquibaseConfiguration(Environment env) {
|
||||||
this.env = env;
|
this.env = env;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public SpringLiquibase liquibase(@Qualifier("taskExecutor") TaskExecutor taskExecutor,
|
public SpringLiquibase liquibase(
|
||||||
DataSource dataSource, LiquibaseProperties liquibaseProperties) {
|
@Qualifier("taskExecutor") TaskExecutor taskExecutor,
|
||||||
|
DataSource dataSource,
|
||||||
|
LiquibaseProperties liquibaseProperties) {
|
||||||
|
|
||||||
// Use liquibase.integration.spring.SpringLiquibase if you don't want Liquibase to start asynchronously
|
// Use liquibase.integration.spring.SpringLiquibase if you don't want Liquibase to start asynchronously
|
||||||
SpringLiquibase liquibase = new AsyncSpringLiquibase(taskExecutor, env);
|
SpringLiquibase liquibase = new AsyncSpringLiquibase(taskExecutor, env);
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import io.github.jhipster.config.locale.AngularCookieLocaleResolver;
|
import io.github.jhipster.config.locale.AngularCookieLocaleResolver;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.aop.logging.LoggingAspect;
|
import org.hostsharing.hsadminng.aop.logging.LoggingAspect;
|
||||||
|
@ -1,10 +1,6 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.util.Iterator;
|
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterProperties;
|
|
||||||
|
|
||||||
import ch.qos.logback.classic.AsyncAppender;
|
import ch.qos.logback.classic.AsyncAppender;
|
||||||
import ch.qos.logback.classic.Level;
|
import ch.qos.logback.classic.Level;
|
||||||
import ch.qos.logback.classic.LoggerContext;
|
import ch.qos.logback.classic.LoggerContext;
|
||||||
@ -15,14 +11,19 @@ import ch.qos.logback.core.Appender;
|
|||||||
import ch.qos.logback.core.filter.EvaluatorFilter;
|
import ch.qos.logback.core.filter.EvaluatorFilter;
|
||||||
import ch.qos.logback.core.spi.ContextAwareBase;
|
import ch.qos.logback.core.spi.ContextAwareBase;
|
||||||
import ch.qos.logback.core.spi.FilterReply;
|
import ch.qos.logback.core.spi.FilterReply;
|
||||||
|
import io.github.jhipster.config.JHipsterProperties;
|
||||||
import net.logstash.logback.appender.LogstashTcpSocketAppender;
|
import net.logstash.logback.appender.LogstashTcpSocketAppender;
|
||||||
import net.logstash.logback.encoder.LogstashEncoder;
|
import net.logstash.logback.encoder.LogstashEncoder;
|
||||||
import net.logstash.logback.stacktrace.ShortenedThrowableConverter;
|
import net.logstash.logback.stacktrace.ShortenedThrowableConverter;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.util.Iterator;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class LoggingConfiguration {
|
public class LoggingConfiguration {
|
||||||
|
|
||||||
@ -40,7 +41,9 @@ public class LoggingConfiguration {
|
|||||||
|
|
||||||
private final JHipsterProperties jHipsterProperties;
|
private final JHipsterProperties jHipsterProperties;
|
||||||
|
|
||||||
public LoggingConfiguration(@Value("${spring.application.name}") String appName, @Value("${server.port}") String serverPort,
|
public LoggingConfiguration(
|
||||||
|
@Value("${spring.application.name}") String appName,
|
||||||
|
@Value("${server.port}") String serverPort,
|
||||||
JHipsterProperties jHipsterProperties) {
|
JHipsterProperties jHipsterProperties) {
|
||||||
this.appName = appName;
|
this.appName = appName;
|
||||||
this.serverPort = serverPort;
|
this.serverPort = serverPort;
|
||||||
@ -71,7 +74,10 @@ public class LoggingConfiguration {
|
|||||||
// More documentation is available at: https://github.com/logstash/logstash-logback-encoder
|
// More documentation is available at: https://github.com/logstash/logstash-logback-encoder
|
||||||
LogstashEncoder logstashEncoder = new LogstashEncoder();
|
LogstashEncoder logstashEncoder = new LogstashEncoder();
|
||||||
// Set the Logstash appender config from JHipster properties
|
// Set the Logstash appender config from JHipster properties
|
||||||
logstashAppender.addDestinations(new InetSocketAddress(jHipsterProperties.getLogging().getLogstash().getHost(), jHipsterProperties.getLogging().getLogstash().getPort()));
|
logstashAppender.addDestinations(
|
||||||
|
new InetSocketAddress(
|
||||||
|
jHipsterProperties.getLogging().getLogstash().getHost(),
|
||||||
|
jHipsterProperties.getLogging().getLogstash().getPort()));
|
||||||
|
|
||||||
ShortenedThrowableConverter throwableConverter = new ShortenedThrowableConverter();
|
ShortenedThrowableConverter throwableConverter = new ShortenedThrowableConverter();
|
||||||
throwableConverter.setRootCauseFirst(true);
|
throwableConverter.setRootCauseFirst(true);
|
||||||
|
@ -85,6 +85,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void configure(HttpSecurity http) throws Exception {
|
public void configure(HttpSecurity http) throws Exception {
|
||||||
|
// @formatter:off
|
||||||
http
|
http
|
||||||
.csrf()
|
.csrf()
|
||||||
.disable()
|
.disable()
|
||||||
@ -112,7 +113,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
|
|||||||
.antMatchers("/management/**").hasAuthority(AuthoritiesConstants.ADMIN)
|
.antMatchers("/management/**").hasAuthority(AuthoritiesConstants.ADMIN)
|
||||||
.and()
|
.and()
|
||||||
.apply(securityConfigurerAdapter());
|
.apply(securityConfigurerAdapter());
|
||||||
|
// @formatter:on
|
||||||
}
|
}
|
||||||
|
|
||||||
private JWTConfigurer securityConfigurerAdapter() {
|
private JWTConfigurer securityConfigurerAdapter() {
|
||||||
|
@ -1,13 +1,16 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config;
|
package org.hostsharing.hsadminng.config;
|
||||||
|
|
||||||
|
import static java.net.URLDecoder.decode;
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterConstants;
|
import io.github.jhipster.config.JHipsterConstants;
|
||||||
import io.github.jhipster.config.JHipsterProperties;
|
import io.github.jhipster.config.JHipsterProperties;
|
||||||
import io.github.jhipster.config.h2.H2ConfigurationHelper;
|
import io.github.jhipster.config.h2.H2ConfigurationHelper;
|
||||||
import io.github.jhipster.web.filter.CachingHttpHeadersFilter;
|
import io.github.jhipster.web.filter.CachingHttpHeadersFilter;
|
||||||
import io.undertow.UndertowOptions;
|
import io.undertow.UndertowOptions;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
|
import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
|
||||||
import org.springframework.boot.web.server.*;
|
import org.springframework.boot.web.server.*;
|
||||||
import org.springframework.boot.web.servlet.ServletContextInitializer;
|
import org.springframework.boot.web.servlet.ServletContextInitializer;
|
||||||
@ -20,14 +23,13 @@ import org.springframework.web.cors.CorsConfiguration;
|
|||||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||||
import org.springframework.web.filter.CorsFilter;
|
import org.springframework.web.filter.CorsFilter;
|
||||||
|
|
||||||
import javax.servlet.*;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
import static java.net.URLDecoder.decode;
|
import javax.servlet.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration of web application with Servlet 3.0 APIs.
|
* Configuration of web application with Servlet 3.0 APIs.
|
||||||
@ -81,8 +83,7 @@ public class WebConfigurer implements ServletContextInitializer, WebServerFactor
|
|||||||
server instanceof UndertowServletWebServerFactory) {
|
server instanceof UndertowServletWebServerFactory) {
|
||||||
|
|
||||||
((UndertowServletWebServerFactory) server)
|
((UndertowServletWebServerFactory) server)
|
||||||
.addBuilderCustomizers(builder ->
|
.addBuilderCustomizers(builder -> builder.setServerOption(UndertowOptions.ENABLE_HTTP2, true));
|
||||||
builder.setServerOption(UndertowOptions.ENABLE_HTTP2, true));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,11 +134,12 @@ public class WebConfigurer implements ServletContextInitializer, WebServerFactor
|
|||||||
/**
|
/**
|
||||||
* Initializes the caching HTTP Headers Filter.
|
* Initializes the caching HTTP Headers Filter.
|
||||||
*/
|
*/
|
||||||
private void initCachingHttpHeadersFilter(ServletContext servletContext,
|
private void initCachingHttpHeadersFilter(
|
||||||
|
ServletContext servletContext,
|
||||||
EnumSet<DispatcherType> disps) {
|
EnumSet<DispatcherType> disps) {
|
||||||
log.debug("Registering Caching HTTP Headers Filter");
|
log.debug("Registering Caching HTTP Headers Filter");
|
||||||
FilterRegistration.Dynamic cachingHttpHeadersFilter =
|
FilterRegistration.Dynamic cachingHttpHeadersFilter = servletContext.addFilter(
|
||||||
servletContext.addFilter("cachingHttpHeadersFilter",
|
"cachingHttpHeadersFilter",
|
||||||
new CachingHttpHeadersFilter(jHipsterProperties));
|
new CachingHttpHeadersFilter(jHipsterProperties));
|
||||||
|
|
||||||
cachingHttpHeadersFilter.addMappingForUrlPatterns(disps, true, "/i18n/*");
|
cachingHttpHeadersFilter.addMappingForUrlPatterns(disps, true, "/i18n/*");
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.config.audit;
|
package org.hostsharing.hsadminng.config.audit;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.PersistentAuditEvent;
|
import org.hostsharing.hsadminng.domain.PersistentAuditEvent;
|
||||||
@ -38,8 +39,11 @@ public class AuditEventConverter {
|
|||||||
if (persistentAuditEvent == null) {
|
if (persistentAuditEvent == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return new AuditEvent(persistentAuditEvent.getAuditEventDate(), persistentAuditEvent.getPrincipal(),
|
return new AuditEvent(
|
||||||
persistentAuditEvent.getAuditEventType(), convertDataToObjects(persistentAuditEvent.getData()));
|
persistentAuditEvent.getAuditEventDate(),
|
||||||
|
persistentAuditEvent.getPrincipal(),
|
||||||
|
persistentAuditEvent.getAuditEventType(),
|
||||||
|
convertDataToObjects(persistentAuditEvent.getData()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
|
||||||
import org.hibernate.envers.Audited;
|
import org.hibernate.envers.Audited;
|
||||||
import org.springframework.data.annotation.CreatedBy;
|
import org.springframework.data.annotation.CreatedBy;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
@ -10,6 +12,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
|||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
import javax.persistence.EntityListeners;
|
import javax.persistence.EntityListeners;
|
||||||
import javax.persistence.MappedSuperclass;
|
import javax.persistence.MappedSuperclass;
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.domain.enumeration.AssetAction;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import javax.persistence.*;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.AssetAction;
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Asset.
|
* A Asset.
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
import javax.persistence.Column;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
import javax.persistence.Id;
|
import javax.persistence.Id;
|
||||||
import javax.persistence.Table;
|
import javax.persistence.Table;
|
||||||
import javax.persistence.Column;
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An authority (a security role) used by Spring Security.
|
* An authority (a security role) used by Spring Security.
|
||||||
|
@ -1,20 +1,17 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
|
||||||
|
|
||||||
import javax.persistence.*;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.*;
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Customer.
|
* A Customer.
|
||||||
@ -101,6 +98,7 @@ public class Customer implements Serializable {
|
|||||||
private Set<Membership> memberships = new HashSet<>();
|
private Set<Membership> memberships = new HashSet<>();
|
||||||
@OneToMany(mappedBy = "customer")
|
@OneToMany(mappedBy = "customer")
|
||||||
private Set<SepaMandate> sepamandates = new HashSet<>();
|
private Set<SepaMandate> sepamandates = new HashSet<>();
|
||||||
|
|
||||||
// jhipster-needle-entity-add-field - JHipster will add fields here, do not remove
|
// jhipster-needle-entity-add-field - JHipster will add fields here, do not remove
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
|
@ -1,17 +1,16 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import javax.persistence.*;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Membership.
|
* A Membership.
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
import javax.persistence.*;
|
|
||||||
import javax.validation.constraints.NotNull;
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Persist AuditEvent managed by the Spring Boot actuator.
|
* Persist AuditEvent managed by the Spring Boot actuator.
|
||||||
@ -91,7 +93,8 @@ public class PersistentAuditEvent implements Serializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
PersistentAuditEvent persistentAuditEvent = (PersistentAuditEvent) o;
|
PersistentAuditEvent persistentAuditEvent = (PersistentAuditEvent) o;
|
||||||
return !(persistentAuditEvent.getId() == null || getId() == null) && Objects.equals(getId(), persistentAuditEvent.getId());
|
return !(persistentAuditEvent.getId() == null || getId() == null)
|
||||||
|
&& Objects.equals(getId(), persistentAuditEvent.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import javax.persistence.*;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A SepaMandate.
|
* A SepaMandate.
|
||||||
*/
|
*/
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.domain.enumeration.ShareAction;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
|
||||||
import javax.persistence.*;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.ShareAction;
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Share.
|
* A Share.
|
||||||
|
@ -1,22 +1,25 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain;
|
package org.hostsharing.hsadminng.domain;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.config.Constants;
|
import org.hostsharing.hsadminng.config.Constants;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.hibernate.annotations.BatchSize;
|
import org.hibernate.annotations.BatchSize;
|
||||||
import javax.validation.constraints.Email;
|
|
||||||
|
|
||||||
import javax.persistence.*;
|
|
||||||
import javax.validation.constraints.NotNull;
|
|
||||||
import javax.validation.constraints.Pattern;
|
|
||||||
import javax.validation.constraints.Size;
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.time.Instant;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.time.Instant;
|
|
||||||
|
import javax.persistence.*;
|
||||||
|
import javax.validation.constraints.Email;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import javax.validation.constraints.Pattern;
|
||||||
|
import javax.validation.constraints.Size;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A user.
|
* A user.
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain.enumeration;
|
package org.hostsharing.hsadminng.domain.enumeration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The AssetAction enumeration.
|
* The AssetAction enumeration.
|
||||||
*/
|
*/
|
||||||
public enum AssetAction {
|
public enum AssetAction {
|
||||||
PAYMENT, HANDOVER, ADOPTION, LOSS, CLEARING, PAYBACK
|
PAYMENT,
|
||||||
|
HANDOVER,
|
||||||
|
ADOPTION,
|
||||||
|
LOSS,
|
||||||
|
CLEARING,
|
||||||
|
PAYBACK
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain.enumeration;
|
package org.hostsharing.hsadminng.domain.enumeration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The CustomerKind enumeration.
|
* The CustomerKind enumeration.
|
||||||
*/
|
*/
|
||||||
public enum CustomerKind {
|
public enum CustomerKind {
|
||||||
NATURAL, LEGAL
|
NATURAL,
|
||||||
|
LEGAL
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain.enumeration;
|
package org.hostsharing.hsadminng.domain.enumeration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The ShareAction enumeration.
|
* The ShareAction enumeration.
|
||||||
*/
|
*/
|
||||||
public enum ShareAction {
|
public enum ShareAction {
|
||||||
SUBSCRIPTION, CANCELLATION
|
SUBSCRIPTION,
|
||||||
|
CANCELLATION
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.domain.enumeration;
|
package org.hostsharing.hsadminng.domain.enumeration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The VatRegion enumeration.
|
* The VatRegion enumeration.
|
||||||
*/
|
*/
|
||||||
public enum VatRegion {
|
public enum VatRegion {
|
||||||
DOMESTIC, EU, OTHER
|
DOMESTIC,
|
||||||
|
EU,
|
||||||
|
OTHER
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Asset;
|
import org.hostsharing.hsadminng.domain.Asset;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.*;
|
import org.springframework.data.jpa.repository.*;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring Data repository for the Asset entity.
|
* Spring Data repository for the Asset entity.
|
||||||
*/
|
*/
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Authority;
|
import org.hostsharing.hsadminng.domain.Authority;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.config.Constants;
|
import org.hostsharing.hsadminng.config.Constants;
|
||||||
@ -34,7 +35,8 @@ public class CustomAuditEventRepository implements AuditEventRepository {
|
|||||||
|
|
||||||
private final Logger log = LoggerFactory.getLogger(getClass());
|
private final Logger log = LoggerFactory.getLogger(getClass());
|
||||||
|
|
||||||
public CustomAuditEventRepository(PersistenceAuditEventRepository persistenceAuditEventRepository,
|
public CustomAuditEventRepository(
|
||||||
|
PersistenceAuditEventRepository persistenceAuditEventRepository,
|
||||||
AuditEventConverter auditEventConverter) {
|
AuditEventConverter auditEventConverter) {
|
||||||
|
|
||||||
this.persistenceAuditEventRepository = persistenceAuditEventRepository;
|
this.persistenceAuditEventRepository = persistenceAuditEventRepository;
|
||||||
@ -43,8 +45,8 @@ public class CustomAuditEventRepository implements AuditEventRepository {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<AuditEvent> find(String principal, Instant after, String type) {
|
public List<AuditEvent> find(String principal, Instant after, String type) {
|
||||||
Iterable<PersistentAuditEvent> persistentAuditEvents =
|
Iterable<PersistentAuditEvent> persistentAuditEvents = persistenceAuditEventRepository
|
||||||
persistenceAuditEventRepository.findByPrincipalAndAuditEventDateAfterAndAuditEventType(principal, after, type);
|
.findByPrincipalAndAuditEventDateAfterAndAuditEventType(principal, after, type);
|
||||||
return auditEventConverter.convertToAuditEvent(persistentAuditEvents);
|
return auditEventConverter.convertToAuditEvent(persistentAuditEvents);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -77,8 +79,11 @@ public class CustomAuditEventRepository implements AuditEventRepository {
|
|||||||
int length = value.length();
|
int length = value.length();
|
||||||
if (length > EVENT_DATA_COLUMN_MAX_LENGTH) {
|
if (length > EVENT_DATA_COLUMN_MAX_LENGTH) {
|
||||||
value = value.substring(0, EVENT_DATA_COLUMN_MAX_LENGTH);
|
value = value.substring(0, EVENT_DATA_COLUMN_MAX_LENGTH);
|
||||||
log.warn("Event data for {} too long ({}) has been truncated to {}. Consider increasing column width.",
|
log.warn(
|
||||||
entry.getKey(), length, EVENT_DATA_COLUMN_MAX_LENGTH);
|
"Event data for {} too long ({}) has been truncated to {}. Consider increasing column width.",
|
||||||
|
entry.getKey(),
|
||||||
|
length,
|
||||||
|
EVENT_DATA_COLUMN_MAX_LENGTH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
results.put(entry.getKey(), value);
|
results.put(entry.getKey(), value);
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Customer;
|
import org.hostsharing.hsadminng.domain.Customer;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.*;
|
import org.springframework.data.jpa.repository.*;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring Data repository for the Customer entity.
|
* Spring Data repository for the Customer entity.
|
||||||
*/
|
*/
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Membership;
|
import org.hostsharing.hsadminng.domain.Membership;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.*;
|
import org.springframework.data.jpa.repository.*;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring Data repository for the Membership entity.
|
* Spring Data repository for the Membership entity.
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.PersistentAuditEvent;
|
import org.hostsharing.hsadminng.domain.PersistentAuditEvent;
|
||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
@ -19,7 +21,10 @@ public interface PersistenceAuditEventRepository extends JpaRepository<Persisten
|
|||||||
|
|
||||||
List<PersistentAuditEvent> findByPrincipalAndAuditEventDateAfter(String principal, Instant after);
|
List<PersistentAuditEvent> findByPrincipalAndAuditEventDateAfter(String principal, Instant after);
|
||||||
|
|
||||||
List<PersistentAuditEvent> findByPrincipalAndAuditEventDateAfterAndAuditEventType(String principal, Instant after, String type);
|
List<PersistentAuditEvent> findByPrincipalAndAuditEventDateAfterAndAuditEventType(
|
||||||
|
String principal,
|
||||||
|
Instant after,
|
||||||
|
String type);
|
||||||
|
|
||||||
Page<PersistentAuditEvent> findAllByAuditEventDateBetween(Instant fromDate, Instant toDate, Pageable pageable);
|
Page<PersistentAuditEvent> findAllByAuditEventDateBetween(Instant fromDate, Instant toDate, Pageable pageable);
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.SepaMandate;
|
import org.hostsharing.hsadminng.domain.SepaMandate;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.*;
|
import org.springframework.data.jpa.repository.*;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring Data repository for the SepaMandate entity.
|
* Spring Data repository for the SepaMandate entity.
|
||||||
*/
|
*/
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Share;
|
import org.hostsharing.hsadminng.domain.Share;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.*;
|
import org.springframework.data.jpa.repository.*;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring Data repository for the Share entity.
|
* Spring Data repository for the Share entity.
|
||||||
*/
|
*/
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.repository;
|
package org.hostsharing.hsadminng.repository;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.User;
|
import org.hostsharing.hsadminng.domain.User;
|
||||||
@ -8,9 +9,10 @@ import org.springframework.data.domain.Pageable;
|
|||||||
import org.springframework.data.jpa.repository.EntityGraph;
|
import org.springframework.data.jpa.repository.EntityGraph;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import java.time.Instant;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.time.Instant;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spring Data JPA repository for the User entity.
|
* Spring Data JPA repository for the User entity.
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.security;
|
package org.hostsharing.hsadminng.security;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.security;
|
package org.hostsharing.hsadminng.security;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.User;
|
import org.hostsharing.hsadminng.domain.User;
|
||||||
import org.hostsharing.hsadminng.repository.UserRepository;
|
import org.hostsharing.hsadminng.repository.UserRepository;
|
||||||
|
|
||||||
import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
|
import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -38,7 +40,8 @@ public class DomainUserDetailsService implements UserDetailsService {
|
|||||||
if (new EmailValidator().isValid(login, null)) {
|
if (new EmailValidator().isValid(login, null)) {
|
||||||
return userRepository.findOneWithAuthoritiesByEmail(login)
|
return userRepository.findOneWithAuthoritiesByEmail(login)
|
||||||
.map(user -> createSpringSecurityUser(login, user))
|
.map(user -> createSpringSecurityUser(login, user))
|
||||||
.orElseThrow(() -> new UsernameNotFoundException("User with email " + login + " was not found in the database"));
|
.orElseThrow(
|
||||||
|
() -> new UsernameNotFoundException("User with email " + login + " was not found in the database"));
|
||||||
}
|
}
|
||||||
|
|
||||||
String lowercaseLogin = login.toLowerCase(Locale.ENGLISH);
|
String lowercaseLogin = login.toLowerCase(Locale.ENGLISH);
|
||||||
@ -52,10 +55,12 @@ public class DomainUserDetailsService implements UserDetailsService {
|
|||||||
if (!user.getActivated()) {
|
if (!user.getActivated()) {
|
||||||
throw new UserNotActivatedException("User " + lowercaseLogin + " was not activated");
|
throw new UserNotActivatedException("User " + lowercaseLogin + " was not activated");
|
||||||
}
|
}
|
||||||
List<GrantedAuthority> grantedAuthorities = user.getAuthorities().stream()
|
List<GrantedAuthority> grantedAuthorities = user.getAuthorities()
|
||||||
|
.stream()
|
||||||
.map(authority -> new SimpleGrantedAuthority(authority.getName()))
|
.map(authority -> new SimpleGrantedAuthority(authority.getName()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
return new org.springframework.security.core.userdetails.User(user.getLogin(),
|
return new org.springframework.security.core.userdetails.User(
|
||||||
|
user.getLogin(),
|
||||||
user.getPassword(),
|
user.getPassword(),
|
||||||
grantedAuthorities);
|
grantedAuthorities);
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.security;
|
package org.hostsharing.hsadminng.security;
|
||||||
|
|
||||||
import org.springframework.security.core.context.SecurityContext;
|
import org.springframework.security.core.context.SecurityContext;
|
||||||
@ -53,8 +54,12 @@ public final class SecurityUtils {
|
|||||||
public static boolean isAuthenticated() {
|
public static boolean isAuthenticated() {
|
||||||
SecurityContext securityContext = SecurityContextHolder.getContext();
|
SecurityContext securityContext = SecurityContextHolder.getContext();
|
||||||
return Optional.ofNullable(securityContext.getAuthentication())
|
return Optional.ofNullable(securityContext.getAuthentication())
|
||||||
.map(authentication -> authentication.getAuthorities().stream()
|
.map(
|
||||||
.noneMatch(grantedAuthority -> grantedAuthority.getAuthority().equals(AuthoritiesConstants.ANONYMOUS)))
|
authentication -> authentication.getAuthorities()
|
||||||
|
.stream()
|
||||||
|
.noneMatch(
|
||||||
|
grantedAuthority -> grantedAuthority.getAuthority()
|
||||||
|
.equals(AuthoritiesConstants.ANONYMOUS)))
|
||||||
.orElse(false);
|
.orElse(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -69,7 +74,9 @@ public final class SecurityUtils {
|
|||||||
public static boolean isCurrentUserInRole(String authority) {
|
public static boolean isCurrentUserInRole(String authority) {
|
||||||
SecurityContext securityContext = SecurityContextHolder.getContext();
|
SecurityContext securityContext = SecurityContextHolder.getContext();
|
||||||
return Optional.ofNullable(securityContext.getAuthentication())
|
return Optional.ofNullable(securityContext.getAuthentication())
|
||||||
.map(authentication -> authentication.getAuthorities().stream()
|
.map(
|
||||||
|
authentication -> authentication.getAuthorities()
|
||||||
|
.stream()
|
||||||
.anyMatch(grantedAuthority -> grantedAuthority.getAuthority().equals(authority)))
|
.anyMatch(grantedAuthority -> grantedAuthority.getAuthority().equals(authority)))
|
||||||
.orElse(false);
|
.orElse(false);
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.security;
|
package org.hostsharing.hsadminng.security;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.config.Constants;
|
import org.hostsharing.hsadminng.config.Constants;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import org.springframework.data.domain.AuditorAware;
|
import org.springframework.data.domain.AuditorAware;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implementation of AuditorAware based on Spring Security.
|
* Implementation of AuditorAware based on Spring Security.
|
||||||
*/
|
*/
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.security;
|
package org.hostsharing.hsadminng.security;
|
||||||
|
|
||||||
import org.springframework.security.core.AuthenticationException;
|
import org.springframework.security.core.AuthenticationException;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.security.jwt;
|
package org.hostsharing.hsadminng.security.jwt;
|
||||||
|
|
||||||
import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
|
import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.security.jwt;
|
package org.hostsharing.hsadminng.security.jwt;
|
||||||
|
|
||||||
import org.springframework.security.core.Authentication;
|
import org.springframework.security.core.Authentication;
|
||||||
@ -5,12 +6,13 @@ import org.springframework.security.core.context.SecurityContextHolder;
|
|||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
import org.springframework.web.filter.GenericFilterBean;
|
import org.springframework.web.filter.GenericFilterBean;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import javax.servlet.FilterChain;
|
import javax.servlet.FilterChain;
|
||||||
import javax.servlet.ServletException;
|
import javax.servlet.ServletException;
|
||||||
import javax.servlet.ServletRequest;
|
import javax.servlet.ServletRequest;
|
||||||
import javax.servlet.ServletResponse;
|
import javax.servlet.ServletResponse;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Filters incoming requests and installs a Spring Security principal if a header corresponding to a valid user is
|
* Filters incoming requests and installs a Spring Security principal if a header corresponding to a valid user is
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.security.jwt;
|
package org.hostsharing.hsadminng.security.jwt;
|
||||||
|
|
||||||
import java.nio.charset.StandardCharsets;
|
import io.github.jhipster.config.JHipsterProperties;
|
||||||
import java.security.Key;
|
import io.jsonwebtoken.*;
|
||||||
import java.util.*;
|
import io.jsonwebtoken.io.Decoders;
|
||||||
import java.util.stream.Collectors;
|
import io.jsonwebtoken.security.Keys;
|
||||||
import javax.annotation.PostConstruct;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -16,10 +16,12 @@ import org.springframework.security.core.userdetails.User;
|
|||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterProperties;
|
import java.nio.charset.StandardCharsets;
|
||||||
import io.jsonwebtoken.*;
|
import java.security.Key;
|
||||||
import io.jsonwebtoken.io.Decoders;
|
import java.util.*;
|
||||||
import io.jsonwebtoken.security.Keys;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import javax.annotation.PostConstruct;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class TokenProvider {
|
public class TokenProvider {
|
||||||
@ -45,7 +47,8 @@ public class TokenProvider {
|
|||||||
byte[] keyBytes;
|
byte[] keyBytes;
|
||||||
String secret = jHipsterProperties.getSecurity().getAuthentication().getJwt().getSecret();
|
String secret = jHipsterProperties.getSecurity().getAuthentication().getJwt().getSecret();
|
||||||
if (!StringUtils.isEmpty(secret)) {
|
if (!StringUtils.isEmpty(secret)) {
|
||||||
log.warn("Warning: the JWT key used is not Base64-encoded. " +
|
log.warn(
|
||||||
|
"Warning: the JWT key used is not Base64-encoded. " +
|
||||||
"We recommend using the `jhipster.security.authentication.jwt.base64-secret` key for optimum security.");
|
"We recommend using the `jhipster.security.authentication.jwt.base64-secret` key for optimum security.");
|
||||||
keyBytes = secret.getBytes(StandardCharsets.UTF_8);
|
keyBytes = secret.getBytes(StandardCharsets.UTF_8);
|
||||||
} else {
|
} else {
|
||||||
@ -53,15 +56,17 @@ public class TokenProvider {
|
|||||||
keyBytes = Decoders.BASE64.decode(jHipsterProperties.getSecurity().getAuthentication().getJwt().getBase64Secret());
|
keyBytes = Decoders.BASE64.decode(jHipsterProperties.getSecurity().getAuthentication().getJwt().getBase64Secret());
|
||||||
}
|
}
|
||||||
this.key = Keys.hmacShaKeyFor(keyBytes);
|
this.key = Keys.hmacShaKeyFor(keyBytes);
|
||||||
this.tokenValidityInMilliseconds =
|
this.tokenValidityInMilliseconds = 1000
|
||||||
1000 * jHipsterProperties.getSecurity().getAuthentication().getJwt().getTokenValidityInSeconds();
|
* jHipsterProperties.getSecurity().getAuthentication().getJwt().getTokenValidityInSeconds();
|
||||||
this.tokenValidityInMillisecondsForRememberMe =
|
this.tokenValidityInMillisecondsForRememberMe = 1000 * jHipsterProperties.getSecurity()
|
||||||
1000 * jHipsterProperties.getSecurity().getAuthentication().getJwt()
|
.getAuthentication()
|
||||||
|
.getJwt()
|
||||||
.getTokenValidityInSecondsForRememberMe();
|
.getTokenValidityInSecondsForRememberMe();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String createToken(Authentication authentication, boolean rememberMe) {
|
public String createToken(Authentication authentication, boolean rememberMe) {
|
||||||
String authorities = authentication.getAuthorities().stream()
|
String authorities = authentication.getAuthorities()
|
||||||
|
.stream()
|
||||||
.map(GrantedAuthority::getAuthority)
|
.map(GrantedAuthority::getAuthority)
|
||||||
.collect(Collectors.joining(","));
|
.collect(Collectors.joining(","));
|
||||||
|
|
||||||
@ -87,8 +92,7 @@ public class TokenProvider {
|
|||||||
.parseClaimsJws(token)
|
.parseClaimsJws(token)
|
||||||
.getBody();
|
.getBody();
|
||||||
|
|
||||||
Collection<? extends GrantedAuthority> authorities =
|
Collection<? extends GrantedAuthority> authorities = Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
|
||||||
Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
|
|
||||||
.map(SimpleGrantedAuthority::new)
|
.map(SimpleGrantedAuthority::new)
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import java.util.List;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
import org.hostsharing.hsadminng.domain.Asset;
|
||||||
|
import org.hostsharing.hsadminng.repository.AssetRepository;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.AssetCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.AssetDTO;
|
||||||
|
import org.hostsharing.hsadminng.service.mapper.AssetMapper;
|
||||||
|
|
||||||
import javax.persistence.criteria.JoinType;
|
import io.github.jhipster.service.QueryService;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -12,14 +18,9 @@ import org.springframework.data.jpa.domain.Specification;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import io.github.jhipster.service.QueryService;
|
import java.util.List;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Asset;
|
import javax.persistence.criteria.JoinType;
|
||||||
import org.hostsharing.hsadminng.domain.*; // for static metamodels
|
|
||||||
import org.hostsharing.hsadminng.repository.AssetRepository;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.AssetCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.AssetDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.mapper.AssetMapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service for executing complex queries for Asset entities in the database.
|
* Service for executing complex queries for Asset entities in the database.
|
||||||
@ -44,6 +45,7 @@ public class AssetQueryService extends QueryService<Asset> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link List} of {@link AssetDTO} which matches the criteria from the database
|
* Return a {@link List} of {@link AssetDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
*/
|
*/
|
||||||
@ -56,6 +58,7 @@ public class AssetQueryService extends QueryService<Asset> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link Page} of {@link AssetDTO} which matches the criteria from the database
|
* Return a {@link Page} of {@link AssetDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @param page The page, which should be returned.
|
* @param page The page, which should be returned.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
@ -70,6 +73,7 @@ public class AssetQueryService extends QueryService<Asset> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the number of matching entities in the database
|
* Return the number of matching entities in the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the number of matching entities.
|
* @return the number of matching entities.
|
||||||
*/
|
*/
|
||||||
@ -105,7 +109,9 @@ public class AssetQueryService extends QueryService<Asset> {
|
|||||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), Asset_.remark));
|
specification = specification.and(buildStringSpecification(criteria.getRemark(), Asset_.remark));
|
||||||
}
|
}
|
||||||
if (criteria.getMembershipId() != null) {
|
if (criteria.getMembershipId() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getMembershipId(),
|
specification = specification.and(
|
||||||
|
buildSpecification(
|
||||||
|
criteria.getMembershipId(),
|
||||||
root -> root.join(Asset_.membership, JoinType.LEFT).get(Membership_.id)));
|
root -> root.join(Asset_.membership, JoinType.LEFT).get(Membership_.id)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Asset;
|
import org.hostsharing.hsadminng.domain.Asset;
|
||||||
import org.hostsharing.hsadminng.repository.AssetRepository;
|
import org.hostsharing.hsadminng.repository.AssetRepository;
|
||||||
import org.hostsharing.hsadminng.service.dto.AssetDTO;
|
import org.hostsharing.hsadminng.service.dto.AssetDTO;
|
||||||
import org.hostsharing.hsadminng.service.mapper.AssetMapper;
|
import org.hostsharing.hsadminng.service.mapper.AssetMapper;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -58,7 +59,6 @@ public class AssetService {
|
|||||||
.map(assetMapper::toDto);
|
.map(assetMapper::toDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get one asset by id.
|
* Get one asset by id.
|
||||||
*
|
*
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.config.audit.AuditEventConverter;
|
import org.hostsharing.hsadminng.config.audit.AuditEventConverter;
|
||||||
import org.hostsharing.hsadminng.repository.PersistenceAuditEventRepository;
|
import org.hostsharing.hsadminng.repository.PersistenceAuditEventRepository;
|
||||||
|
|
||||||
import org.springframework.boot.actuate.audit.AuditEvent;
|
import org.springframework.boot.actuate.audit.AuditEvent;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import java.util.List;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
import org.hostsharing.hsadminng.domain.Customer;
|
||||||
|
import org.hostsharing.hsadminng.repository.CustomerRepository;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.CustomerCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.CustomerDTO;
|
||||||
|
import org.hostsharing.hsadminng.service.mapper.CustomerMapper;
|
||||||
|
|
||||||
import javax.persistence.criteria.JoinType;
|
import io.github.jhipster.service.QueryService;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -12,14 +18,9 @@ import org.springframework.data.jpa.domain.Specification;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import io.github.jhipster.service.QueryService;
|
import java.util.List;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Customer;
|
import javax.persistence.criteria.JoinType;
|
||||||
import org.hostsharing.hsadminng.domain.*; // for static metamodels
|
|
||||||
import org.hostsharing.hsadminng.repository.CustomerRepository;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.CustomerCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.CustomerDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.mapper.CustomerMapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service for executing complex queries for Customer entities in the database.
|
* Service for executing complex queries for Customer entities in the database.
|
||||||
@ -44,6 +45,7 @@ public class CustomerQueryService extends QueryService<Customer> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link List} of {@link CustomerDTO} which matches the criteria from the database
|
* Return a {@link List} of {@link CustomerDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
*/
|
*/
|
||||||
@ -56,6 +58,7 @@ public class CustomerQueryService extends QueryService<Customer> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link Page} of {@link CustomerDTO} which matches the criteria from the database
|
* Return a {@link Page} of {@link CustomerDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @param page The page, which should be returned.
|
* @param page The page, which should be returned.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
@ -70,6 +73,7 @@ public class CustomerQueryService extends QueryService<Customer> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the number of matching entities in the database
|
* Return the number of matching entities in the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the number of matching entities.
|
* @return the number of matching entities.
|
||||||
*/
|
*/
|
||||||
@ -108,10 +112,12 @@ public class CustomerQueryService extends QueryService<Customer> {
|
|||||||
specification = specification.and(buildStringSpecification(criteria.getBirthPlace(), Customer_.birthPlace));
|
specification = specification.and(buildStringSpecification(criteria.getBirthPlace(), Customer_.birthPlace));
|
||||||
}
|
}
|
||||||
if (criteria.getRegistrationCourt() != null) {
|
if (criteria.getRegistrationCourt() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getRegistrationCourt(), Customer_.registrationCourt));
|
specification = specification
|
||||||
|
.and(buildStringSpecification(criteria.getRegistrationCourt(), Customer_.registrationCourt));
|
||||||
}
|
}
|
||||||
if (criteria.getRegistrationNumber() != null) {
|
if (criteria.getRegistrationNumber() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getRegistrationNumber(), Customer_.registrationNumber));
|
specification = specification
|
||||||
|
.and(buildStringSpecification(criteria.getRegistrationNumber(), Customer_.registrationNumber));
|
||||||
}
|
}
|
||||||
if (criteria.getVatRegion() != null) {
|
if (criteria.getVatRegion() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getVatRegion(), Customer_.vatRegion));
|
specification = specification.and(buildSpecification(criteria.getVatRegion(), Customer_.vatRegion));
|
||||||
@ -120,26 +126,34 @@ public class CustomerQueryService extends QueryService<Customer> {
|
|||||||
specification = specification.and(buildStringSpecification(criteria.getVatNumber(), Customer_.vatNumber));
|
specification = specification.and(buildStringSpecification(criteria.getVatNumber(), Customer_.vatNumber));
|
||||||
}
|
}
|
||||||
if (criteria.getContractualSalutation() != null) {
|
if (criteria.getContractualSalutation() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getContractualSalutation(), Customer_.contractualSalutation));
|
specification = specification
|
||||||
|
.and(buildStringSpecification(criteria.getContractualSalutation(), Customer_.contractualSalutation));
|
||||||
}
|
}
|
||||||
if (criteria.getContractualAddress() != null) {
|
if (criteria.getContractualAddress() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getContractualAddress(), Customer_.contractualAddress));
|
specification = specification
|
||||||
|
.and(buildStringSpecification(criteria.getContractualAddress(), Customer_.contractualAddress));
|
||||||
}
|
}
|
||||||
if (criteria.getBillingSalutation() != null) {
|
if (criteria.getBillingSalutation() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getBillingSalutation(), Customer_.billingSalutation));
|
specification = specification
|
||||||
|
.and(buildStringSpecification(criteria.getBillingSalutation(), Customer_.billingSalutation));
|
||||||
}
|
}
|
||||||
if (criteria.getBillingAddress() != null) {
|
if (criteria.getBillingAddress() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getBillingAddress(), Customer_.billingAddress));
|
specification = specification
|
||||||
|
.and(buildStringSpecification(criteria.getBillingAddress(), Customer_.billingAddress));
|
||||||
}
|
}
|
||||||
if (criteria.getRemark() != null) {
|
if (criteria.getRemark() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), Customer_.remark));
|
specification = specification.and(buildStringSpecification(criteria.getRemark(), Customer_.remark));
|
||||||
}
|
}
|
||||||
if (criteria.getMembershipId() != null) {
|
if (criteria.getMembershipId() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getMembershipId(),
|
specification = specification.and(
|
||||||
|
buildSpecification(
|
||||||
|
criteria.getMembershipId(),
|
||||||
root -> root.join(Customer_.memberships, JoinType.LEFT).get(Membership_.id)));
|
root -> root.join(Customer_.memberships, JoinType.LEFT).get(Membership_.id)));
|
||||||
}
|
}
|
||||||
if (criteria.getSepamandateId() != null) {
|
if (criteria.getSepamandateId() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getSepamandateId(),
|
specification = specification.and(
|
||||||
|
buildSpecification(
|
||||||
|
criteria.getSepamandateId(),
|
||||||
root -> root.join(Customer_.sepamandates, JoinType.LEFT).get(SepaMandate_.id)));
|
root -> root.join(Customer_.sepamandates, JoinType.LEFT).get(SepaMandate_.id)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Customer;
|
import org.hostsharing.hsadminng.domain.Customer;
|
||||||
import org.hostsharing.hsadminng.repository.CustomerRepository;
|
import org.hostsharing.hsadminng.repository.CustomerRepository;
|
||||||
import org.hostsharing.hsadminng.service.dto.CustomerDTO;
|
import org.hostsharing.hsadminng.service.dto.CustomerDTO;
|
||||||
import org.hostsharing.hsadminng.service.mapper.CustomerMapper;
|
import org.hostsharing.hsadminng.service.mapper.CustomerMapper;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -58,7 +59,6 @@ public class CustomerService {
|
|||||||
.map(customerMapper::toDto);
|
.map(customerMapper::toDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get one customer by id.
|
* Get one customer by id.
|
||||||
*
|
*
|
||||||
|
@ -1,13 +1,10 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.User;
|
import org.hostsharing.hsadminng.domain.User;
|
||||||
|
|
||||||
import io.github.jhipster.config.JHipsterProperties;
|
import io.github.jhipster.config.JHipsterProperties;
|
||||||
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.util.Locale;
|
|
||||||
import javax.mail.internet.MimeMessage;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.context.MessageSource;
|
import org.springframework.context.MessageSource;
|
||||||
@ -18,6 +15,11 @@ import org.springframework.stereotype.Service;
|
|||||||
import org.thymeleaf.context.Context;
|
import org.thymeleaf.context.Context;
|
||||||
import org.thymeleaf.spring5.SpringTemplateEngine;
|
import org.thymeleaf.spring5.SpringTemplateEngine;
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
import javax.mail.internet.MimeMessage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service for sending emails.
|
* Service for sending emails.
|
||||||
* <p>
|
* <p>
|
||||||
@ -40,8 +42,11 @@ public class MailService {
|
|||||||
|
|
||||||
private final SpringTemplateEngine templateEngine;
|
private final SpringTemplateEngine templateEngine;
|
||||||
|
|
||||||
public MailService(JHipsterProperties jHipsterProperties, JavaMailSender javaMailSender,
|
public MailService(
|
||||||
MessageSource messageSource, SpringTemplateEngine templateEngine) {
|
JHipsterProperties jHipsterProperties,
|
||||||
|
JavaMailSender javaMailSender,
|
||||||
|
MessageSource messageSource,
|
||||||
|
SpringTemplateEngine templateEngine) {
|
||||||
|
|
||||||
this.jHipsterProperties = jHipsterProperties;
|
this.jHipsterProperties = jHipsterProperties;
|
||||||
this.javaMailSender = javaMailSender;
|
this.javaMailSender = javaMailSender;
|
||||||
@ -51,8 +56,13 @@ public class MailService {
|
|||||||
|
|
||||||
@Async
|
@Async
|
||||||
public void sendEmail(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
|
public void sendEmail(String to, String subject, String content, boolean isMultipart, boolean isHtml) {
|
||||||
log.debug("Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}",
|
log.debug(
|
||||||
isMultipart, isHtml, to, subject, content);
|
"Send email[multipart '{}' and html '{}'] to '{}' with subject '{}' and content={}",
|
||||||
|
isMultipart,
|
||||||
|
isHtml,
|
||||||
|
to,
|
||||||
|
subject,
|
||||||
|
content);
|
||||||
|
|
||||||
// Prepare message using a Spring helper
|
// Prepare message using a Spring helper
|
||||||
MimeMessage mimeMessage = javaMailSender.createMimeMessage();
|
MimeMessage mimeMessage = javaMailSender.createMimeMessage();
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import java.util.List;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
import org.hostsharing.hsadminng.domain.Membership;
|
||||||
|
import org.hostsharing.hsadminng.repository.MembershipRepository;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.MembershipCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.MembershipDTO;
|
||||||
|
import org.hostsharing.hsadminng.service.mapper.MembershipMapper;
|
||||||
|
|
||||||
import javax.persistence.criteria.JoinType;
|
import io.github.jhipster.service.QueryService;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -12,14 +18,9 @@ import org.springframework.data.jpa.domain.Specification;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import io.github.jhipster.service.QueryService;
|
import java.util.List;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Membership;
|
import javax.persistence.criteria.JoinType;
|
||||||
import org.hostsharing.hsadminng.domain.*; // for static metamodels
|
|
||||||
import org.hostsharing.hsadminng.repository.MembershipRepository;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.MembershipCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.MembershipDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.mapper.MembershipMapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service for executing complex queries for Membership entities in the database.
|
* Service for executing complex queries for Membership entities in the database.
|
||||||
@ -44,6 +45,7 @@ public class MembershipQueryService extends QueryService<Membership> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link List} of {@link MembershipDTO} which matches the criteria from the database
|
* Return a {@link List} of {@link MembershipDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
*/
|
*/
|
||||||
@ -56,6 +58,7 @@ public class MembershipQueryService extends QueryService<Membership> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link Page} of {@link MembershipDTO} which matches the criteria from the database
|
* Return a {@link Page} of {@link MembershipDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @param page The page, which should be returned.
|
* @param page The page, which should be returned.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
@ -70,6 +73,7 @@ public class MembershipQueryService extends QueryService<Membership> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the number of matching entities in the database
|
* Return the number of matching entities in the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the number of matching entities.
|
* @return the number of matching entities.
|
||||||
*/
|
*/
|
||||||
@ -90,30 +94,40 @@ public class MembershipQueryService extends QueryService<Membership> {
|
|||||||
specification = specification.and(buildSpecification(criteria.getId(), Membership_.id));
|
specification = specification.and(buildSpecification(criteria.getId(), Membership_.id));
|
||||||
}
|
}
|
||||||
if (criteria.getAdmissionDocumentDate() != null) {
|
if (criteria.getAdmissionDocumentDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getAdmissionDocumentDate(), Membership_.admissionDocumentDate));
|
specification = specification
|
||||||
|
.and(buildRangeSpecification(criteria.getAdmissionDocumentDate(), Membership_.admissionDocumentDate));
|
||||||
}
|
}
|
||||||
if (criteria.getCancellationDocumentDate() != null) {
|
if (criteria.getCancellationDocumentDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getCancellationDocumentDate(), Membership_.cancellationDocumentDate));
|
specification = specification.and(
|
||||||
|
buildRangeSpecification(criteria.getCancellationDocumentDate(), Membership_.cancellationDocumentDate));
|
||||||
}
|
}
|
||||||
if (criteria.getMemberFromDate() != null) {
|
if (criteria.getMemberFromDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getMemberFromDate(), Membership_.memberFromDate));
|
specification = specification
|
||||||
|
.and(buildRangeSpecification(criteria.getMemberFromDate(), Membership_.memberFromDate));
|
||||||
}
|
}
|
||||||
if (criteria.getMemberUntilDate() != null) {
|
if (criteria.getMemberUntilDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getMemberUntilDate(), Membership_.memberUntilDate));
|
specification = specification
|
||||||
|
.and(buildRangeSpecification(criteria.getMemberUntilDate(), Membership_.memberUntilDate));
|
||||||
}
|
}
|
||||||
if (criteria.getRemark() != null) {
|
if (criteria.getRemark() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), Membership_.remark));
|
specification = specification.and(buildStringSpecification(criteria.getRemark(), Membership_.remark));
|
||||||
}
|
}
|
||||||
if (criteria.getShareId() != null) {
|
if (criteria.getShareId() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getShareId(),
|
specification = specification.and(
|
||||||
|
buildSpecification(
|
||||||
|
criteria.getShareId(),
|
||||||
root -> root.join(Membership_.shares, JoinType.LEFT).get(Share_.id)));
|
root -> root.join(Membership_.shares, JoinType.LEFT).get(Share_.id)));
|
||||||
}
|
}
|
||||||
if (criteria.getAssetId() != null) {
|
if (criteria.getAssetId() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getAssetId(),
|
specification = specification.and(
|
||||||
|
buildSpecification(
|
||||||
|
criteria.getAssetId(),
|
||||||
root -> root.join(Membership_.assets, JoinType.LEFT).get(Asset_.id)));
|
root -> root.join(Membership_.assets, JoinType.LEFT).get(Asset_.id)));
|
||||||
}
|
}
|
||||||
if (criteria.getCustomerId() != null) {
|
if (criteria.getCustomerId() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getCustomerId(),
|
specification = specification.and(
|
||||||
|
buildSpecification(
|
||||||
|
criteria.getCustomerId(),
|
||||||
root -> root.join(Membership_.customer, JoinType.LEFT).get(Customer_.id)));
|
root -> root.join(Membership_.customer, JoinType.LEFT).get(Customer_.id)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Membership;
|
import org.hostsharing.hsadminng.domain.Membership;
|
||||||
import org.hostsharing.hsadminng.repository.MembershipRepository;
|
import org.hostsharing.hsadminng.repository.MembershipRepository;
|
||||||
import org.hostsharing.hsadminng.service.dto.MembershipDTO;
|
import org.hostsharing.hsadminng.service.dto.MembershipDTO;
|
||||||
import org.hostsharing.hsadminng.service.mapper.MembershipMapper;
|
import org.hostsharing.hsadminng.service.mapper.MembershipMapper;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -58,7 +59,6 @@ public class MembershipService {
|
|||||||
.map(membershipMapper::toDto);
|
.map(membershipMapper::toDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get one membership by id.
|
* Get one membership by id.
|
||||||
*
|
*
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import java.util.List;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
import org.hostsharing.hsadminng.domain.SepaMandate;
|
||||||
|
import org.hostsharing.hsadminng.repository.SepaMandateRepository;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.SepaMandateCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.SepaMandateDTO;
|
||||||
|
import org.hostsharing.hsadminng.service.mapper.SepaMandateMapper;
|
||||||
|
|
||||||
import javax.persistence.criteria.JoinType;
|
import io.github.jhipster.service.QueryService;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -12,14 +18,9 @@ import org.springframework.data.jpa.domain.Specification;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import io.github.jhipster.service.QueryService;
|
import java.util.List;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.SepaMandate;
|
import javax.persistence.criteria.JoinType;
|
||||||
import org.hostsharing.hsadminng.domain.*; // for static metamodels
|
|
||||||
import org.hostsharing.hsadminng.repository.SepaMandateRepository;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.SepaMandateCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.SepaMandateDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.mapper.SepaMandateMapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service for executing complex queries for SepaMandate entities in the database.
|
* Service for executing complex queries for SepaMandate entities in the database.
|
||||||
@ -44,6 +45,7 @@ public class SepaMandateQueryService extends QueryService<SepaMandate> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link List} of {@link SepaMandateDTO} which matches the criteria from the database
|
* Return a {@link List} of {@link SepaMandateDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
*/
|
*/
|
||||||
@ -56,6 +58,7 @@ public class SepaMandateQueryService extends QueryService<SepaMandate> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link Page} of {@link SepaMandateDTO} which matches the criteria from the database
|
* Return a {@link Page} of {@link SepaMandateDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @param page The page, which should be returned.
|
* @param page The page, which should be returned.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
@ -70,6 +73,7 @@ public class SepaMandateQueryService extends QueryService<SepaMandate> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the number of matching entities in the database
|
* Return the number of matching entities in the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the number of matching entities.
|
* @return the number of matching entities.
|
||||||
*/
|
*/
|
||||||
@ -99,25 +103,32 @@ public class SepaMandateQueryService extends QueryService<SepaMandate> {
|
|||||||
specification = specification.and(buildStringSpecification(criteria.getBic(), SepaMandate_.bic));
|
specification = specification.and(buildStringSpecification(criteria.getBic(), SepaMandate_.bic));
|
||||||
}
|
}
|
||||||
if (criteria.getGrantingDocumentDate() != null) {
|
if (criteria.getGrantingDocumentDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getGrantingDocumentDate(), SepaMandate_.grantingDocumentDate));
|
specification = specification
|
||||||
|
.and(buildRangeSpecification(criteria.getGrantingDocumentDate(), SepaMandate_.grantingDocumentDate));
|
||||||
}
|
}
|
||||||
if (criteria.getRevokationDocumentDate() != null) {
|
if (criteria.getRevokationDocumentDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getRevokationDocumentDate(), SepaMandate_.revokationDocumentDate));
|
specification = specification.and(
|
||||||
|
buildRangeSpecification(criteria.getRevokationDocumentDate(), SepaMandate_.revokationDocumentDate));
|
||||||
}
|
}
|
||||||
if (criteria.getValidFromDate() != null) {
|
if (criteria.getValidFromDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getValidFromDate(), SepaMandate_.validFromDate));
|
specification = specification
|
||||||
|
.and(buildRangeSpecification(criteria.getValidFromDate(), SepaMandate_.validFromDate));
|
||||||
}
|
}
|
||||||
if (criteria.getValidUntilDate() != null) {
|
if (criteria.getValidUntilDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getValidUntilDate(), SepaMandate_.validUntilDate));
|
specification = specification
|
||||||
|
.and(buildRangeSpecification(criteria.getValidUntilDate(), SepaMandate_.validUntilDate));
|
||||||
}
|
}
|
||||||
if (criteria.getLastUsedDate() != null) {
|
if (criteria.getLastUsedDate() != null) {
|
||||||
specification = specification.and(buildRangeSpecification(criteria.getLastUsedDate(), SepaMandate_.lastUsedDate));
|
specification = specification
|
||||||
|
.and(buildRangeSpecification(criteria.getLastUsedDate(), SepaMandate_.lastUsedDate));
|
||||||
}
|
}
|
||||||
if (criteria.getRemark() != null) {
|
if (criteria.getRemark() != null) {
|
||||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), SepaMandate_.remark));
|
specification = specification.and(buildStringSpecification(criteria.getRemark(), SepaMandate_.remark));
|
||||||
}
|
}
|
||||||
if (criteria.getCustomerId() != null) {
|
if (criteria.getCustomerId() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getCustomerId(),
|
specification = specification.and(
|
||||||
|
buildSpecification(
|
||||||
|
criteria.getCustomerId(),
|
||||||
root -> root.join(SepaMandate_.customer, JoinType.LEFT).get(Customer_.id)));
|
root -> root.join(SepaMandate_.customer, JoinType.LEFT).get(Customer_.id)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.SepaMandate;
|
import org.hostsharing.hsadminng.domain.SepaMandate;
|
||||||
import org.hostsharing.hsadminng.repository.SepaMandateRepository;
|
import org.hostsharing.hsadminng.repository.SepaMandateRepository;
|
||||||
import org.hostsharing.hsadminng.service.dto.SepaMandateDTO;
|
import org.hostsharing.hsadminng.service.dto.SepaMandateDTO;
|
||||||
import org.hostsharing.hsadminng.service.mapper.SepaMandateMapper;
|
import org.hostsharing.hsadminng.service.mapper.SepaMandateMapper;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -58,7 +59,6 @@ public class SepaMandateService {
|
|||||||
.map(sepaMandateMapper::toDto);
|
.map(sepaMandateMapper::toDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get one sepaMandate by id.
|
* Get one sepaMandate by id.
|
||||||
*
|
*
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import java.util.List;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
import org.hostsharing.hsadminng.domain.Share;
|
||||||
|
import org.hostsharing.hsadminng.repository.ShareRepository;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.ShareCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.ShareDTO;
|
||||||
|
import org.hostsharing.hsadminng.service.mapper.ShareMapper;
|
||||||
|
|
||||||
import javax.persistence.criteria.JoinType;
|
import io.github.jhipster.service.QueryService;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@ -12,14 +18,9 @@ import org.springframework.data.jpa.domain.Specification;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import io.github.jhipster.service.QueryService;
|
import java.util.List;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Share;
|
import javax.persistence.criteria.JoinType;
|
||||||
import org.hostsharing.hsadminng.domain.*; // for static metamodels
|
|
||||||
import org.hostsharing.hsadminng.repository.ShareRepository;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.ShareCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.ShareDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.mapper.ShareMapper;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service for executing complex queries for Share entities in the database.
|
* Service for executing complex queries for Share entities in the database.
|
||||||
@ -44,6 +45,7 @@ public class ShareQueryService extends QueryService<Share> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link List} of {@link ShareDTO} which matches the criteria from the database
|
* Return a {@link List} of {@link ShareDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
*/
|
*/
|
||||||
@ -56,6 +58,7 @@ public class ShareQueryService extends QueryService<Share> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a {@link Page} of {@link ShareDTO} which matches the criteria from the database
|
* Return a {@link Page} of {@link ShareDTO} which matches the criteria from the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @param page The page, which should be returned.
|
* @param page The page, which should be returned.
|
||||||
* @return the matching entities.
|
* @return the matching entities.
|
||||||
@ -70,6 +73,7 @@ public class ShareQueryService extends QueryService<Share> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the number of matching entities in the database
|
* Return the number of matching entities in the database
|
||||||
|
*
|
||||||
* @param criteria The object which holds all the filters, which the entities should match.
|
* @param criteria The object which holds all the filters, which the entities should match.
|
||||||
* @return the number of matching entities.
|
* @return the number of matching entities.
|
||||||
*/
|
*/
|
||||||
@ -105,7 +109,9 @@ public class ShareQueryService extends QueryService<Share> {
|
|||||||
specification = specification.and(buildStringSpecification(criteria.getRemark(), Share_.remark));
|
specification = specification.and(buildStringSpecification(criteria.getRemark(), Share_.remark));
|
||||||
}
|
}
|
||||||
if (criteria.getMembershipId() != null) {
|
if (criteria.getMembershipId() != null) {
|
||||||
specification = specification.and(buildSpecification(criteria.getMembershipId(),
|
specification = specification.and(
|
||||||
|
buildSpecification(
|
||||||
|
criteria.getMembershipId(),
|
||||||
root -> root.join(Share_.membership, JoinType.LEFT).get(Membership_.id)));
|
root -> root.join(Share_.membership, JoinType.LEFT).get(Membership_.id)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Share;
|
import org.hostsharing.hsadminng.domain.Share;
|
||||||
import org.hostsharing.hsadminng.repository.ShareRepository;
|
import org.hostsharing.hsadminng.repository.ShareRepository;
|
||||||
import org.hostsharing.hsadminng.service.dto.ShareDTO;
|
import org.hostsharing.hsadminng.service.dto.ShareDTO;
|
||||||
import org.hostsharing.hsadminng.service.mapper.ShareMapper;
|
import org.hostsharing.hsadminng.service.mapper.ShareMapper;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -58,7 +59,6 @@ public class ShareService {
|
|||||||
.map(shareMapper::toDto);
|
.map(shareMapper::toDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get one share by id.
|
* Get one share by id.
|
||||||
*
|
*
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service;
|
package org.hostsharing.hsadminng.service;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.config.Constants;
|
import org.hostsharing.hsadminng.config.Constants;
|
||||||
@ -43,7 +44,11 @@ public class UserService {
|
|||||||
|
|
||||||
private final CacheManager cacheManager;
|
private final CacheManager cacheManager;
|
||||||
|
|
||||||
public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder, AuthorityRepository authorityRepository, CacheManager cacheManager) {
|
public UserService(
|
||||||
|
UserRepository userRepository,
|
||||||
|
PasswordEncoder passwordEncoder,
|
||||||
|
AuthorityRepository authorityRepository,
|
||||||
|
CacheManager cacheManager) {
|
||||||
this.userRepository = userRepository;
|
this.userRepository = userRepository;
|
||||||
this.passwordEncoder = passwordEncoder;
|
this.passwordEncoder = passwordEncoder;
|
||||||
this.authorityRepository = authorityRepository;
|
this.authorityRepository = authorityRepository;
|
||||||
@ -151,7 +156,8 @@ public class UserService {
|
|||||||
user.setResetDate(Instant.now());
|
user.setResetDate(Instant.now());
|
||||||
user.setActivated(true);
|
user.setActivated(true);
|
||||||
if (userDTO.getAuthorities() != null) {
|
if (userDTO.getAuthorities() != null) {
|
||||||
Set<Authority> authorities = userDTO.getAuthorities().stream()
|
Set<Authority> authorities = userDTO.getAuthorities()
|
||||||
|
.stream()
|
||||||
.map(authorityRepository::findById)
|
.map(authorityRepository::findById)
|
||||||
.filter(Optional::isPresent)
|
.filter(Optional::isPresent)
|
||||||
.map(Optional::get)
|
.map(Optional::get)
|
||||||
@ -194,7 +200,8 @@ public class UserService {
|
|||||||
* @return updated user
|
* @return updated user
|
||||||
*/
|
*/
|
||||||
public Optional<UserDTO> updateUser(UserDTO userDTO) {
|
public Optional<UserDTO> updateUser(UserDTO userDTO) {
|
||||||
return Optional.of(userRepository
|
return Optional.of(
|
||||||
|
userRepository
|
||||||
.findById(userDTO.getId()))
|
.findById(userDTO.getId()))
|
||||||
.filter(Optional::isPresent)
|
.filter(Optional::isPresent)
|
||||||
.map(Optional::get)
|
.map(Optional::get)
|
||||||
@ -209,7 +216,8 @@ public class UserService {
|
|||||||
user.setLangKey(userDTO.getLangKey());
|
user.setLangKey(userDTO.getLangKey());
|
||||||
Set<Authority> managedAuthorities = user.getAuthorities();
|
Set<Authority> managedAuthorities = user.getAuthorities();
|
||||||
managedAuthorities.clear();
|
managedAuthorities.clear();
|
||||||
userDTO.getAuthorities().stream()
|
userDTO.getAuthorities()
|
||||||
|
.stream()
|
||||||
.map(authorityRepository::findById)
|
.map(authorityRepository::findById)
|
||||||
.filter(Optional::isPresent)
|
.filter(Optional::isPresent)
|
||||||
.map(Optional::get)
|
.map(Optional::get)
|
||||||
|
@ -1,17 +1,16 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.domain.enumeration.AssetAction;
|
||||||
|
|
||||||
|
import io.github.jhipster.service.filter.BigDecimalFilter;
|
||||||
|
import io.github.jhipster.service.filter.Filter;
|
||||||
|
import io.github.jhipster.service.filter.LocalDateFilter;
|
||||||
|
import io.github.jhipster.service.filter.LongFilter;
|
||||||
|
import io.github.jhipster.service.filter.StringFilter;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.AssetAction;
|
|
||||||
import io.github.jhipster.service.filter.BooleanFilter;
|
|
||||||
import io.github.jhipster.service.filter.DoubleFilter;
|
|
||||||
import io.github.jhipster.service.filter.Filter;
|
|
||||||
import io.github.jhipster.service.filter.FloatFilter;
|
|
||||||
import io.github.jhipster.service.filter.IntegerFilter;
|
|
||||||
import io.github.jhipster.service.filter.LongFilter;
|
|
||||||
import io.github.jhipster.service.filter.StringFilter;
|
|
||||||
import io.github.jhipster.service.filter.BigDecimalFilter;
|
|
||||||
import io.github.jhipster.service.filter.LocalDateFilter;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Criteria class for the Asset entity. This class is used in AssetResource to
|
* Criteria class for the Asset entity. This class is used in AssetResource to
|
||||||
@ -22,6 +21,7 @@ import io.github.jhipster.service.filter.LocalDateFilter;
|
|||||||
* fix type specific filters.
|
* fix type specific filters.
|
||||||
*/
|
*/
|
||||||
public class AssetCriteria implements Serializable {
|
public class AssetCriteria implements Serializable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class for filtering AssetAction
|
* Class for filtering AssetAction
|
||||||
*/
|
*/
|
||||||
@ -100,7 +100,6 @@ public class AssetCriteria implements Serializable {
|
|||||||
this.membershipId = membershipId;
|
this.membershipId = membershipId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (this == o) {
|
if (this == o) {
|
||||||
@ -110,8 +109,7 @@ public class AssetCriteria implements Serializable {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final AssetCriteria that = (AssetCriteria) o;
|
final AssetCriteria that = (AssetCriteria) o;
|
||||||
return
|
return Objects.equals(id, that.id) &&
|
||||||
Objects.equals(id, that.id) &&
|
|
||||||
Objects.equals(documentDate, that.documentDate) &&
|
Objects.equals(documentDate, that.documentDate) &&
|
||||||
Objects.equals(valueDate, that.valueDate) &&
|
Objects.equals(valueDate, that.valueDate) &&
|
||||||
Objects.equals(action, that.action) &&
|
Objects.equals(action, that.action) &&
|
||||||
@ -129,8 +127,7 @@ public class AssetCriteria implements Serializable {
|
|||||||
action,
|
action,
|
||||||
amount,
|
amount,
|
||||||
remark,
|
remark,
|
||||||
membershipId
|
membershipId);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,10 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
import java.time.LocalDate;
|
|
||||||
import javax.validation.constraints.*;
|
import org.hostsharing.hsadminng.domain.enumeration.AssetAction;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.AssetAction;
|
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A DTO for the Asset entity.
|
* A DTO for the Asset entity.
|
||||||
@ -28,7 +32,6 @@ public class AssetDTO implements Serializable {
|
|||||||
@Size(max = 160)
|
@Size(max = 160)
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
private Long membershipId;
|
private Long membershipId;
|
||||||
|
|
||||||
private String membershipAdmissionDocumentDate;
|
private String membershipAdmissionDocumentDate;
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
|
||||||
|
import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
|
||||||
|
|
||||||
|
import io.github.jhipster.service.filter.Filter;
|
||||||
|
import io.github.jhipster.service.filter.IntegerFilter;
|
||||||
|
import io.github.jhipster.service.filter.LocalDateFilter;
|
||||||
|
import io.github.jhipster.service.filter.LongFilter;
|
||||||
|
import io.github.jhipster.service.filter.StringFilter;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
|
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
|
|
||||||
import io.github.jhipster.service.filter.BooleanFilter;
|
|
||||||
import io.github.jhipster.service.filter.DoubleFilter;
|
|
||||||
import io.github.jhipster.service.filter.Filter;
|
|
||||||
import io.github.jhipster.service.filter.FloatFilter;
|
|
||||||
import io.github.jhipster.service.filter.IntegerFilter;
|
|
||||||
import io.github.jhipster.service.filter.LongFilter;
|
|
||||||
import io.github.jhipster.service.filter.StringFilter;
|
|
||||||
import io.github.jhipster.service.filter.LocalDateFilter;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Criteria class for the Customer entity. This class is used in CustomerResource to
|
* Criteria class for the Customer entity. This class is used in CustomerResource to
|
||||||
@ -22,11 +22,13 @@ import io.github.jhipster.service.filter.LocalDateFilter;
|
|||||||
* fix type specific filters.
|
* fix type specific filters.
|
||||||
*/
|
*/
|
||||||
public class CustomerCriteria implements Serializable {
|
public class CustomerCriteria implements Serializable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class for filtering CustomerKind
|
* Class for filtering CustomerKind
|
||||||
*/
|
*/
|
||||||
public static class CustomerKindFilter extends Filter<CustomerKind> {
|
public static class CustomerKindFilter extends Filter<CustomerKind> {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class for filtering VatRegion
|
* Class for filtering VatRegion
|
||||||
*/
|
*/
|
||||||
@ -215,7 +217,6 @@ public class CustomerCriteria implements Serializable {
|
|||||||
this.sepamandateId = sepamandateId;
|
this.sepamandateId = sepamandateId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (this == o) {
|
if (this == o) {
|
||||||
@ -225,8 +226,7 @@ public class CustomerCriteria implements Serializable {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final CustomerCriteria that = (CustomerCriteria) o;
|
final CustomerCriteria that = (CustomerCriteria) o;
|
||||||
return
|
return Objects.equals(id, that.id) &&
|
||||||
Objects.equals(id, that.id) &&
|
|
||||||
Objects.equals(reference, that.reference) &&
|
Objects.equals(reference, that.reference) &&
|
||||||
Objects.equals(prefix, that.prefix) &&
|
Objects.equals(prefix, that.prefix) &&
|
||||||
Objects.equals(name, that.name) &&
|
Objects.equals(name, that.name) &&
|
||||||
@ -266,8 +266,7 @@ public class CustomerCriteria implements Serializable {
|
|||||||
billingAddress,
|
billingAddress,
|
||||||
remark,
|
remark,
|
||||||
membershipId,
|
membershipId,
|
||||||
sepamandateId
|
sepamandateId);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,11 +1,15 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
import java.time.LocalDate;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.Objects;
|
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
|
import org.hostsharing.hsadminng.domain.enumeration.CustomerKind;
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
|
import org.hostsharing.hsadminng.domain.enumeration.VatRegion;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A DTO for the Customer entity.
|
* A DTO for the Customer entity.
|
||||||
*/
|
*/
|
||||||
@ -63,7 +67,6 @@ public class CustomerDTO implements Serializable {
|
|||||||
@Size(max = 160)
|
@Size(max = 160)
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,13 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
|
|
||||||
|
import io.github.jhipster.service.filter.Filter;
|
||||||
|
import io.github.jhipster.service.filter.LocalDateFilter;
|
||||||
|
import io.github.jhipster.service.filter.LongFilter;
|
||||||
|
import io.github.jhipster.service.filter.StringFilter;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import io.github.jhipster.service.filter.BooleanFilter;
|
|
||||||
import io.github.jhipster.service.filter.DoubleFilter;
|
|
||||||
import io.github.jhipster.service.filter.Filter;
|
|
||||||
import io.github.jhipster.service.filter.FloatFilter;
|
|
||||||
import io.github.jhipster.service.filter.IntegerFilter;
|
|
||||||
import io.github.jhipster.service.filter.LongFilter;
|
|
||||||
import io.github.jhipster.service.filter.StringFilter;
|
|
||||||
import io.github.jhipster.service.filter.LocalDateFilter;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Criteria class for the Membership entity. This class is used in MembershipResource to
|
* Criteria class for the Membership entity. This class is used in MembershipResource to
|
||||||
@ -113,7 +111,6 @@ public class MembershipCriteria implements Serializable {
|
|||||||
this.customerId = customerId;
|
this.customerId = customerId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (this == o) {
|
if (this == o) {
|
||||||
@ -123,8 +120,7 @@ public class MembershipCriteria implements Serializable {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final MembershipCriteria that = (MembershipCriteria) o;
|
final MembershipCriteria that = (MembershipCriteria) o;
|
||||||
return
|
return Objects.equals(id, that.id) &&
|
||||||
Objects.equals(id, that.id) &&
|
|
||||||
Objects.equals(admissionDocumentDate, that.admissionDocumentDate) &&
|
Objects.equals(admissionDocumentDate, that.admissionDocumentDate) &&
|
||||||
Objects.equals(cancellationDocumentDate, that.cancellationDocumentDate) &&
|
Objects.equals(cancellationDocumentDate, that.cancellationDocumentDate) &&
|
||||||
Objects.equals(memberFromDate, that.memberFromDate) &&
|
Objects.equals(memberFromDate, that.memberFromDate) &&
|
||||||
@ -146,8 +142,7 @@ public class MembershipCriteria implements Serializable {
|
|||||||
remark,
|
remark,
|
||||||
shareId,
|
shareId,
|
||||||
assetId,
|
assetId,
|
||||||
customerId
|
customerId);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
import java.time.LocalDate;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A DTO for the Membership entity.
|
* A DTO for the Membership entity.
|
||||||
*/
|
*/
|
||||||
@ -24,7 +27,6 @@ public class MembershipDTO implements Serializable {
|
|||||||
@Size(max = 160)
|
@Size(max = 160)
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
private Long customerId;
|
private Long customerId;
|
||||||
|
|
||||||
private String customerPrefix;
|
private String customerPrefix;
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A DTO representing a password change required data - current and new password.
|
* A DTO representing a password change required data - current and new password.
|
||||||
*/
|
*/
|
||||||
public class PasswordChangeDTO {
|
public class PasswordChangeDTO {
|
||||||
|
|
||||||
private String currentPassword;
|
private String currentPassword;
|
||||||
private String newPassword;
|
private String newPassword;
|
||||||
|
|
||||||
|
@ -1,15 +1,13 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
|
|
||||||
|
import io.github.jhipster.service.filter.Filter;
|
||||||
|
import io.github.jhipster.service.filter.LocalDateFilter;
|
||||||
|
import io.github.jhipster.service.filter.LongFilter;
|
||||||
|
import io.github.jhipster.service.filter.StringFilter;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import io.github.jhipster.service.filter.BooleanFilter;
|
|
||||||
import io.github.jhipster.service.filter.DoubleFilter;
|
|
||||||
import io.github.jhipster.service.filter.Filter;
|
|
||||||
import io.github.jhipster.service.filter.FloatFilter;
|
|
||||||
import io.github.jhipster.service.filter.IntegerFilter;
|
|
||||||
import io.github.jhipster.service.filter.LongFilter;
|
|
||||||
import io.github.jhipster.service.filter.StringFilter;
|
|
||||||
import io.github.jhipster.service.filter.LocalDateFilter;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Criteria class for the SepaMandate entity. This class is used in SepaMandateResource to
|
* Criteria class for the SepaMandate entity. This class is used in SepaMandateResource to
|
||||||
@ -133,7 +131,6 @@ public class SepaMandateCriteria implements Serializable {
|
|||||||
this.customerId = customerId;
|
this.customerId = customerId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (this == o) {
|
if (this == o) {
|
||||||
@ -143,8 +140,7 @@ public class SepaMandateCriteria implements Serializable {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final SepaMandateCriteria that = (SepaMandateCriteria) o;
|
final SepaMandateCriteria that = (SepaMandateCriteria) o;
|
||||||
return
|
return Objects.equals(id, that.id) &&
|
||||||
Objects.equals(id, that.id) &&
|
|
||||||
Objects.equals(reference, that.reference) &&
|
Objects.equals(reference, that.reference) &&
|
||||||
Objects.equals(iban, that.iban) &&
|
Objects.equals(iban, that.iban) &&
|
||||||
Objects.equals(bic, that.bic) &&
|
Objects.equals(bic, that.bic) &&
|
||||||
@ -170,8 +166,7 @@ public class SepaMandateCriteria implements Serializable {
|
|||||||
validUntilDate,
|
validUntilDate,
|
||||||
lastUsedDate,
|
lastUsedDate,
|
||||||
remark,
|
remark,
|
||||||
customerId
|
customerId);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
import java.time.LocalDate;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A DTO for the SepaMandate entity.
|
* A DTO for the SepaMandate entity.
|
||||||
*/
|
*/
|
||||||
@ -36,7 +39,6 @@ public class SepaMandateDTO implements Serializable {
|
|||||||
@Size(max = 160)
|
@Size(max = 160)
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
private Long customerId;
|
private Long customerId;
|
||||||
|
|
||||||
private String customerPrefix;
|
private String customerPrefix;
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.domain.enumeration.ShareAction;
|
||||||
|
|
||||||
|
import io.github.jhipster.service.filter.Filter;
|
||||||
|
import io.github.jhipster.service.filter.IntegerFilter;
|
||||||
|
import io.github.jhipster.service.filter.LocalDateFilter;
|
||||||
|
import io.github.jhipster.service.filter.LongFilter;
|
||||||
|
import io.github.jhipster.service.filter.StringFilter;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.ShareAction;
|
|
||||||
import io.github.jhipster.service.filter.BooleanFilter;
|
|
||||||
import io.github.jhipster.service.filter.DoubleFilter;
|
|
||||||
import io.github.jhipster.service.filter.Filter;
|
|
||||||
import io.github.jhipster.service.filter.FloatFilter;
|
|
||||||
import io.github.jhipster.service.filter.IntegerFilter;
|
|
||||||
import io.github.jhipster.service.filter.LongFilter;
|
|
||||||
import io.github.jhipster.service.filter.StringFilter;
|
|
||||||
import io.github.jhipster.service.filter.LocalDateFilter;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Criteria class for the Share entity. This class is used in ShareResource to
|
* Criteria class for the Share entity. This class is used in ShareResource to
|
||||||
@ -21,6 +21,7 @@ import io.github.jhipster.service.filter.LocalDateFilter;
|
|||||||
* fix type specific filters.
|
* fix type specific filters.
|
||||||
*/
|
*/
|
||||||
public class ShareCriteria implements Serializable {
|
public class ShareCriteria implements Serializable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class for filtering ShareAction
|
* Class for filtering ShareAction
|
||||||
*/
|
*/
|
||||||
@ -99,7 +100,6 @@ public class ShareCriteria implements Serializable {
|
|||||||
this.membershipId = membershipId;
|
this.membershipId = membershipId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (this == o) {
|
if (this == o) {
|
||||||
@ -109,8 +109,7 @@ public class ShareCriteria implements Serializable {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
final ShareCriteria that = (ShareCriteria) o;
|
final ShareCriteria that = (ShareCriteria) o;
|
||||||
return
|
return Objects.equals(id, that.id) &&
|
||||||
Objects.equals(id, that.id) &&
|
|
||||||
Objects.equals(documentDate, that.documentDate) &&
|
Objects.equals(documentDate, that.documentDate) &&
|
||||||
Objects.equals(valueDate, that.valueDate) &&
|
Objects.equals(valueDate, that.valueDate) &&
|
||||||
Objects.equals(action, that.action) &&
|
Objects.equals(action, that.action) &&
|
||||||
@ -128,8 +127,7 @@ public class ShareCriteria implements Serializable {
|
|||||||
action,
|
action,
|
||||||
quantity,
|
quantity,
|
||||||
remark,
|
remark,
|
||||||
membershipId
|
membershipId);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1,10 +1,14 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
import java.time.LocalDate;
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.util.Objects;
|
|
||||||
import org.hostsharing.hsadminng.domain.enumeration.ShareAction;
|
import org.hostsharing.hsadminng.domain.enumeration.ShareAction;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A DTO for the Share entity.
|
* A DTO for the Share entity.
|
||||||
*/
|
*/
|
||||||
@ -27,7 +31,6 @@ public class ShareDTO implements Serializable {
|
|||||||
@Size(max = 160)
|
@Size(max = 160)
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
private Long membershipId;
|
private Long membershipId;
|
||||||
|
|
||||||
private String membershipAdmissionDocumentDate;
|
private String membershipAdmissionDocumentDate;
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.dto;
|
package org.hostsharing.hsadminng.service.dto;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.config.Constants;
|
import org.hostsharing.hsadminng.config.Constants;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Authority;
|
import org.hostsharing.hsadminng.domain.Authority;
|
||||||
import org.hostsharing.hsadminng.domain.User;
|
import org.hostsharing.hsadminng.domain.User;
|
||||||
|
|
||||||
import javax.validation.constraints.Email;
|
|
||||||
import javax.validation.constraints.NotBlank;
|
|
||||||
|
|
||||||
import javax.validation.constraints.*;
|
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
import javax.validation.constraints.Email;
|
||||||
|
import javax.validation.constraints.NotBlank;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A DTO representing a user, with his authorities.
|
* A DTO representing a user, with his authorities.
|
||||||
*/
|
*/
|
||||||
@ -70,7 +70,8 @@ public class UserDTO {
|
|||||||
this.createdDate = user.getCreatedDate();
|
this.createdDate = user.getCreatedDate();
|
||||||
this.lastModifiedBy = user.getLastModifiedBy();
|
this.lastModifiedBy = user.getLastModifiedBy();
|
||||||
this.lastModifiedDate = user.getLastModifiedDate();
|
this.lastModifiedDate = user.getLastModifiedDate();
|
||||||
this.authorities = user.getAuthorities().stream()
|
this.authorities = user.getAuthorities()
|
||||||
|
.stream()
|
||||||
.map(Authority::getName)
|
.map(Authority::getName)
|
||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toSet());
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.mapper;
|
package org.hostsharing.hsadminng.service.mapper;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.*;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.mapper;
|
package org.hostsharing.hsadminng.service.mapper;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.*;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
@ -11,7 +12,6 @@ import org.mapstruct.*;
|
|||||||
@Mapper(componentModel = "spring", uses = {})
|
@Mapper(componentModel = "spring", uses = {})
|
||||||
public interface CustomerMapper extends EntityMapper<CustomerDTO, Customer> {
|
public interface CustomerMapper extends EntityMapper<CustomerDTO, Customer> {
|
||||||
|
|
||||||
|
|
||||||
@Mapping(target = "memberships", ignore = true)
|
@Mapping(target = "memberships", ignore = true)
|
||||||
@Mapping(target = "sepamandates", ignore = true)
|
@Mapping(target = "sepamandates", ignore = true)
|
||||||
Customer toEntity(CustomerDTO customerDTO);
|
Customer toEntity(CustomerDTO customerDTO);
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.mapper;
|
package org.hostsharing.hsadminng.service.mapper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.mapper;
|
package org.hostsharing.hsadminng.service.mapper;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.*;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.mapper;
|
package org.hostsharing.hsadminng.service.mapper;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.*;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.mapper;
|
package org.hostsharing.hsadminng.service.mapper;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.*;
|
import org.hostsharing.hsadminng.domain.*;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.mapper;
|
package org.hostsharing.hsadminng.service.mapper;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.Authority;
|
import org.hostsharing.hsadminng.domain.Authority;
|
||||||
@ -55,7 +56,6 @@ public class UserMapper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private Set<Authority> authoritiesFromStrings(Set<String> authoritiesAsString) {
|
private Set<Authority> authoritiesFromStrings(Set<String> authoritiesAsString) {
|
||||||
Set<Authority> authorities = new HashSet<>();
|
Set<Authority> authorities = new HashSet<>();
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.service.util;
|
package org.hostsharing.hsadminng.service.util;
|
||||||
|
|
||||||
import org.apache.commons.lang3.RandomStringUtils;
|
import org.apache.commons.lang3.RandomStringUtils;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.domain.User;
|
import org.hostsharing.hsadminng.domain.User;
|
||||||
import org.hostsharing.hsadminng.repository.UserRepository;
|
import org.hostsharing.hsadminng.repository.UserRepository;
|
||||||
import org.hostsharing.hsadminng.security.SecurityUtils;
|
import org.hostsharing.hsadminng.security.SecurityUtils;
|
||||||
@ -18,9 +18,10 @@ import org.slf4j.LoggerFactory;
|
|||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* REST controller for managing the current user's account.
|
* REST controller for managing the current user's account.
|
||||||
@ -110,7 +111,8 @@ public class AccountResource {
|
|||||||
*/
|
*/
|
||||||
@PostMapping("/account")
|
@PostMapping("/account")
|
||||||
public void saveAccount(@Valid @RequestBody UserDTO userDTO) {
|
public void saveAccount(@Valid @RequestBody UserDTO userDTO) {
|
||||||
String userLogin = SecurityUtils.getCurrentUserLogin().orElseThrow(() -> new InternalServerErrorException("Current user login not found"));
|
String userLogin = SecurityUtils.getCurrentUserLogin()
|
||||||
|
.orElseThrow(() -> new InternalServerErrorException("Current user login not found"));
|
||||||
Optional<User> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
|
Optional<User> existingUser = userRepository.findOneByEmailIgnoreCase(userDTO.getEmail());
|
||||||
if (existingUser.isPresent() && (!existingUser.get().getLogin().equalsIgnoreCase(userLogin))) {
|
if (existingUser.isPresent() && (!existingUser.get().getLogin().equalsIgnoreCase(userLogin))) {
|
||||||
throw new EmailAlreadyUsedException();
|
throw new EmailAlreadyUsedException();
|
||||||
@ -119,8 +121,12 @@ public class AccountResource {
|
|||||||
if (!user.isPresent()) {
|
if (!user.isPresent()) {
|
||||||
throw new InternalServerErrorException("User could not be found");
|
throw new InternalServerErrorException("User could not be found");
|
||||||
}
|
}
|
||||||
userService.updateUser(userDTO.getFirstName(), userDTO.getLastName(), userDTO.getEmail(),
|
userService.updateUser(
|
||||||
userDTO.getLangKey(), userDTO.getImageUrl());
|
userDTO.getFirstName(),
|
||||||
|
userDTO.getLastName(),
|
||||||
|
userDTO.getEmail(),
|
||||||
|
userDTO.getLangKey(),
|
||||||
|
userDTO.getImageUrl());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -147,8 +153,7 @@ public class AccountResource {
|
|||||||
public void requestPasswordReset(@RequestBody String mail) {
|
public void requestPasswordReset(@RequestBody String mail) {
|
||||||
mailService.sendPasswordResetMail(
|
mailService.sendPasswordResetMail(
|
||||||
userService.requestPasswordReset(mail)
|
userService.requestPasswordReset(mail)
|
||||||
.orElseThrow(EmailNotFoundException::new)
|
.orElseThrow(EmailNotFoundException::new));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -163,8 +168,7 @@ public class AccountResource {
|
|||||||
if (!checkPasswordLength(keyAndPassword.getNewPassword())) {
|
if (!checkPasswordLength(keyAndPassword.getNewPassword())) {
|
||||||
throw new InvalidPasswordException();
|
throw new InvalidPasswordException();
|
||||||
}
|
}
|
||||||
Optional<User> user =
|
Optional<User> user = userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey());
|
||||||
userService.completePasswordReset(keyAndPassword.getNewPassword(), keyAndPassword.getKey());
|
|
||||||
|
|
||||||
if (!user.isPresent()) {
|
if (!user.isPresent()) {
|
||||||
throw new InternalServerErrorException("No user was found for this reset key");
|
throw new InternalServerErrorException("No user was found for this reset key");
|
||||||
|
@ -1,28 +1,31 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.service.AssetQueryService;
|
||||||
import org.hostsharing.hsadminng.service.AssetService;
|
import org.hostsharing.hsadminng.service.AssetService;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.AssetCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.AssetDTO;
|
||||||
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
||||||
import org.hostsharing.hsadminng.service.dto.AssetDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.AssetCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.AssetQueryService;
|
|
||||||
import io.github.jhipster.web.util.ResponseUtil;
|
import io.github.jhipster.web.util.ResponseUtil;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* REST controller for managing Asset.
|
* REST controller for managing Asset.
|
||||||
*/
|
*/
|
||||||
@ -47,7 +50,8 @@ public class AssetResource {
|
|||||||
* POST /assets : Create a new asset.
|
* POST /assets : Create a new asset.
|
||||||
*
|
*
|
||||||
* @param assetDTO the assetDTO to create
|
* @param assetDTO the assetDTO to create
|
||||||
* @return the ResponseEntity with status 201 (Created) and with body the new assetDTO, or with status 400 (Bad Request) if the asset has already an ID
|
* @return the ResponseEntity with status 201 (Created) and with body the new assetDTO, or with status 400 (Bad Request) if
|
||||||
|
* the asset has already an ID
|
||||||
* @throws URISyntaxException if the Location URI syntax is incorrect
|
* @throws URISyntaxException if the Location URI syntax is incorrect
|
||||||
*/
|
*/
|
||||||
@PostMapping("/assets")
|
@PostMapping("/assets")
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.service.AuditEventService;
|
import org.hostsharing.hsadminng.service.AuditEventService;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
||||||
|
|
||||||
import io.github.jhipster.web.util.ResponseUtil;
|
import io.github.jhipster.web.util.ResponseUtil;
|
||||||
|
|
||||||
import org.springframework.boot.actuate.audit.AuditEvent;
|
import org.springframework.boot.actuate.audit.AuditEvent;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
|
@ -1,28 +1,31 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.service.CustomerQueryService;
|
||||||
import org.hostsharing.hsadminng.service.CustomerService;
|
import org.hostsharing.hsadminng.service.CustomerService;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.CustomerCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.CustomerDTO;
|
||||||
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
||||||
import org.hostsharing.hsadminng.service.dto.CustomerDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.CustomerCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.CustomerQueryService;
|
|
||||||
import io.github.jhipster.web.util.ResponseUtil;
|
import io.github.jhipster.web.util.ResponseUtil;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* REST controller for managing Customer.
|
* REST controller for managing Customer.
|
||||||
*/
|
*/
|
||||||
@ -47,7 +50,8 @@ public class CustomerResource {
|
|||||||
* POST /customers : Create a new customer.
|
* POST /customers : Create a new customer.
|
||||||
*
|
*
|
||||||
* @param customerDTO the customerDTO to create
|
* @param customerDTO the customerDTO to create
|
||||||
* @return the ResponseEntity with status 201 (Created) and with body the new customerDTO, or with status 400 (Bad Request) if the customer has already an ID
|
* @return the ResponseEntity with status 201 (Created) and with body the new customerDTO, or with status 400 (Bad Request)
|
||||||
|
* if the customer has already an ID
|
||||||
* @throws URISyntaxException if the Location URI syntax is incorrect
|
* @throws URISyntaxException if the Location URI syntax is incorrect
|
||||||
*/
|
*/
|
||||||
@PostMapping("/customers")
|
@PostMapping("/customers")
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.web.rest.vm.LoggerVM;
|
import org.hostsharing.hsadminng.web.rest.vm.LoggerVM;
|
||||||
|
|
||||||
import ch.qos.logback.classic.Level;
|
import ch.qos.logback.classic.Level;
|
||||||
import ch.qos.logback.classic.LoggerContext;
|
import ch.qos.logback.classic.LoggerContext;
|
||||||
|
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
@ -1,28 +1,31 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.service.MembershipQueryService;
|
||||||
import org.hostsharing.hsadminng.service.MembershipService;
|
import org.hostsharing.hsadminng.service.MembershipService;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.MembershipCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.MembershipDTO;
|
||||||
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
||||||
import org.hostsharing.hsadminng.service.dto.MembershipDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.MembershipCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.MembershipQueryService;
|
|
||||||
import io.github.jhipster.web.util.ResponseUtil;
|
import io.github.jhipster.web.util.ResponseUtil;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* REST controller for managing Membership.
|
* REST controller for managing Membership.
|
||||||
*/
|
*/
|
||||||
@ -47,11 +50,13 @@ public class MembershipResource {
|
|||||||
* POST /memberships : Create a new membership.
|
* POST /memberships : Create a new membership.
|
||||||
*
|
*
|
||||||
* @param membershipDTO the membershipDTO to create
|
* @param membershipDTO the membershipDTO to create
|
||||||
* @return the ResponseEntity with status 201 (Created) and with body the new membershipDTO, or with status 400 (Bad Request) if the membership has already an ID
|
* @return the ResponseEntity with status 201 (Created) and with body the new membershipDTO, or with status 400 (Bad
|
||||||
|
* Request) if the membership has already an ID
|
||||||
* @throws URISyntaxException if the Location URI syntax is incorrect
|
* @throws URISyntaxException if the Location URI syntax is incorrect
|
||||||
*/
|
*/
|
||||||
@PostMapping("/memberships")
|
@PostMapping("/memberships")
|
||||||
public ResponseEntity<MembershipDTO> createMembership(@Valid @RequestBody MembershipDTO membershipDTO) throws URISyntaxException {
|
public ResponseEntity<MembershipDTO> createMembership(@Valid @RequestBody MembershipDTO membershipDTO)
|
||||||
|
throws URISyntaxException {
|
||||||
log.debug("REST request to save Membership : {}", membershipDTO);
|
log.debug("REST request to save Membership : {}", membershipDTO);
|
||||||
if (membershipDTO.getId() != null) {
|
if (membershipDTO.getId() != null) {
|
||||||
throw new BadRequestAlertException("A new membership cannot already have an ID", ENTITY_NAME, "idexists");
|
throw new BadRequestAlertException("A new membership cannot already have an ID", ENTITY_NAME, "idexists");
|
||||||
@ -72,7 +77,8 @@ public class MembershipResource {
|
|||||||
* @throws URISyntaxException if the Location URI syntax is incorrect
|
* @throws URISyntaxException if the Location URI syntax is incorrect
|
||||||
*/
|
*/
|
||||||
@PutMapping("/memberships")
|
@PutMapping("/memberships")
|
||||||
public ResponseEntity<MembershipDTO> updateMembership(@Valid @RequestBody MembershipDTO membershipDTO) throws URISyntaxException {
|
public ResponseEntity<MembershipDTO> updateMembership(@Valid @RequestBody MembershipDTO membershipDTO)
|
||||||
|
throws URISyntaxException {
|
||||||
log.debug("REST request to update Membership : {}", membershipDTO);
|
log.debug("REST request to update Membership : {}", membershipDTO);
|
||||||
if (membershipDTO.getId() == null) {
|
if (membershipDTO.getId() == null) {
|
||||||
throw new BadRequestAlertException("Invalid id", ENTITY_NAME, "idnull");
|
throw new BadRequestAlertException("Invalid id", ENTITY_NAME, "idnull");
|
||||||
|
@ -1,28 +1,31 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.service.SepaMandateQueryService;
|
||||||
import org.hostsharing.hsadminng.service.SepaMandateService;
|
import org.hostsharing.hsadminng.service.SepaMandateService;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.SepaMandateCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.SepaMandateDTO;
|
||||||
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
||||||
import org.hostsharing.hsadminng.service.dto.SepaMandateDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.SepaMandateCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.SepaMandateQueryService;
|
|
||||||
import io.github.jhipster.web.util.ResponseUtil;
|
import io.github.jhipster.web.util.ResponseUtil;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* REST controller for managing SepaMandate.
|
* REST controller for managing SepaMandate.
|
||||||
*/
|
*/
|
||||||
@ -47,11 +50,13 @@ public class SepaMandateResource {
|
|||||||
* POST /sepa-mandates : Create a new sepaMandate.
|
* POST /sepa-mandates : Create a new sepaMandate.
|
||||||
*
|
*
|
||||||
* @param sepaMandateDTO the sepaMandateDTO to create
|
* @param sepaMandateDTO the sepaMandateDTO to create
|
||||||
* @return the ResponseEntity with status 201 (Created) and with body the new sepaMandateDTO, or with status 400 (Bad Request) if the sepaMandate has already an ID
|
* @return the ResponseEntity with status 201 (Created) and with body the new sepaMandateDTO, or with status 400 (Bad
|
||||||
|
* Request) if the sepaMandate has already an ID
|
||||||
* @throws URISyntaxException if the Location URI syntax is incorrect
|
* @throws URISyntaxException if the Location URI syntax is incorrect
|
||||||
*/
|
*/
|
||||||
@PostMapping("/sepa-mandates")
|
@PostMapping("/sepa-mandates")
|
||||||
public ResponseEntity<SepaMandateDTO> createSepaMandate(@Valid @RequestBody SepaMandateDTO sepaMandateDTO) throws URISyntaxException {
|
public ResponseEntity<SepaMandateDTO> createSepaMandate(@Valid @RequestBody SepaMandateDTO sepaMandateDTO)
|
||||||
|
throws URISyntaxException {
|
||||||
log.debug("REST request to save SepaMandate : {}", sepaMandateDTO);
|
log.debug("REST request to save SepaMandate : {}", sepaMandateDTO);
|
||||||
if (sepaMandateDTO.getId() != null) {
|
if (sepaMandateDTO.getId() != null) {
|
||||||
throw new BadRequestAlertException("A new sepaMandate cannot already have an ID", ENTITY_NAME, "idexists");
|
throw new BadRequestAlertException("A new sepaMandate cannot already have an ID", ENTITY_NAME, "idexists");
|
||||||
@ -72,7 +77,8 @@ public class SepaMandateResource {
|
|||||||
* @throws URISyntaxException if the Location URI syntax is incorrect
|
* @throws URISyntaxException if the Location URI syntax is incorrect
|
||||||
*/
|
*/
|
||||||
@PutMapping("/sepa-mandates")
|
@PutMapping("/sepa-mandates")
|
||||||
public ResponseEntity<SepaMandateDTO> updateSepaMandate(@Valid @RequestBody SepaMandateDTO sepaMandateDTO) throws URISyntaxException {
|
public ResponseEntity<SepaMandateDTO> updateSepaMandate(@Valid @RequestBody SepaMandateDTO sepaMandateDTO)
|
||||||
|
throws URISyntaxException {
|
||||||
log.debug("REST request to update SepaMandate : {}", sepaMandateDTO);
|
log.debug("REST request to update SepaMandate : {}", sepaMandateDTO);
|
||||||
if (sepaMandateDTO.getId() == null) {
|
if (sepaMandateDTO.getId() == null) {
|
||||||
throw new BadRequestAlertException("Invalid id", ENTITY_NAME, "idnull");
|
throw new BadRequestAlertException("Invalid id", ENTITY_NAME, "idnull");
|
||||||
|
@ -1,28 +1,31 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
|
import org.hostsharing.hsadminng.service.ShareQueryService;
|
||||||
import org.hostsharing.hsadminng.service.ShareService;
|
import org.hostsharing.hsadminng.service.ShareService;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.ShareCriteria;
|
||||||
|
import org.hostsharing.hsadminng.service.dto.ShareDTO;
|
||||||
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
import org.hostsharing.hsadminng.web.rest.errors.BadRequestAlertException;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
import org.hostsharing.hsadminng.web.rest.util.HeaderUtil;
|
||||||
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
import org.hostsharing.hsadminng.web.rest.util.PaginationUtil;
|
||||||
import org.hostsharing.hsadminng.service.dto.ShareDTO;
|
|
||||||
import org.hostsharing.hsadminng.service.dto.ShareCriteria;
|
|
||||||
import org.hostsharing.hsadminng.service.ShareQueryService;
|
|
||||||
import io.github.jhipster.web.util.ResponseUtil;
|
import io.github.jhipster.web.util.ResponseUtil;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.validation.Valid;
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* REST controller for managing Share.
|
* REST controller for managing Share.
|
||||||
*/
|
*/
|
||||||
@ -47,7 +50,8 @@ public class ShareResource {
|
|||||||
* POST /shares : Create a new share.
|
* POST /shares : Create a new share.
|
||||||
*
|
*
|
||||||
* @param shareDTO the shareDTO to create
|
* @param shareDTO the shareDTO to create
|
||||||
* @return the ResponseEntity with status 201 (Created) and with body the new shareDTO, or with status 400 (Bad Request) if the share has already an ID
|
* @return the ResponseEntity with status 201 (Created) and with body the new shareDTO, or with status 400 (Bad Request) if
|
||||||
|
* the share has already an ID
|
||||||
* @throws URISyntaxException if the Location URI syntax is incorrect
|
* @throws URISyntaxException if the Location URI syntax is incorrect
|
||||||
*/
|
*/
|
||||||
@PostMapping("/shares")
|
@PostMapping("/shares")
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// Licensed under Apache-2.0
|
||||||
package org.hostsharing.hsadminng.web.rest;
|
package org.hostsharing.hsadminng.web.rest;
|
||||||
|
|
||||||
import org.hostsharing.hsadminng.security.jwt.JWTFilter;
|
import org.hostsharing.hsadminng.security.jwt.JWTFilter;
|
||||||
@ -36,8 +37,9 @@ public class UserJWTController {
|
|||||||
@PostMapping("/authenticate")
|
@PostMapping("/authenticate")
|
||||||
public ResponseEntity<JWTToken> authorize(@Valid @RequestBody LoginVM loginVM) {
|
public ResponseEntity<JWTToken> authorize(@Valid @RequestBody LoginVM loginVM) {
|
||||||
|
|
||||||
UsernamePasswordAuthenticationToken authenticationToken =
|
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
|
||||||
new UsernamePasswordAuthenticationToken(loginVM.getUsername(), loginVM.getPassword());
|
loginVM.getUsername(),
|
||||||
|
loginVM.getPassword());
|
||||||
|
|
||||||
Authentication authentication = this.authenticationManager.authenticate(authenticationToken);
|
Authentication authentication = this.authenticationManager.authenticate(authenticationToken);
|
||||||
SecurityContextHolder.getContext().setAuthentication(authentication);
|
SecurityContextHolder.getContext().setAuthentication(authentication);
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user