Merge branch 'master' into feature/new-sync-states

.editorconfig

@@ -16,6 +16,7 @@ ij_visual_guides = 100,130,150,180
 ij_wrap_on_typing = false
 
 [*.css]
+ij_visual_guides = none
 ij_css_align_closing_brace_with_properties = false
 ij_css_blank_lines_around_nested_selector = 1
 ij_css_blank_lines_between_blocks = 1
@@ -36,14 +37,17 @@ ij_css_value_alignment = do_not_align
 
 [*.feature]
 indent_size = 2
+ij_visual_guides = none
 ij_gherkin_keep_indents_on_empty_lines = false
 
 [*.haml]
 indent_size = 2
+ij_visual_guides = none
 ij_haml_keep_indents_on_empty_lines = false
 
 [*.java]
 ij_smart_tabs = true
+ij_visual_guides = none
 ij_java_align_consecutive_assignments = false
 ij_java_align_consecutive_variable_declarations = false
 ij_java_align_group_field_declarations = false
@@ -105,7 +109,7 @@ ij_java_do_while_brace_force = if_multiline
 ij_java_doc_add_blank_line_after_description = true
 ij_java_doc_add_blank_line_after_param_comments = false
 ij_java_doc_add_blank_line_after_return = false
-ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_add_p_tag_on_empty_lines = false
 ij_java_doc_align_exception_comments = false
 ij_java_doc_align_param_comments = false
 ij_java_doc_do_not_wrap_if_one_line = true
@@ -268,6 +272,7 @@ ij_java_spaces_within_if_parentheses = false
 ij_java_spaces_within_method_call_parentheses = false
 ij_java_spaces_within_method_parentheses = false
 ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_record_header = false
 ij_java_spaces_within_switch_parentheses = false
 ij_java_spaces_within_synchronized_parentheses = false
 ij_java_spaces_within_try_parentheses = false
@@ -293,6 +298,7 @@ ij_java_wrap_long_lines = false
 
 [*.less]
 indent_size = 2
+ij_visual_guides = none
 ij_less_align_closing_brace_with_properties = false
 ij_less_blank_lines_around_nested_selector = 1
 ij_less_blank_lines_between_blocks = 1
@@ -313,6 +319,7 @@ ij_less_value_alignment = 0
 
 [*.sass]
 indent_size = 2
+ij_visual_guides = none
 ij_sass_align_closing_brace_with_properties = false
 ij_sass_blank_lines_around_nested_selector = 1
 ij_sass_blank_lines_between_blocks = 1
@@ -333,6 +340,7 @@ ij_sass_value_alignment = 0
 
 [*.scss]
 indent_size = 2
+ij_visual_guides = none
 ij_scss_align_closing_brace_with_properties = false
 ij_scss_blank_lines_around_nested_selector = 1
 ij_scss_blank_lines_between_blocks = 1
@@ -353,6 +361,7 @@ ij_scss_value_alignment = 0
 
 [*.styl]
 indent_size = 2
+ij_visual_guides = none
 ij_stylus_align_closing_brace_with_properties = false
 ij_stylus_blank_lines_around_nested_selector = 1
 ij_stylus_blank_lines_between_blocks = 1
@@ -372,6 +381,7 @@ ij_stylus_use_double_quotes = true
 ij_stylus_value_alignment = 0
 
 [.editorconfig]
+ij_visual_guides = none
 ij_editorconfig_align_group_field_declarations = false
 ij_editorconfig_space_after_colon = false
 ij_editorconfig_space_after_comma = true
@@ -380,11 +390,14 @@ ij_editorconfig_space_before_comma = false
 ij_editorconfig_spaces_around_assignment_operators = true
 
 [{*.ad,*.adoc,*.asciidoc,.asciidoctorconfig}]
+ij_visual_guides = none
+ij_asciidoc_blank_lines_after_header = 1
+ij_asciidoc_blank_lines_keep_after_header = 1
 ij_asciidoc_formatting_enabled = true
