Skip to content

Commit

Permalink
Merge pull request #4677 from gchq/7.7
Browse files Browse the repository at this point in the history 
7.7
  • Loading branch information
@stroomdev66
stroomdev66 authored Dec 23, 2024
2 parents 7b12f2d + 002c381 commit a88fd39
Show file tree
Hide file tree
Showing 25 changed files with 192 additions and 216 deletions.
9 changes: 2 additions & 7 deletions stroom-core-shared/src/main/java/stroom/analytics/shared/AnalyticRuleDoc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
import stroom.docs.shared.Description;
import stroom.docstore.shared.Doc;
import stroom.docstore.shared.DocumentType;
import stroom.docstore.shared.DocumentTypeGroup;
import stroom.docstore.shared.DocumentTypeRegistry;
import stroom.query.api.v2.Param;
import stroom.query.api.v2.TimeRange;
import stroom.svg.shared.SvgImage;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
Expand All @@ -48,11 +47,7 @@
public class AnalyticRuleDoc extends Doc {

public static final String TYPE = "AnalyticRule";
public static final DocumentType DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.SEARCH,
TYPE,
"Analytic Rule",
SvgImage.DOCUMENT_ANALYTIC_RULE);
public static final DocumentType DOCUMENT_TYPE = DocumentTypeRegistry.ANALYTIC_RULE_DOCUMENT_TYPE;

@JsonProperty
private final String description;
Expand Down
9 changes: 2 additions & 7 deletions stroom-core-shared/src/main/java/stroom/aws/s3/shared/S3ConfigDoc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
import stroom.docs.shared.Description;
import stroom.docstore.shared.Doc;
import stroom.docstore.shared.DocumentType;
import stroom.docstore.shared.DocumentTypeGroup;
import stroom.svg.shared.SvgImage;
import stroom.docstore.shared.DocumentTypeRegistry;
import stroom.util.shared.HasData;

import com.fasterxml.jackson.annotation.JsonCreator;
Expand Down Expand Up @@ -50,11 +49,7 @@
public class S3ConfigDoc extends Doc implements HasData {

public static final String TYPE = "S3Config";
public static final DocumentType DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
TYPE,
"S3 Configuration",
SvgImage.DOCUMENT_S3);
public static final DocumentType DOCUMENT_TYPE = DocumentTypeRegistry.S3_CONFIG_DOCUMENT_TYPE;

@JsonProperty
private String description = "";
Expand Down
9 changes: 2 additions & 7 deletions stroom-core-shared/src/main/java/stroom/dashboard/shared/DashboardDoc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
import stroom.docs.shared.Description;
import stroom.docstore.shared.Doc;
import stroom.docstore.shared.DocumentType;
import stroom.docstore.shared.DocumentTypeGroup;
import stroom.svg.shared.SvgImage;
import stroom.docstore.shared.DocumentTypeRegistry;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
Expand Down Expand Up @@ -60,11 +59,7 @@
public class DashboardDoc extends Doc {

public static final String TYPE = "Dashboard";
public static final DocumentType DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.SEARCH,
TYPE,
TYPE,
SvgImage.DOCUMENT_DASHBOARD);
public static final DocumentType DOCUMENT_TYPE = DocumentTypeRegistry.DASHBOARD_DOCUMENT_TYPE;

@JsonProperty
private String description;
Expand Down
9 changes: 2 additions & 7 deletions stroom-core-shared/src/main/java/stroom/dictionary/shared/DictionaryDoc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
import stroom.docs.shared.Description;
import stroom.docstore.shared.Doc;
import stroom.docstore.shared.DocumentType;
import stroom.docstore.shared.DocumentTypeGroup;
import stroom.svg.shared.SvgImage;
import stroom.docstore.shared.DocumentTypeRegistry;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
Expand Down Expand Up @@ -54,11 +53,7 @@
public class DictionaryDoc extends Doc {

public static final String TYPE = "Dictionary";
public static final DocumentType DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
TYPE,
TYPE,
SvgImage.DOCUMENT_DICTIONARY);
public static final DocumentType DOCUMENT_TYPE = DocumentTypeRegistry.DICTIONARY_DOCUMENT_TYPE;

