Issue #3477804 by mkalkbrenner: Support simplified field type definit…

…ions introduced by Solr 9

config/schema/search_api_solr.field_type.schema.yml

@@ -1,190 +1,3 @@
-search_api_solr.solr_field_type.*:
-  type: config_entity
-  label: 'Solr Field Type Config'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    minimum_solr_version:
-      type: string
-      label: 'The minimum version the Solr server'
-    custom_code:
-      type: string
-      label: 'Custom Code targeted by this Solr Field Type'
-    field_type_language_code:
-      type: string
-      label: 'The language targeted by this Solr Field Type'
-    domains:
-      type: sequence
-      sequence:
-        type: string
-    field_type:
-      type: search_api_solr.solr_common_field_type
-    unstemmed_field_type:
-      type: search_api_solr.solr_common_field_type
-      nullable: true
-    spellcheck_field_type:
-      type: mapping
-      nullable: true
-      mapping:
-        name:
-          type: string
-          label: 'The Solr field name'
-        class:
-          type: string
-          label: 'The Solr field type'
-        positionIncrementGap:
-          type: integer
-          label: 'Solr field attribute positionIncrementGap'
-        storeOffsetsWithPositions:
-          type: boolean
-          label: 'Solr field attribute storeOffsetsWithPositions'
-          nullable: true
-        analyzer:
-          type: mapping
-          mapping:
-            charFilter:
-              nullable: true
-              type: search_api_solr.solr_field_char_filter
-            charFilters:
-              type: sequence
-              nullable: true
-              sequence:
-                type: search_api_solr.solr_field_char_filter
-            tokenizer:
-              nullable: true
-              type: search_api_solr.solr_field_tokenizer
-            tokenizers:
-              type: sequence
-              nullable: true
-              sequence:
-                type: search_api_solr.solr_field_tokenizer
-            filter:
-              nullable: true
-              type: search_api_solr.solr_field_type_filter
-            filters:
-              type: sequence
-              nullable: true
-              sequence:
-                type: search_api_solr.solr_field_type_filter
-    collated_field_type:
-      type: mapping
-      nullable: true
-      mapping:
-        name:
-          type: string
-          label: 'The Solr collate field name'
-        class:
-          type: string
-          label: 'The Solr collate field type'
-        locale:
-          type: string
-          label: 'The Solr collate language'
-        strength:
-          type: string
-          label: 'The Solr collate strength'
-        caseLevel:
-          type: boolean
-          label: 'The Solr collate caseLevel'
-    solr_configs:
-      type: search_api_solr.solr_configs
-    text_files:
-      type: mapping
-      mapping:
-        stopwords:
-          type: string
-          label: 'Stop words'
-        protwords:
-          type: string
-          label: 'Protected words'
-        accents:
-          type: string
-          label: 'Accent char mapping'
-        synonyms:
-          type: string
-          label: 'Synonym words'
-        nouns:
-          type: string
-          label: 'Nouns'
-        stoptags:
-          type: string
-          label: 'Stop tags'
-        pos:
-          type: string
-          label: 'Part of Speech'
-
-search_api_solr.solr_common_field_type:
-  type: mapping
-  mapping:
-    name:
-      type: string
-      label: 'The Solr field name'
-    class:
-      type: string
-      label: 'The Solr field type'
-    positionIncrementGap:
-      type: integer
-      label: 'Solr field attribute positionIncrementGap'
-    storeOffsetsWithPositions:
-      type: boolean
-      label: 'Solr field attribute storeOffsetsWithPositions'
-      nullable: true
-    analyzer:
-      type: search_api_solr.solr_field_type_analyzer
-      nullable: true
-    analyzers:
-      type: sequence
-      nullable: true
-      sequence:
-        type: search_api_solr.solr_field_type_analyzer
-    similarity:
-      type: mapping
-      nullable: true
-      mapping:
-        class:
-          type: string
-          label: 'The similarity class'
-        str:
-          type: search_api_solr.scalar_values
-        int:
-          type: search_api_solr.scalar_values
-        float:
-          type: search_api_solr.scalar_values
-
-search_api_solr.solr_field_type_analyzer:
-  type: mapping
-  mapping:
-    type:
-      type: string
-      label: 'The analyzer type'
-    charFilter:
-      nullable: true
-      type: search_api_solr.solr_field_char_filter
-    charFilters:
-      type: sequence
-      nullable: true
-      sequence:
-        type: search_api_solr.solr_field_char_filter
-    tokenizer:
-      nullable: true
-      type: search_api_solr.solr_field_tokenizer
-    tokenizers:
-      type: sequence
-      nullable: true
-      sequence:
-        type: search_api_solr.solr_field_tokenizer
-    filter:
-      nullable: true
-      type: search_api_solr.solr_field_type_filter
-    filters:
-      type: sequence
-      nullable: true
-      sequence:
-        type: search_api_solr.solr_field_type_filter
-
 search_api_solr.solr_field_type_char_filter:
   type: mapping
   mapping:
@@ -613,3 +426,166 @@ search_api_solr.solr_field_type_filter:
       type: string
       label: 'SerbianNormalizationFilter::haircut'
       nullable: true
+
+search_api_solr.solr_field_type_analyzer:
+  type: mapping
+  mapping:
+    type:
+      nullable: true
+      type: string
+      label: 'The analyzer type'
+    charFilter:
+      nullable: true
+      type: search_api_solr.solr_field_type_char_filter
+    charFilters:
+      nullable: true
+      type: sequence
+      sequence:
+        type: search_api_solr.solr_field_type_char_filter
+    tokenizer:
+      nullable: true
+      type: search_api_solr.solr_field_type_tokenizer
+    tokenizers:
+      nullable: true
+      type: sequence
+      sequence:
+        type: search_api_solr.solr_field_type_tokenizer
+    filter:
+      nullable: true
+      type: search_api_solr.solr_field_type_filter
+    filters:
+      nullable: true
+      type: sequence
+      sequence:
+        type: search_api_solr.solr_field_type_filter
+
+search_api_solr.solr_common_field_type:
+  type: mapping
+  mapping:
+    name:
+      type: string
+      label: 'The Solr field name'
+    class:
+      type: string
+      label: 'The Solr field type'
+    positionIncrementGap:
+      type: integer
+      label: 'Solr field attribute positionIncrementGap'
+    storeOffsetsWithPositions:
+      type: boolean
+      label: 'Solr field attribute storeOffsetsWithPositions'
+      nullable: true
+    analyzer:
+      type: search_api_solr.solr_field_type_analyzer
+      nullable: true
+    analyzers:
+      type: sequence
+      nullable: true
+      sequence:
+        type: search_api_solr.solr_field_type_analyzer
+    similarity:
+      type: mapping
+      nullable: true
+      mapping:
+        class:
+          type: string
+          label: 'The similarity class'
+        str:
+          type: search_api_solr.scalar_values
+        int:
+          type: search_api_solr.scalar_values
+        float:
+          type: search_api_solr.scalar_values
+
+search_api_solr.solr_field_type.*:
+  type: config_entity
+  label: 'Solr Field Type Config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    minimum_solr_version:
+      type: string
+      label: 'The minimum version the Solr server'
+    custom_code:
+      type: string
+      label: 'Custom Code targeted by this Solr Field Type'
+    field_type_language_code:
+      type: string
+      label: 'The language targeted by this Solr Field Type'
+    domains:
+      type: sequence
+      sequence:
+        type: string
+    field_type:
+      type: search_api_solr.solr_common_field_type
+    unstemmed_field_type:
+      type: search_api_solr.solr_common_field_type
+      nullable: true
+    spellcheck_field_type:
+      type: mapping
+      nullable: true
+      mapping:
+        name:
+          type: string
+          label: 'The Solr field name'
+        class:
+          type: string
+          label: 'The Solr field type'
+        positionIncrementGap:
+          type: integer
+          label: 'Solr field attribute positionIncrementGap'
+        storeOffsetsWithPositions:
+          type: boolean
+          label: 'Solr field attribute storeOffsetsWithPositions'
+          nullable: true
+        analyzer:
+          type: search_api_solr.solr_field_type_analyzer
+    collated_field_type:
+      type: mapping
+      nullable: true
+      mapping:
+        name:
+          type: string
+          label: 'The Solr collate field name'
+        class:
+          type: string
+          label: 'The Solr collate field type'
+        locale:
+          type: string
+          label: 'The Solr collate language'
+        strength:
+          type: string
+          label: 'The Solr collate strength'
+        caseLevel:
+          type: boolean
+          label: 'The Solr collate caseLevel'
+    solr_configs:
+      type: search_api_solr.solr_configs
+    text_files:
+      type: mapping
+      mapping:
+        stopwords:
+          type: string
+          label: 'Stop words'
+        protwords:
+          type: string
+          label: 'Protected words'
+        accents:
+          type: string
+          label: 'Accent char mapping'
+        synonyms:
+          type: string
+          label: 'Synonym words'
+        nouns:
+          type: string
+          label: 'Nouns'
+        stoptags:
+          type: string
+          label: 'Stop tags'
+        pos:
+          type: string
+          label: 'Part of Speech'