-# force-joins manually wrapped long sentences, I'm the master here, not the machine
-ij_asciidoc_one_sentence_per_line = false
+ij_asciidoc_one_sentence_per_line = true
 
 [{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.pom,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
+ij_visual_guides = none
 ij_xml_align_attributes = false
 ij_xml_align_text = false
 ij_xml_attribute_wrap = off
@@ -404,6 +417,7 @@ ij_xml_text_wrap = off
 
 [{*.ats,*.ts}]
 ij_continuation_indent_size = 4
+ij_visual_guides = none
 ij_typescript_align_imports = false
 ij_typescript_align_multiline_array_initializer_expression = false
 ij_typescript_align_multiline_binary_operation = false
@@ -573,6 +587,7 @@ ij_typescript_wrap_comments = false
 [{*.bash,*.sh,*.zsh}]
 indent_size = 2
 tab_width = 2
+ij_visual_guides = none
 ij_shell_binary_ops_start_line = false
 ij_shell_keep_column_alignment_padding = false
 ij_shell_minify_program = false
@@ -581,6 +596,7 @@ ij_shell_switch_cases_indented = false
 
 [{*.cjs,*.js}]
 ij_continuation_indent_size = 4
+ij_visual_guides = none
 ij_javascript_align_imports = false
 ij_javascript_align_multiline_array_initializer_expression = false
 ij_javascript_align_multiline_binary_operation = false
@@ -748,6 +764,7 @@ ij_javascript_wrap_comments = false
 indent_size = 2
 tab_width = 2
 ij_continuation_indent_size = 2
+ij_visual_guides = none
 ij_coffeescript_align_function_body = false
 ij_coffeescript_align_imports = false
 ij_coffeescript_align_multiline_array_initializer_expression = true
@@ -842,9 +859,11 @@ ij_coffeescript_use_semicolon_after_statement = false
 ij_coffeescript_var_declaration_wrap = normal
 
 [{*.ft,*.vm,*.vsl}]
+ij_visual_guides = none
 ij_vtl_keep_indents_on_empty_lines = false
 
 [{*.gant,*.gradle,*.groovy,*.gy}]
+ij_visual_guides = none
 ij_groovy_align_group_field_declarations = false
 ij_groovy_align_multiline_array_initializer_expression = false
 ij_groovy_align_multiline_assignment = false
@@ -1024,6 +1043,7 @@ ij_groovy_while_on_new_line = false
 ij_groovy_wrap_long_lines = false
 
 [{*.gradle.kts,*.kt,*.kts,*.main.kts}]
+ij_visual_guides = none
 ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false
 ij_kotlin_align_multiline_extends_list = false
@@ -1056,6 +1076,7 @@ ij_kotlin_field_annotation_wrap = split_into_lines
 ij_kotlin_finally_on_new_line = false
 ij_kotlin_if_rparen_on_new_line = false
 ij_kotlin_import_nested_classes = false
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
 ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
 ij_kotlin_keep_blank_lines_before_right_brace = 2
 ij_kotlin_keep_blank_lines_in_code = 2
@@ -1073,6 +1094,7 @@ ij_kotlin_method_parameters_right_paren_on_new_line = false
 ij_kotlin_method_parameters_wrap = off
 ij_kotlin_name_count_to_use_star_import = 5
 ij_kotlin_name_count_to_use_star_import_for_members = 3
+ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
 ij_kotlin_parameter_annotation_wrap = off
 ij_kotlin_space_after_comma = true
 ij_kotlin_space_after_extend_colon = true
@@ -1104,6 +1126,7 @@ ij_kotlin_wrap_first_method_in_call_chain = false
 
 [{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
 indent_size = 2
+ij_visual_guides = none
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false
 ij_json_keep_line_breaks = true
@@ -1116,6 +1139,7 @@ ij_json_spaces_within_brackets = false
 ij_json_wrap_long_lines = false
 
 [{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}]
+ij_visual_guides = none
 ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
 ij_html_align_attributes = false
 ij_html_align_text = false
@@ -1144,19 +1168,45 @@ ij_html_text_wrap = off
 ij_html_uniform_ident = false
 
 [{*.jsf,*.jsp,*.jspf,*.tag,*.tagf,*.xjsp}]
+ij_visual_guides = none
 ij_jsp_jsp_prefer_comma_separated_import_list = false
 ij_jsp_keep_indents_on_empty_lines = false
 
 [{*.jspx,*.tagx}]
+ij_visual_guides = none
 ij_jspx_keep_indents_on_empty_lines = false
 
+[{*.markdown,*.md}]
+ij_visual_guides = none
+ij_markdown_force_one_space_after_blockquote_symbol = true
+ij_markdown_force_one_space_after_header_symbol = true
+ij_markdown_force_one_space_after_list_bullet = true
+ij_markdown_force_one_space_between_words = true
+ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
+ij_markdown_min_lines_around_block_elements = 1
+ij_markdown_min_lines_around_header = 1
+ij_markdown_min_lines_between_paragraphs = 1
+
 [{*.properties,spring.handlers,spring.schemas}]
+ij_visual_guides = none
 ij_properties_align_group_field_declarations = false
 ij_properties_keep_blank_lines = false
 ij_properties_key_value_delimiter = equals
 ij_properties_spaces_around_key_value_delimiter = false
 
 [{*.yaml,*.yml}]
 indent_size = 2
+ij_visual_guides = none
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true

infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/crypto/KeyStoreBasedProtectorImpl.java

@@ -674,7 +674,7 @@ public boolean areEquivalent(ProtectedStringType a, ProtectedStringType b) {
                 return false;
             }
         }
-        return Objects.equals(a.getClearValue(), a.getClearValue());
+        return Objects.equals(a.getClearValue(), b.getClearValue());
     }
 
     private boolean areEquivalentHashed(ProtectedStringType a, ProtectedStringType b) {

infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestEquals.java

@@ -6,10 +6,16 @@
  */
 package com.evolveum.midpoint.prism;
 
+import static com.evolveum.midpoint.prism.PrismInternalTestUtil.constructInitializedPrismContext;
 import static org.testng.AssertJUnit.*;
 
+import com.evolveum.midpoint.prism.crypto.Protector;
 import com.evolveum.midpoint.prism.equivalence.EquivalenceStrategy;
 
+import com.evolveum.midpoint.prism.impl.PrismContextImpl;
+import com.evolveum.midpoint.prism.impl.PrismPropertyValueImpl;
+import com.evolveum.midpoint.prism.impl.PrismValueImpl;
+import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
 import org.testng.annotations.Test;
 
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
@@ -80,4 +86,31 @@ public void testEqualsBrokenAssignmentActivation() throws Exception {
         assertEquals("Not equals after normalize(good)", goodAssignment, brokenAssignment);
 
     }
+
+    @Test
+    public void testEqualsProtectedStringTypePrismValue() throws Exception {
+        // GIVEN
+        PrismContext prismContext = constructInitializedPrismContext();
+        Protector protector = PrismInternalTestUtil.createProtector(Protector.XMLSEC_ENCRYPTION_ALGORITHM_AES256_CBC);
+        ((PrismContextImpl)prismContext).setDefaultProtector(protector);
+
+        ProtectedStringType p1 = new ProtectedStringType();
+        p1.setClearValue("a");
+        PrismPropertyValueImpl pv1 = new PrismPropertyValueImpl(p1, prismContext);
+
+        ProtectedStringType p2 = new ProtectedStringType();
+        p2.setClearValue("b");
+        PrismPropertyValueImpl pv2 = new PrismPropertyValueImpl(p2, prismContext);
+
+        ProtectedStringType p3 = new ProtectedStringType();
+        p3.setClearValue("a");
+        PrismPropertyValueImpl pv3 = new PrismPropertyValueImpl(p3, prismContext);
+
+        // WHEN, THEN
+        boolean result1 = pv1.equals(pv2);
+        boolean result2 = pv1.equals(pv3);
+
+        assertFalse(result1);
+        assertTrue(result2);
+    }
 }

infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

@@ -6456,6 +6456,10 @@
                                 instance-specific resource schema or for other
                                 purposes. If not set a default namespace is assumed.
                             </xsd:documentation>
+                            <xsd:appinfo>
+                                <a:deprecated>true</a:deprecated>
+                                <a:deprecatedSince>4.3</a:deprecatedSince>
+                            </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
                     <xsd:element ref="tns:schema" minOccurs="0">