@JsonProperty
private String description;
Expand Down
192 changes: 144 additions & 48 deletions stroom-core-shared/src/main/java/stroom/docstore/shared/DocumentTypeRegistry.java
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,7 @@
package stroom.docstore.shared;

import stroom.analytics.shared.AnalyticRuleDoc;
import stroom.aws.s3.shared.S3ConfigDoc;
import stroom.dashboard.shared.DashboardDoc;
import stroom.dictionary.shared.DictionaryDoc;
import stroom.documentation.shared.DocumentationDoc;
import stroom.explorer.shared.ExplorerConstants;
import stroom.feed.shared.FeedDoc;
import stroom.index.shared.LuceneIndexDoc;
import stroom.kafka.shared.KafkaConfigDoc;
import stroom.pipeline.shared.PipelineDoc;
import stroom.pipeline.shared.TextConverterDoc;
import stroom.pipeline.shared.XsltDoc;
import stroom.query.shared.QueryDoc;
import stroom.receive.rules.shared.ReceiveDataRules;
import stroom.script.shared.ScriptDoc;
import stroom.search.elastic.shared.ElasticClusterDoc;
import stroom.search.elastic.shared.ElasticIndexDoc;
import stroom.search.solr.shared.SolrIndexDoc;
import stroom.state.shared.ScyllaDbDoc;
import stroom.state.shared.StateDoc;
import stroom.statistics.impl.hbase.shared.StroomStatsStoreDoc;
import stroom.statistics.impl.sql.shared.StatisticStoreDoc;
import stroom.svg.shared.SvgImage;
import stroom.view.shared.ViewDoc;
import stroom.visualisation.shared.VisualisationDoc;
import stroom.xmlschema.shared.XmlSchemaDoc;

import java.util.Collection;
import java.util.HashMap;
Expand Down Expand Up @@ -60,43 +36,163 @@ public class DocumentTypeRegistry {
"ProcessorFilter",
"Processor Filter",
SvgImage.FILTER);
public static final DocumentType ANALYTIC_RULE_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.SEARCH,
"AnalyticRule",
"Analytic Rule",
SvgImage.DOCUMENT_ANALYTIC_RULE);
public static final DocumentType ANALYTICS_STORE_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.SEARCH,
"Analytics",
"Analytics",
SvgImage.DOCUMENT_SEARCHABLE);
public static final DocumentType DASHBOARD_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.SEARCH,
"Dashboard",
"Dashboard",
SvgImage.DOCUMENT_DASHBOARD);
public static final DocumentType DICTIONARY_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"Dictionary",
"Dictionary",
SvgImage.DOCUMENT_DICTIONARY);
public static final DocumentType LUCENE_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.INDEXING,
"Index",
"Lucene Index",
SvgImage.DOCUMENT_INDEX);
public static final DocumentType STROOM_STATS_STORE_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.INDEXING,
"StroomStatsStore",
"Stroom-Stats Store",
SvgImage.DOCUMENT_STROOM_STATS_STORE);
public static final DocumentType XML_SCHEMA_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.TRANSFORMATION,
"XMLSchema",
"XML Schema",
SvgImage.DOCUMENT_XMLSCHEMA);
public static final DocumentType KAFKA_CONFIG_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"KafkaConfig",
"Kafka Configuration",
SvgImage.DOCUMENT_KAFKA_CONFIG);
public static final DocumentType SOLR_INDEX_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.INDEXING,
"SolrIndex",
"Solr Index",
SvgImage.DOCUMENT_SOLR_INDEX);
public static final DocumentType SCYLLA_DB_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"ScyllaDB",
"Scylla DB",
SvgImage.DOCUMENT_SCYLLA_DB);
public static final DocumentType DOCUMENTATION_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"Documentation",
"Documentation",
SvgImage.DOCUMENT_DOCUMENTATION);
public static final DocumentType ELASTIC_CLUSTER_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"ElasticCluster",
"Elastic Cluster",
SvgImage.DOCUMENT_ELASTIC_CLUSTER);
public static final DocumentType ELASTIC_INDEX_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.INDEXING,
"ElasticIndex",
"Elastic Index",
SvgImage.DOCUMENT_ELASTIC_INDEX);
public static final DocumentType STATE_STORE_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.INDEXING,
"StateStore",
"State Store",
SvgImage.DOCUMENT_STATE_STORE);
public static final DocumentType STATISTIC_STORE_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.INDEXING,
"StatisticStore",
"Statistic Store",
SvgImage.DOCUMENT_STATISTIC_STORE);
public static final DocumentType FEED_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.DATA_PROCESSING,
"Feed",
"Feed",
SvgImage.DOCUMENT_FEED);
public static final DocumentType PIPELINE_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.DATA_PROCESSING,
"Pipeline",
"Pipeline",
SvgImage.DOCUMENT_PIPELINE);
public static final DocumentType QUERY_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.SEARCH,
"Query",
"Query",
SvgImage.DOCUMENT_QUERY);
public static final DocumentType RECEIVE_DATA_RULESET_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"ReceiveDataRuleSet",
"Rule Set",
SvgImage.DOCUMENT_RECEIVE_DATA_RULE_SET);
public static final DocumentType S3_CONFIG_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"S3Config",
"S3 Configuration",
SvgImage.DOCUMENT_S3);
public static final DocumentType SCRIPT_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"Script",
"Script",
SvgImage.DOCUMENT_SCRIPT);
public static final DocumentType TEXT_CONVERTER_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.TRANSFORMATION,
"TextConverter",
"Text Converter",
SvgImage.DOCUMENT_TEXT_CONVERTER);
public static final DocumentType VIEW_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.SEARCH,
"View",
"View",
SvgImage.DOCUMENT_VIEW);
public static final DocumentType VISUALISATION_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
"Visualisation",
"Visualisation",
SvgImage.DOCUMENT_VISUALISATION);
public static final DocumentType XSLT_DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.TRANSFORMATION,
"XSLT",
"XSL Translation",
SvgImage.DOCUMENT_XSLT);

