From de91234ed630d619bd986dc4daa50409f4261366 Mon Sep 17 00:00:00 2001 From: Neelesh Thakur Date: Mon, 12 Jul 2021 21:21:18 -0500 Subject: [PATCH 1/5] enable indexing of audit attributes --- pom.xml | 2 +- .../common/model/indexer/RecordIndexerPayload.java | 6 ++++++ .../osdu/core/common/model/indexer/Records.java | 4 ++++ .../common/model/search/RecordMetaAttribute.java | 12 ++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 246217d..d497c2c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.opengroup.osdu os-core-common - 0.10.0-SNAPSHOT + 0.10.0-AUDIT-SNAPSHOT jar diff --git a/src/main/java/org/opengroup/osdu/core/common/model/indexer/RecordIndexerPayload.java b/src/main/java/org/opengroup/osdu/core/common/model/indexer/RecordIndexerPayload.java index 08b19d6..f22d0dd 100644 --- a/src/main/java/org/opengroup/osdu/core/common/model/indexer/RecordIndexerPayload.java +++ b/src/main/java/org/opengroup/osdu/core/common/model/indexer/RecordIndexerPayload.java @@ -39,7 +39,9 @@ public class RecordIndexerPayload { public static class Record { private String id; private String kind; + private String authority; private String namespace; + private String source; private String type; private OperationType operationType; private long version; @@ -48,6 +50,10 @@ public class RecordIndexerPayload { private IndexProgress indexProgress; private Legal legal; private RecordAncestry ancestry; + private String createUser; + private String createTime; + private String modifyUser; + private String modifyTime; private Map data; @JsonIgnore private boolean schemaMissing = false; diff --git a/src/main/java/org/opengroup/osdu/core/common/model/indexer/Records.java b/src/main/java/org/opengroup/osdu/core/common/model/indexer/Records.java index 1faed23..7eaab2f 100644 --- a/src/main/java/org/opengroup/osdu/core/common/model/indexer/Records.java +++ b/src/main/java/org/opengroup/osdu/core/common/model/indexer/Records.java @@ -66,6 +66,10 @@ public class Records { private Map tags; private Legal legal; private RecordAncestry ancestry; + private String createUser; + private String createTime; + private String modifyUser; + private String modifyTime; private Map data; private List meta; } diff --git a/src/main/java/org/opengroup/osdu/core/common/model/search/RecordMetaAttribute.java b/src/main/java/org/opengroup/osdu/core/common/model/search/RecordMetaAttribute.java index 2cba5ea..00b2ac4 100644 --- a/src/main/java/org/opengroup/osdu/core/common/model/search/RecordMetaAttribute.java +++ b/src/main/java/org/opengroup/osdu/core/common/model/search/RecordMetaAttribute.java @@ -23,6 +23,10 @@ public enum RecordMetaAttribute { KIND("kind"), + AUTHORITY("authority"), + + SOURCE("source"), + NAMESPACE("namespace"), TYPE("type"), @@ -39,6 +43,14 @@ public enum RecordMetaAttribute { ANCESTRY("ancestry"), + CREATE_USER("createUser"), + + MODIFY_USER("modifyUser"), + + CREATE_TIME("createTime"), + + MODIFY_TIME("modifyTime"), + INDEX_STATUS("index"); private final String value; -- GitLab From b98bb644b169d43fdc42cee4aadb3efba94ca979 Mon Sep 17 00:00:00 2001 From: Neelesh Thakur Date: Thu, 15 Jul 2021 09:23:15 -0500 Subject: [PATCH 2/5] add constant_keyword type --- .../opengroup/osdu/core/common/model/indexer/ElasticType.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/opengroup/osdu/core/common/model/indexer/ElasticType.java b/src/main/java/org/opengroup/osdu/core/common/model/indexer/ElasticType.java index 04b759b..81f1dc5 100644 --- a/src/main/java/org/opengroup/osdu/core/common/model/indexer/ElasticType.java +++ b/src/main/java/org/opengroup/osdu/core/common/model/indexer/ElasticType.java @@ -20,6 +20,8 @@ public enum ElasticType { KEYWORD("keyword"), + CONSTANT_KEYWORD("constant_keyword"), + TEXT("text"), DATE("date"), -- GitLab From fa9b2d04433075d0062309469623bc832a9009c1 Mon Sep 17 00:00:00 2001 From: Neelesh Thakur Date: Thu, 15 Jul 2021 09:35:54 -0500 Subject: [PATCH 3/5] update NOTICE --- NOTICE | 6 +++--- pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index 36c6342..f408fc3 100644 --- a/NOTICE +++ b/NOTICE @@ -18,7 +18,7 @@ The following software have components provided under the terms of this license: - Apache Log4j API (from ) - Apache Log4j to SLF4J Adapter (from ) - Bean Validation API (from http://beanvalidation.org) -- Byte Buddy (without dependencies) (from ) +- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Byte Buddy Java agent (from ) - ClassMate (from http://github.com/cowtowncoder/java-classmate) - Elastic JNA Distribution (from https://github.com/java-native-access/jna) @@ -39,7 +39,7 @@ The following software have components provided under the terms of this license: - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-dataformat-Smile (from http://github.com/FasterXML/jackson-dataformat-smile) -- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson) +- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-datatype-jdk8 (from ) - Jackson-module-parameter-names (from ) - Jakarta Bean Validation API (from https://beanvalidation.org) @@ -325,7 +325,7 @@ unknown ======================================================================== The following software have components provided under the terms of this license: -- Byte Buddy (without dependencies) (from ) +- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy) - Checker Qual (from https://checkerframework.org) - JUnit (from http://junit.org) - System Rules (from http://stefanbirkner.github.io/system-rules/) diff --git a/pom.xml b/pom.xml index d497c2c..246217d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.opengroup.osdu os-core-common - 0.10.0-AUDIT-SNAPSHOT + 0.10.0-SNAPSHOT jar -- GitLab From db84540eaedba2758db818139208b70377c5f450 Mon Sep 17 00:00:00 2001 From: NThakur4 Date: Mon, 26 Jul 2021 12:19:44 -0500 Subject: [PATCH 5/5] NOTCIE --- NOTICE | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/NOTICE b/NOTICE index 4774084..dbce76d 100644 --- a/NOTICE +++ b/NOTICE @@ -8,7 +8,7 @@ Apache-2.0 The following software have components provided under the terms of this license: - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) -- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/) +- Apache Commons Lang (from https://commons.apache.org/proper/commons-lang/) - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient) - Apache HttpClient (from http://hc.apache.org/httpcomponents-client) @@ -37,8 +37,8 @@ The following software have components provided under the terms of this license: - Jackson dataformat: Smile (from http://github.com/FasterXML/jackson-dataformats-binary) - Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310) - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) -- Jackson-annotations (from http://wiki.fasterxml.com/JacksonHome) -- Jackson-core (from http://wiki.fasterxml.com/JacksonHome) +- Jackson-annotations (from http://github.com/FasterXML/jackson) +- Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Jakarta Bean Validation API (from https://beanvalidation.org) @@ -70,14 +70,6 @@ The following software have components provided under the terms of this license: - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - SnakeYAML (from http://code.google.com/p/snakeyaml/) -- Spring Boot (from http://projects.spring.io/spring-boot/) -- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/) -- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json) -- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Validation Starter (from http://projects.spring.io/spring-boot/) -- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/) - Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework) - Spring Framework: AOP (from http://www.springframework.org) @@ -97,7 +89,7 @@ The following software have components provided under the terms of this license: - elasticsearch-x-content (from https://github.com/elastic/elasticsearch) - error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations) - io.grpc:grpc-context (from https://github.com/grpc/grpc-java) -- jackson-databind (from http://wiki.fasterxml.com/JacksonHome) +- jackson-databind (from http://github.com/FasterXML/jackson) - javax.inject (from http://code.google.com/p/atinject/) - lang-mustache (from https://github.com/elastic/elasticsearch) - lettuce (from http://github.com/mp911de/lettuce/wiki) @@ -112,10 +104,18 @@ The following software have components provided under the terms of this license: - rest-high-level (from https://github.com/elastic/elasticsearch) - rxjava (from https://github.com/ReactiveX/RxJava) - server (from https://github.com/elastic/elasticsearch) +- spring-boot (from https://spring.io/projects/spring-boot) +- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot) +- spring-boot-starter (from https://spring.io/projects/spring-boot) +- spring-boot-starter-json (from https://spring.io/projects/spring-boot) +- spring-boot-starter-logging (from https://spring.io/projects/spring-boot) +- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot) +- spring-boot-starter-validation (from https://spring.io/projects/spring-boot) +- spring-boot-starter-web (from https://spring.io/projects/spring-boot) - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations) - swagger-jaxrs (from ) - tomcat-embed-core (from http://tomcat.apache.org/) -- tomcat-embed-websocket (from http://tomcat.apache.org/) +- tomcat-embed-websocket (from https://tomcat.apache.org/) ======================================================================== BSD-2-Clause -- GitLab