static {
put(ANALYTICS_STORE_DOCUMENT_TYPE);
put(AnalyticRuleDoc.DOCUMENT_TYPE);
put(DashboardDoc.DOCUMENT_TYPE);
put(DictionaryDoc.DOCUMENT_TYPE);
put(DocumentationDoc.DOCUMENT_TYPE);
put(ElasticClusterDoc.DOCUMENT_TYPE);
put(ElasticIndexDoc.DOCUMENT_TYPE);
put(ANALYTIC_RULE_DOCUMENT_TYPE);
put(DASHBOARD_DOCUMENT_TYPE);
put(DICTIONARY_DOCUMENT_TYPE);
put(DOCUMENTATION_DOCUMENT_TYPE);
put(ELASTIC_CLUSTER_DOCUMENT_TYPE);
put(ELASTIC_INDEX_DOCUMENT_TYPE);
put(FAVOURITES_DOCUMENT_TYPE);
put(FEED_DOCUMENT_TYPE);
put(FOLDER_DOCUMENT_TYPE);
put(FeedDoc.DOCUMENT_TYPE);
put(KafkaConfigDoc.DOCUMENT_TYPE);
put(LuceneIndexDoc.DOCUMENT_TYPE);
put(KAFKA_CONFIG_DOCUMENT_TYPE);
put(LUCENE_DOCUMENT_TYPE);
put(PIPELINE_DOCUMENT_TYPE);
put(PROCESSOR_DOCUMENT_TYPE);
put(PROCESSOR_FILTER_DOCUMENT_TYPE);
put(PipelineDoc.DOCUMENT_TYPE);
put(QueryDoc.DOCUMENT_TYPE);
put(ReceiveDataRules.DOCUMENT_TYPE);
put(S3ConfigDoc.DOCUMENT_TYPE);
put(QUERY_DOCUMENT_TYPE);
put(RECEIVE_DATA_RULESET_DOCUMENT_TYPE);
put(S3_CONFIG_DOCUMENT_TYPE);
put(SCRIPT_DOCUMENT_TYPE);
put(SCYLLA_DB_DOCUMENT_TYPE);
put(SOLR_INDEX_DOCUMENT_TYPE);
put(STATE_STORE_DOCUMENT_TYPE);
put(STATISTIC_STORE_DOCUMENT_TYPE);
put(STROOM_STATS_STORE_DOCUMENT_TYPE);
put(SYSTEM_DOCUMENT_TYPE);
put(ScriptDoc.DOCUMENT_TYPE);
put(ScyllaDbDoc.DOCUMENT_TYPE);
put(SolrIndexDoc.DOCUMENT_TYPE);
put(StateDoc.DOCUMENT_TYPE);
put(StatisticStoreDoc.DOCUMENT_TYPE);
put(StroomStatsStoreDoc.DOCUMENT_TYPE);
put(TextConverterDoc.DOCUMENT_TYPE);
put(ViewDoc.DOCUMENT_TYPE);
put(VisualisationDoc.DOCUMENT_TYPE);
put(XmlSchemaDoc.DOCUMENT_TYPE);
put(XsltDoc.DOCUMENT_TYPE);
put(TEXT_CONVERTER_DOCUMENT_TYPE);
put(VIEW_DOCUMENT_TYPE);
put(VISUALISATION_DOCUMENT_TYPE);
put(XML_SCHEMA_DOCUMENT_TYPE);
put(XSLT_DOCUMENT_TYPE);
}

private static void put(final DocumentType documentType) {
Expand Down
9 changes: 2 additions & 7 deletions stroom-core-shared/src/main/java/stroom/documentation/shared/DocumentationDoc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
import stroom.docs.shared.Description;
import stroom.docstore.shared.Doc;
import stroom.docstore.shared.DocumentType;
import stroom.docstore.shared.DocumentTypeGroup;
import stroom.svg.shared.SvgImage;
import stroom.docstore.shared.DocumentTypeRegistry;
import stroom.util.shared.HasData;

import com.fasterxml.jackson.annotation.JsonCreator;
Expand All @@ -23,11 +22,7 @@
public class DocumentationDoc extends Doc implements HasData {

public static final String TYPE = "Documentation";
public static final DocumentType DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.CONFIGURATION,
TYPE,
TYPE,
SvgImage.DOCUMENT_DOCUMENTATION);
public static final DocumentType DOCUMENT_TYPE = DocumentTypeRegistry.DOCUMENTATION_DOCUMENT_TYPE;

@JsonProperty
private String documentation;
Expand Down
9 changes: 2 additions & 7 deletions stroom-core-shared/src/main/java/stroom/feed/shared/FeedDoc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
import stroom.docs.shared.Description;
import stroom.docstore.shared.Doc;
import stroom.docstore.shared.DocumentType;
import stroom.docstore.shared.DocumentTypeGroup;
import stroom.svg.shared.SvgImage;
import stroom.docstore.shared.DocumentTypeRegistry;
import stroom.util.shared.HasPrimitiveValue;
import stroom.util.shared.PrimitiveValueConverter;

Expand Down Expand Up @@ -65,11 +64,7 @@
public class FeedDoc extends Doc {

public static final String TYPE = "Feed";
public static final DocumentType DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.DATA_PROCESSING,
TYPE,
TYPE,
SvgImage.DOCUMENT_FEED);
public static final DocumentType DOCUMENT_TYPE = DocumentTypeRegistry.FEED_DOCUMENT_TYPE;

@JsonProperty
private String description;
Expand Down
9 changes: 2 additions & 7 deletions stroom-core-shared/src/main/java/stroom/index/shared/LuceneIndexDoc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
import stroom.docs.shared.Description;
import stroom.docstore.shared.Doc;
import stroom.docstore.shared.DocumentType;
import stroom.docstore.shared.DocumentTypeGroup;
import stroom.svg.shared.SvgImage;
import stroom.docstore.shared.DocumentTypeRegistry;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonInclude;
Expand Down Expand Up @@ -82,11 +81,7 @@ public class LuceneIndexDoc extends Doc {
private static final String DEFAULT_TIME_FIELD = "EventTime";

public static final String TYPE = "Index";
public static final DocumentType DOCUMENT_TYPE = new DocumentType(
DocumentTypeGroup.INDEXING,
TYPE,
"Lucene Index",
SvgImage.DOCUMENT_INDEX);
public static final DocumentType DOCUMENT_TYPE = DocumentTypeRegistry.LUCENE_DOCUMENT_TYPE;

@JsonProperty
private String description;
Expand Down
Loading

0 comments on commit a88fd39

Please sign in to comment.