Commit Graph
138 Commits
Author SHA1 Message Date
Drew Farris 0df636728d Fix JAXB serialization of tag cloud markings (#4000) 2026-10-14 01:52:55 +00:00
Moriarty a4fc3e3b22 Migrate web services client tests to JUnit 5 (#3998) 2026-10-13 13:36:24 +00:00
Laura SchannoandMoriarty bd25e04589 Improve thread-safety of QueryUncaughtExceptionHandler (#3832)
Make the following changes to improve the thread-safety of
QueryUncaughtExceptionHandler, and add test coverage.
- Generate a sequence for each call to uncaughtException() to help
ensure the first call with a non-null Throwable wins the race,
regardless of which thread's CAS operation completes first.
- In uncaughtException(), atomically update the sequence number, thread,
and throwable at the same time.
- Use an efficient, thread-safe collection for storing and retrieving
messages.

---------

Co-authored-by: Moriarty <[email protected]>
2026-08-24 11:28:57 +00:00
Joseph AlphonsoandJoe Alphonso 336293cafc Replace Markings Map with POJO (#3469)
update accumulo-utils to use a POJO for storing markings and then
updated the rest of the codebase that referenced it.
replaced some of the ColumnVisibility usage with AccessExpression to
improve performance.

---------

Co-authored-by: Joe Alphonso <[email protected]>
2026-06-12 15:25:43 -04:00
Moriarty e683328812 Remove UserAuthorizationsTest from web-services/client module. (#3519)
- remove UserAuthorizationsTest from web-services/client module. This
was the only test using PowerMock.
- the test was duplicated from core/base-rest-responses. The test in
base-rest-responses uses proper reflection without PowerMock.
2026-04-20 08:34:03 +00:00
17dcaa7d14 Replace Charset.forName("UTF-8") with StandardCharsets.UTF_8 (#3314)
## Summary
- Replace `Charset.forName("UTF-8")` with `StandardCharsets.UTF_8`
across 15 files
- `StandardCharsets.UTF_8` is more efficient (no lookup overhead) and
safer (no runtime exception)

## Files Changed
- `core/map-reduce/.../BulkResultsFileOutputMapper.java`
- `core/metrics-reporter/.../StatsDClient.java`
- `core/utils/accumulo-utils/.../ColumnVisibilityHelper.java`
- `core/utils/type-utils/.../OptionallyEncodedString.java`
- `core/utils/type-utils/.../TypedValue.java`
- `microservices/.../ReferencedValue.java`
- `microservices/.../QueryMetricHandlerProperties.java`
- `microservices/.../ShardTableQueryMetricHandler.java`
- `warehouse/query-core/.../QueryStatsDClient.java`
- `warehouse/query-core/.../EventQueryTransformer.java`
- `warehouse/query-core/src/test/.../CreateUidsIteratorTest.java`
- `warehouse/query-core/src/test/.../RemoteEdgeQueryLogicHttpTest.java`
- `warehouse/query-core/src/test/.../RemoteQueryServiceTestUtil.java`
- `web-services/client/.../AbstractHtmlProviderMessageBodyWriter.java`
-
`web-services/security/src/test/.../RemoteUserOperationsImplHttpTest.java`

Fixes #3313
Part of #2443

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 4.5 <[email protected]>
Co-authored-by: foster33 <[email protected]>
2026-01-09 18:06:08 +00:00
d7df805e14 Version7.29 loe1 rebase int (#3306)
Co-authored-by: Drew Farris <[email protected]>
Co-authored-by: alerman <[email protected]>
Co-authored-by: FineAndDandy <[email protected]>
Co-authored-by: Joseph Alphonso <[email protected]>
Co-authored-by: Joe Alphonso <[email protected]>
Co-authored-by: hgklohr <[email protected]>
2025-12-15 15:40:50 +00:00
Seth Smucker d506412760 Replace deprecated Date(String) constructor (#3301)
## Summary
Replace deprecated `Date(String)` constructor with `Date(long)`.

The `Date(String)` constructor has been deprecated since JDK 1.1.

## Changes
```java
// Before
@SuppressWarnings("deprecation")
private Date parseDateCheck = new Date("Sun Aug 7 00:00:00 GMT 2016");

// After
// Aug 7, 2016 00:00:00 GMT (same as accumuloDate)
private Date parseDateCheck = new Date(1470528000000L);
```

## Files Changed
- `QueryParametersTest.java` - 1 change

Fixes #3300
Part of #2443
2025-12-10 16:41:01 +00:00
Bill Oley 941c72b565 Remove MapReduce API from the webservice (#3231) 2025-10-28 17:48:19 +00:00
Drew Farris 09b9db1e77 Adds KeywordUUIDQuery and TagCloudResponse (#2857)
* Adds KeywordUUIDQuery that pairs id lookup with keyword extraction.
  * Creates a chained query logic that first does lookup uuid, followed by document keyword extraction.
  * Adds the ability to generate a word cloud across all keyword results, currently stored in messages portion of the response.
* Adds Datawave TagCloudResponse and supporting classes.
  * Adds two endpoints to /DataWave/Query - /extractKeywords and /generateTagCloud - each take a POST request and return keywords from individual documents or consolidated tag coluds, respectively.
  * Adds response type for /generateTagCloud, the TagCloudResponseBase and accompanying data classes.
  * Updates chained query and improves serialization of objects returned from iterators.
* Addressed formatting, review comments, and completed bugfix.
2025-05-20 21:23:03 +00:00
01bdae3c4b Task/sync util versions (#2815)
* Formatting diffs

* formatter and import cleanup

* Pulled utils into main versioning scheme
* Changed the package from gov.nsa.datawave.micreoservice to gov.nsa.datawave.core
* Pulled in the following modules:
  1. type-utils
  2. accumulo-utils
  3. metadata-utils
  4. common-utils
  5. base-rest-responses

* Update version

* consistent accumulo-utils version

* Changed core packaged to gov.nsa.datawave.core and to the latest
versions

* GitHub Actions: Fix Formatting

* pom formatting

* Spotbugs fix

* Updated re spotbugs

* fixed package names for util packages

* Updated package

* Explicit metadata-utils version

* GitHub Actions: Fix Formatting

* formatting

* Updated everything to the same protobuf version that we deploy.
Regenerated protobufs with the same version as well.

* Advance pom version of dictionary service to next snapshot

* a little test debug

* GitHub Actions: Fix Formatting

* Merge conflicts

* Remove invalid javadoc elements

* Updated to next snapshot version

* merge conflict fix

---------

Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: Dylan <[email protected]>
2025-05-14 11:56:43 +00:00
6ed6767754 fix build warning messages (#2277)
* fix build warning messages

* remove unused import java.util.Collections

* remove unused import java.util.List

* removed unused imports

* remove unused import

* assertEquals -> assertTrue/False for true/false as appopriate

* fixed ide being helpful and making a * import

* no * imports

* undo tokenization changes. fix tokenization helper import

* GitHub Actions: Fix Formatting

* add missing import

* add Deprecated annotation to match Javadoc

---------

Co-authored-by: Christopher Gross cogross <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: Joe Alphonso <[email protected]>
2025-04-04 17:01:14 +00:00
P.A.andAdam Lerman 86350b2e79 Converting strs to chars on lastIndexOf (#2782)
* Converting strs to chars on lastIndexOf

* Removing test annotation

* Disabled for Junit5 has replaced ignore

* Formatting for MetadataHelper

---------

Co-authored-by: Adam Lerman <[email protected]>
2025-03-17 17:02:43 +00:00
FineAndDandy 5bc65f6e40 Prevent unused imports at compile time (#2769) (#2770)
* Enforce checkstyle at compile time and error on unused import (#2769)

* Remove unused imports (#2769)
2025-02-19 17:18:46 +00:00
97763894a1 Implement query validation endpoint (#2645)
* Implement query validation endpoint

Implement the query/{logicName}/validate endpoint. This feature supports
the ability to configure validation rules that will validate LUCENE and
JEXL queries against a number of criteria and provide meaningful
feedback to customers.

Closes #2585

---------

Co-authored-by: Seth Smucker <[email protected]>
Co-authored-by: Ivan Bella <[email protected]>
2025-01-16 14:00:31 -05:00
Bill Oley c5a0f3a872 DATAWAVE-1666: Use query-metric-api 4.0.1, use QueryGeometryResponse … (#2402)
* DATAWAVE-1666: Use QueryGeometryResponse from query-metric-api, use redirect for remote query metric GET calls

* Code formatting fixes
2024-06-05 12:58:32 -04:00
9dadf7b2c6 Feature/query microservices (#2192)
* Modified a couple of things and fixed a few tests with the integration merge.

* pulling in latest audit changes

* pulled in latest audit updates

* Fixed metrics version in docker compose

* Updated accumulo utils and datawave starter versions.

* Updated the audit api and audit starter versions

* Updated authorization api version

* Updated accumulo api version.

* Updated config service with latest changes

* updated dictionary and accumulo utils version

* Updated hazelcast version

* bumped query metric api version

* Updated pki for query microservices docker deployment.

* Fixing the docker compose bootstrap to avoid duplicate extra hosts issue.

* adding latest datawave changes

* updated metadata utils

* updated docker compose to use the latest version of each service.

* Added a cached results spring boot starter and updated associated classes accordingly.

* fixing spotbugs error

* fixed install-ingest.sh for datawave.

* Updates to get bulk results map reduce query working again.

* formatting

* Updates per a race condition discovered in the kafka variant of the
query executor tests.

* Update README.md

* accumulo service merge from main

* fixed a test that broke after merging integration

* Added logic from Datawave Principal Login Module to the datawave spring boot starter.

* Updated datawave to 5.4.0-SNAPSHOT

* Updated ProxiedUserDetails to use dynamic type for newInstance method.

* updated audit service to stop intermittent test failures.

* Updated the query results publisher and setup the kafka manager to create topics manually.

* Added github actions for some submodules

* Updated github actions to avoid running out of disk space.

* Updated import sorting for microservices using impsort plugin.

* fixing merge conflicts

* updated metadata utils

* Moved Query, QueryImpl to query-api

* Removed usage of zookeeper stringutils

* added package-info.java for Query, QueryImpl

* updated modification service logic to use ProxiedUserDetails.

* Removed unnecessary jackson annotations to address enunciate issues

* Updated profile ids for submodules

* changes to get the github actions working again

* attempting to fix github actions

* typo

* udpated kafka config

* removed banned dependency

* bumped release version

* formatting

* fixing docker compose kafka setup

* updated deploy poms to work with the latest version of maven

* bumped version for some modules

* bumped microservice service parent version

* Updated with latest changes from main/integration

* fixed the composite query logic for the query microservices

* updated submodules

* Added v1 to the model path

* For this branch we need to checkout all submodules when building tests.

* Added alerman's run cache settings for docker

* Updated github actions to build query microservices correctly

* fixed build cache config typo

* Updated query service to use pool header, and allow for admin override via parameter

* Updated github ci to make sure it runs against the queryMicroservices branch

* Updated lookup uuid to accept multiple terms per field

* Updated confirm ack configuration for query metric service, and added configuration to make rest metrics updates possible

* Added support for long running queries

* Added configcheck command line utility

* updated next call logic for long running queries

* updated query metric service and starter submodules

* Added some plugins to the config check service

* Updated configcheck tests to trim whitespace

* fixing unit tests for config check

* Changed from max long running query timeouts to long running query
timeout

* Updated the query starter submodule

* updated submodules

* fixed composite query logic test

* Refactored query scripts to use common code

* Updated quickstart docker-maven-plugin to not cleanup old tagged releases

* updated common-utils submodule

* Updated LookupService to behave the same as the webservice

* Fixed TypedValue (de)serialization, and added a result post processor to handle things like counts

* reset docker-compose quickstart to just be accumulo, not web

* Changed how the result postprocessor runs to support result aggregation for long running queries

* Renamed aggregateResults to reduceResults

* Added junit-jupiter engine to datawave core pom

* Updated query logic factory to add logic map

* Updated EdgeQueryLogicFactory configuration

* Removed unused RemoteQueryLogic and cleaned up RemoteEventQueryLogic class definition:

* Implemented authorization and query federation for the query microservices

* Fixed copy constructor parameter assignment in QueryData

* Formatting job fix

* Fixing build/formatter issues for latest changes pulled in from integration

* Fixed SSDeepIngestQueryTest

* Updated usage of remote user operations for query microservices

* Fixed QueryPlan constructor

* Moved filtering and delegating query logic functionality into datawave-core-query so it can be used by the microservices

* formatting

* Updated submodules

* Updated package names for commons.lang3 classes due to type-utils fix

* Moved the AuthorizationsPredicate class to authorization-api

* Removed hadoop dependencies from pom

* Updated edge configuration to reset param variables before loading new values

* Excluded log4j from our maven plugins

* Updated in-memory-accumulo javadoc plugin to exclude log4j

* Updated microservice-parent maven-dependency-plugin to exclude log4j

* Removed infinispan from query starter

* Remove validation call from LoadModel

* fixed formatting

* Updated datawave ingest jar libs

* QueryMetricQueryLogic must copy runAsMetricsAdministrator setting in copy constructor

* Revert query metric query logic back to it's original state

* pr feedback

* PR feedback

* PR Feedback

* PR feedback

* PR Feedback

* PR feedback

* PR feedback

* PR Feedback

* PR Feedback

* PR feedback

* PR feedback

* PR feedback

* pr feedback

* PR feedback

* pr feedback

* pr feedback

* pr feedback

* pr feedback

* pr feedback

* pr feedback

* PR feedback

* PR feedback

* pr feedback

* pr feedback

* Updated in-memory-accumulo commit

* in-memory-accumulo

* formatting

* query starter

* pr feedback

* pr feedback

* pr feedback

* pr feedback

* pr feedback

* pr feedback

* pr feedback

* Remoted CachedQueryStatus mechanism

* pr feedback

* pr feedback

* pr feedback

* pr feedback

* pr updates

* pr feedback

* pr review: found duplicate properties between configurations and the
super GenericQueryConfiguration class.  Removed redundant copies in
ShardQueryConfiguration checkpoint copy constructor

* review comments

* review comments

* Reverted path changes in dictionary service

* pr review updates

* updated executor to use QueryStatusUpdateUtil

* updated query microservice submodule

* make github action tests match integration

---------

Co-authored-by: Ivan Bella <[email protected]>
Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: Bill Oley <[email protected]>
2024-05-20 16:33:34 +00:00
Christopher GrossandChristopher Gross cogross 938cb8d890 #2226 - fix javadoc warnings (#2232)
* fix javadoc warnings

---------

Co-authored-by: Christopher Gross cogross <[email protected]>
2024-02-14 10:43:07 -05:00
Moon Moonandpalindrome 5195bc0bf0 Remove outdated verbiage (#1952)
* Updating removal of outdated terms

* Updating more outdated terms

* More verbiage changes

* A few more replacements

* Formatting

* Changing to check set contents instead of string comparison

* Removing unintended fat finger

* Undoing cr and whitespace

* Removing more breaking whitespace

* Removing unnecessary whitespace changes

* Reverting unnecessary whitespace changes

* Fixing botched conflict resolution

* More resolution fixing

* Adjusting formatting to avoid merge conflicts

* Updating pom override

* Fixing merge conflicts and formatting

* Updating based on team feedback

* Formatting

* Formatting

* Fixing botched rebase

---------

Co-authored-by: palindrome <[email protected]>
2023-11-27 13:38:22 -05:00
Whitney O'Meara fd127d6b0d Merge remote-tracking branch 'origin/integration' into feature/spring-boot-2.x-accumulo-2.1 2023-09-13 14:51:13 -04:00
Ivan Bella 845fb4a9de Merge branch 'release/version5.8' into integration 2023-07-26 20:32:02 +00:00
Ivan Bella eac2e6f7f4 re #2008: Refactored to create generic query model field attributes
* lenient is now the default for fields
* added a strict query property marker
* Refactor JexlNodeFactory.createNodeTreeFromPairs to live in QueryModelVisitor
2023-07-26 16:54:55 +00:00
Drew Farris 97b22efa33 Merge version release/3.41, release/5.2 and release/5.8 to integration (#2035) 2023-07-13 13:17:37 -04:00
Drew Farris 51aeb2d83b Merge version 3.41 and 5.2 up to 5.8 (#2034) 2023-07-13 09:42:16 -04:00
Whitney O'Meara 36281a166a Merge remote-tracking branch 'origin/integration' into feature/spring-boot-2.x-accumulo-2.1 2023-06-26 15:56:59 -04:00
P.Aandpcagbu ebdbc40da8 Running sort import plugin on repo (#1999)
* Running sort import pluggin on repo

* Adding impsort to auto build process

---------

Co-authored-by: pcagbu <[email protected]>
2023-06-26 06:50:53 -04:00
Whitney O'Meara 83f382e424 Merge remote-tracking branch 'origin/integration' into feature/spring-boot-2.x-accumulo-2.1 2023-06-22 12:24:15 -04:00
Ivan Bella 8737c1b35a re #1708: Updated the query model visitor to verify regex normalizations (#1765)
* If a subset of the model forward mappings cannot be normalized
  (regex only), then they will be marked as ignored.
* Removed some redundant calls in the query model visitor
* Fixed some bad logic relative to applying model to methods
  and ensuring noExpansion fields are appropriately applied.
* Added IgnoredExpression property marker
* Updated to use the lenient model mappings in the Query Model
* When expanding query model, mappings that were derived from a
  lenient model mapping are marked with a LenientExpression marker
* Refacted a few classes into the metadata-utils project
* Added additional functions, and worked through no expansion
  test cases (fixes required due to refactoring)
* added lenient and scrict query parameters
* updated query model visitor to look at configured lenient/scrict
* updated normalization expansion visitor as well
* Updated to apply lenient and strict modes to all normalizations
  (not just regex)
* Renamed IgnoredExpression to DroppedExpression
  (overloaded "ignore" concept with RangeStream)
* Added a reason assignment to the DroppedExpression
* Updated to drop lenient markers after expanding normalizers
* Handle the case where all fields fail all normalizations
* Updated intepreter to not evaluation assignments
* Updated query model visitor to avoid dropping methods/funcs
* Updated tests to appropriately evaluation results.
2023-06-22 08:44:06 -04:00
Moon Moonandkeith-ratcliffe 8cdc655236 Updating formatter version and formatting all code (#1988)
* Updating formatter version and formatting all code

* Re: #1986
- restores alerman's original javadoc formatting
- captures additional files only included by certain build profiles

* Updating to 2.18.0

* Updating formatting after conflict fixing

---------

Co-authored-by: keith-ratcliffe <[email protected]>
2023-06-14 10:52:32 -04:00
Whitney O'Meara cb415b1f7f Merge remote-tracking branch 'origin/integration' into feature/spring-boot-2.x-accumulo-2.1 2023-05-24 09:53:20 -04:00
971f9c9e1a updated deprecated newInstance calls (#1950)
Co-authored-by: tom <[email protected]>
Co-authored-by: Keith Ratcliffe <[email protected]>
Co-authored-by: hgklohr <[email protected]>
2023-05-19 12:31:51 -04:00
Whitney O'Meara c3fdcd11a5 Merge remote-tracking branch 'origin/integration' into feature/spring-boot-2.x-accumulo-2.1 2023-05-02 13:26:06 -04:00
Whitney O'Meara 108b9c0282 Update response types to treat empty result lists as null. 2023-04-27 11:24:46 -04:00
Whitney O'Meara c0a2e34309 Moved Direction, FieldMapping, and ModelKeyParser to metadata-utils. 2023-03-17 10:25:02 -04:00
Whitney O'Meara fd5f3240c2 Moved DnList and a few tests to base-rest-responses 2023-03-16 12:55:06 -04:00
Whitney O'Meara c5f662c6dd Merge remote-tracking branch 'origin/feature/spring-boot-2.x' into feature/sprig-boot-2.x-accumulo-2.1 2023-03-14 11:12:50 -04:00
Whitney O'Meara 80c547024e Fixed enunciate docs build by removing extra package-info classes. 2023-03-14 11:09:39 -04:00
Whitney O'Meara c91b3f1bef Merge branch 'feature/spring-boot-2.x' into feature/spring-boot-2.x-accumulo-2.1 2023-03-10 19:36:46 -05:00
Whitney O'Meara b5dc75eaea removed duplicate classes now located in base-rest-responses 2023-03-10 19:27:39 -05:00
Whitney O'Meara 5bc5782766 Merge remote-tracking branch 'origin/release/version5.1' into feature/spring-boot-2.x 2023-03-10 14:04:13 -05:00
Whitney O'Meara 561ab943eb Updated to use the latest microservice api versions. 2023-03-07 13:18:11 -05:00
keith-ratcliffe 0b4beb193d Merge tag '3.40.0' of https://github.com/NationalSecurityAgency/datawave into release/version5.1
3.40.0

Conflicts:
	common-test/pom.xml
	contrib/datawave-quickstart/bin/services/accumulo/bootstrap.sh
	contrib/datawave-quickstart/bin/services/hadoop/bootstrap.sh
	docs/pom.xml
	pom.xml
	warehouse/assemble/datawave/pom.xml
	warehouse/assemble/pom.xml
	warehouse/assemble/webservice/pom.xml
	warehouse/balancers/pom.xml
	warehouse/common/pom.xml
	warehouse/core/pom.xml
	warehouse/core/src/main/java/datawave/ingest/data/config/ingest/AccumuloHelper.java
	warehouse/data-dictionary-core/pom.xml
	warehouse/edge-dictionary-core/pom.xml
	warehouse/edge-model-configuration-core/pom.xml
	warehouse/index-stats/pom.xml
	warehouse/ingest-configuration/pom.xml
	warehouse/ingest-core/pom.xml
	warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/MultiRFileOutputFormatter.java
	warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/ShardedTableMapFile.java
	warehouse/ingest-core/src/main/java/datawave/ingest/mapreduce/job/TableConfigurationUtil.java
	warehouse/ingest-csv/pom.xml
	warehouse/ingest-json/pom.xml
	warehouse/ingest-nyctlc/pom.xml
	warehouse/ingest-scripts/pom.xml
	warehouse/ingest-scripts/src/main/resources/bin/ingest/generate-accumulo-config-cache.sh
	warehouse/ingest-wikipedia/pom.xml
	warehouse/metrics-core/pom.xml
	warehouse/ops-tools/config-compare/pom.xml
	warehouse/ops-tools/index-validation/pom.xml
	warehouse/ops-tools/pom.xml
	warehouse/pom.xml
	warehouse/query-core/pom.xml
	warehouse/query-core/src/main/java/datawave/query/jexl/visitors/PruneLessSelectiveFieldsVisitor.java
	warehouse/query-core/src/test/java/datawave/query/index/lookup/RangeStreamTest.java
	warehouse/query-core/src/test/java/datawave/query/jexl/visitors/QueryPruningVisitorTest.java
	warehouse/regression-testing/pom.xml
	web-services/accumulo/pom.xml
	web-services/atom/pom.xml
	web-services/cached-results/pom.xml
	web-services/client/pom.xml
	web-services/common-util/pom.xml
	web-services/common/pom.xml
	web-services/common/src/main/java/datawave/webservice/common/connection/AccumuloConnectionFactoryBean.java
	web-services/deploy/application/pom.xml
	web-services/deploy/application/src/main/wildfly/overlay/modules/org/apache/hadoop/common/main/module.xml
	web-services/deploy/configuration/pom.xml
	web-services/deploy/docs/pom.xml
	web-services/deploy/pom.xml
	web-services/deploy/spring-framework-integration/pom.xml
	web-services/dictionary/pom.xml
	web-services/examples/client-login/pom.xml
	web-services/examples/http-client/pom.xml
	web-services/examples/jms-client/pom.xml
	web-services/examples/pom.xml
	web-services/examples/query-war/pom.xml
	web-services/map-reduce-embedded/pom.xml
	web-services/map-reduce-status/pom.xml
	web-services/map-reduce/pom.xml
	web-services/model/pom.xml
	web-services/modification/pom.xml
	web-services/pom.xml
	web-services/query-websocket/pom.xml
	web-services/query/pom.xml
	web-services/query/src/main/java/datawave/webservice/query/runner/QueryExecutorBean.java
	web-services/query/src/test/java/datawave/webservice/query/runner/ExtendedQueryExecutorBeanTest.java
	web-services/rest-api/pom.xml
	web-services/security/pom.xml
	web-services/web-root/pom.xml
2023-03-02 15:48:41 +00:00
keith-ratcliffe 2861b79c23 Merge tag '3.32.16' of https://github.com/NationalSecurityAgency/datawave into release/version5.0
Conflicts:
	common-test/pom.xml
	docs/pom.xml
	pom.xml
	warehouse/assemble/datawave/pom.xml
	warehouse/assemble/pom.xml
	warehouse/assemble/webservice/pom.xml
	warehouse/balancers/pom.xml
	warehouse/common/pom.xml
	warehouse/core/pom.xml
	warehouse/data-dictionary-core/pom.xml
	warehouse/edge-dictionary-core/pom.xml
	warehouse/edge-model-configuration-core/pom.xml
	warehouse/index-stats/pom.xml
	warehouse/ingest-configuration/pom.xml
	warehouse/ingest-core/pom.xml
	warehouse/ingest-csv/pom.xml
	warehouse/ingest-json/pom.xml
	warehouse/ingest-nyctlc/pom.xml
	warehouse/ingest-scripts/pom.xml
	warehouse/ingest-wikipedia/pom.xml
	warehouse/metrics-core/pom.xml
	warehouse/ops-tools/config-compare/pom.xml
	warehouse/ops-tools/index-validation/pom.xml
	warehouse/ops-tools/pom.xml
	warehouse/pom.xml
	warehouse/query-core/pom.xml
	warehouse/regression-testing/pom.xml
	web-services/accumulo/pom.xml
	web-services/atom/pom.xml
	web-services/cached-results/pom.xml
	web-services/client/pom.xml
	web-services/common-util/pom.xml
	web-services/common/pom.xml
	web-services/deploy/application/pom.xml
	web-services/deploy/configuration/pom.xml
	web-services/deploy/docs/pom.xml
	web-services/deploy/pom.xml
	web-services/deploy/spring-framework-integration/pom.xml
	web-services/dictionary/pom.xml
	web-services/examples/client-login/pom.xml
	web-services/examples/http-client/pom.xml
	web-services/examples/jms-client/pom.xml
	web-services/examples/pom.xml
	web-services/examples/query-war/pom.xml
	web-services/map-reduce-embedded/pom.xml
	web-services/map-reduce-status/pom.xml
	web-services/map-reduce/pom.xml
	web-services/model/pom.xml
	web-services/modification/pom.xml
	web-services/pom.xml
	web-services/query-websocket/pom.xml
	web-services/query/pom.xml
	web-services/query/src/main/java/datawave/webservice/query/logic/composite/CompositeQueryLogic.java
	web-services/query/src/main/java/datawave/webservice/query/runner/QueryExecutorBean.java
	web-services/query/src/test/java/datawave/webservice/query/logic/composite/CompositeQueryLogicTest.java
	web-services/query/src/test/java/datawave/webservice/query/runner/ExtendedQueryExecutorBeanTest.java
	web-services/rest-api/pom.xml
	web-services/security/pom.xml
	web-services/web-root/pom.xml
2023-02-24 23:01:47 +00:00
Ivan Bella 868af3e38b Merge branch 'release/version3.32' into integration 2023-02-23 18:51:49 +00:00
Ivan Bella b1042c9336 Feature/federate user operations (#1825)
* re #1821: Added a remote user operations implementation
  * Updated the authorization mechanisms to validate against the overall
     user (which may include the remote authorizations) and then the reduce
     by the query authorizations.  This allows the auths returned by the list
     effective authorizations which include remote auths to be used for local
     query logics as well.
  * Added optional flag to the listEffectiveAuthorizations avoid federation
  * Updated Query to now know about a remote user operations
  * logics will use the remote user operation if set for query auths
  * Composite Query Logic will recalculate query auths for each logic
  * Added test cases for new classes and integration tests
  * Updated test cases to handle new query logic getUserOperations call
2023-02-23 13:35:10 -05:00
keith-ratcliffe 5c3750e50b Merge tag '3.32.15' of https://github.com/NationalSecurityAgency/datawave into release/version5.0
3.32.15

Conflicts:
	common-test/pom.xml
	docs/pom.xml
	pom.xml
	warehouse/assemble/datawave/pom.xml
	warehouse/assemble/pom.xml
	warehouse/assemble/webservice/pom.xml
	warehouse/balancers/pom.xml
	warehouse/common/pom.xml
	warehouse/core/pom.xml
	warehouse/data-dictionary-core/pom.xml
	warehouse/edge-dictionary-core/pom.xml
	warehouse/edge-model-configuration-core/pom.xml
	warehouse/index-stats/pom.xml
	warehouse/ingest-configuration/pom.xml
	warehouse/ingest-core/pom.xml
	warehouse/ingest-csv/pom.xml
	warehouse/ingest-json/pom.xml
	warehouse/ingest-nyctlc/pom.xml
	warehouse/ingest-scripts/pom.xml
	warehouse/ingest-wikipedia/pom.xml
	warehouse/metrics-core/pom.xml
	warehouse/ops-tools/config-compare/pom.xml
	warehouse/ops-tools/index-validation/pom.xml
	warehouse/ops-tools/pom.xml
	warehouse/pom.xml
	warehouse/query-core/pom.xml
	warehouse/regression-testing/pom.xml
	web-services/accumulo/pom.xml
	web-services/atom/pom.xml
	web-services/cached-results/pom.xml
	web-services/client/pom.xml
	web-services/common-util/pom.xml
	web-services/common/pom.xml
	web-services/deploy/application/pom.xml
	web-services/deploy/configuration/pom.xml
	web-services/deploy/docs/pom.xml
	web-services/deploy/pom.xml
	web-services/deploy/spring-framework-integration/pom.xml
	web-services/dictionary/pom.xml
	web-services/examples/client-login/pom.xml
	web-services/examples/http-client/pom.xml
	web-services/examples/jms-client/pom.xml
	web-services/examples/pom.xml
	web-services/examples/query-war/pom.xml
	web-services/map-reduce-embedded/pom.xml
	web-services/map-reduce-status/pom.xml
	web-services/map-reduce/pom.xml
	web-services/model/pom.xml
	web-services/modification/pom.xml
	web-services/pom.xml
	web-services/query-websocket/pom.xml
	web-services/query/pom.xml
	web-services/query/src/main/java/datawave/webservice/query/runner/RunningQuery.java
	web-services/rest-api/pom.xml
	web-services/security/pom.xml
	web-services/web-root/pom.xml
2023-02-15 15:55:04 +00:00
0968141d3b Fixing annotations to remove build warnings (#1801)
* First draft of javadoc annotation updates

* More docs updated

* Fixing issue with param types, formatting

* Fixing error with abstract builder docs

* Moving through a few more annotations

* Updating more notes, fixing some existing

* Fixing more annotations

* More work on docs

* More docs more docs

* Adjusting some annotations in config/hash/normalizer packages

* More docs, more docs

* Adding docs for tokenize, reader

* Adjusting formatting, adding some updates

* Updating more docs, in ingest-core

* Fixing a rogue return

* Fixing docs

* Working through extended content classes

* Fixing docs in IngestJob, DelegatingPartitioner

* Finishing up IngestJob

Co-authored-by: pcagbu <[email protected]>
Co-authored-by: Ivan Bella <[email protected]>
Co-authored-by: Moriarty <[email protected]>
2023-01-24 10:43:07 -05:00
hgklohr 8c1a784677 Merge branch 'release/version3.35' into integration 2022-12-09 16:58:23 +00:00
hgklohr 1bef6e7b1c Merge branch 'release/version3.34' into release/version3.35
Conflicts:
	common-test/pom.xml
	docs/pom.xml
	pom.xml
	warehouse/assemble/datawave/pom.xml
	warehouse/assemble/pom.xml
	warehouse/assemble/webservice/pom.xml
	warehouse/balancers/pom.xml
	warehouse/common/pom.xml
	warehouse/core/pom.xml
	warehouse/data-dictionary-core/pom.xml
	warehouse/edge-dictionary-core/pom.xml
	warehouse/edge-model-configuration-core/pom.xml
	warehouse/index-stats/pom.xml
	warehouse/ingest-configuration/pom.xml
	warehouse/ingest-core/pom.xml
	warehouse/ingest-csv/pom.xml
	warehouse/ingest-json/pom.xml
	warehouse/ingest-nyctlc/pom.xml
	warehouse/ingest-scripts/pom.xml
	warehouse/ingest-wikipedia/pom.xml
	warehouse/metrics-core/pom.xml
	warehouse/ops-tools/config-compare/pom.xml
	warehouse/ops-tools/index-validation/pom.xml
	warehouse/ops-tools/pom.xml
	warehouse/pom.xml
	warehouse/query-core/pom.xml
	warehouse/regression-testing/pom.xml
	web-services/accumulo/pom.xml
	web-services/atom/pom.xml
	web-services/cached-results/pom.xml
	web-services/client/pom.xml
	web-services/common-util/pom.xml
	web-services/common/pom.xml
	web-services/deploy/application/pom.xml
	web-services/deploy/configuration/pom.xml
	web-services/deploy/docs/pom.xml
	web-services/deploy/pom.xml
	web-services/deploy/spring-framework-integration/pom.xml
	web-services/dictionary/pom.xml
	web-services/examples/client-login/pom.xml
	web-services/examples/http-client/pom.xml
	web-services/examples/jms-client/pom.xml
	web-services/examples/pom.xml
	web-services/examples/query-war/pom.xml
	web-services/map-reduce-embedded/pom.xml
	web-services/map-reduce-status/pom.xml
	web-services/map-reduce/pom.xml
	web-services/model/pom.xml
	web-services/modification/pom.xml
	web-services/pom.xml
	web-services/query-websocket/pom.xml
	web-services/query/pom.xml
	web-services/rest-api/pom.xml
	web-services/security/pom.xml
	web-services/web-root/pom.xml
2022-12-09 16:56:41 +00:00
hgklohr 15b0d905be Merge branch 'release/version3.32' into release/version3.33
Conflicts:
	common-test/pom.xml
	docs/pom.xml
	pom.xml
	warehouse/assemble/datawave/pom.xml
	warehouse/assemble/pom.xml
	warehouse/assemble/webservice/pom.xml
	warehouse/balancers/pom.xml
	warehouse/common/pom.xml
	warehouse/core/pom.xml
	warehouse/data-dictionary-core/pom.xml
	warehouse/edge-dictionary-core/pom.xml
	warehouse/edge-model-configuration-core/pom.xml
	warehouse/index-stats/pom.xml
	warehouse/ingest-configuration/pom.xml
	warehouse/ingest-core/pom.xml
	warehouse/ingest-csv/pom.xml
	warehouse/ingest-json/pom.xml
	warehouse/ingest-nyctlc/pom.xml
	warehouse/ingest-scripts/pom.xml
	warehouse/ingest-wikipedia/pom.xml
	warehouse/metrics-core/pom.xml
	warehouse/ops-tools/config-compare/pom.xml
	warehouse/ops-tools/index-validation/pom.xml
	warehouse/ops-tools/pom.xml
	warehouse/pom.xml
	warehouse/query-core/pom.xml
	warehouse/regression-testing/pom.xml
	web-services/accumulo/pom.xml
	web-services/atom/pom.xml
	web-services/cached-results/pom.xml
	web-services/client/pom.xml
	web-services/common-util/pom.xml
	web-services/common/pom.xml
	web-services/deploy/application/pom.xml
	web-services/deploy/configuration/pom.xml
	web-services/deploy/docs/pom.xml
	web-services/deploy/pom.xml
	web-services/deploy/spring-framework-integration/pom.xml
	web-services/dictionary/pom.xml
	web-services/examples/client-login/pom.xml
	web-services/examples/http-client/pom.xml
	web-services/examples/jms-client/pom.xml
	web-services/examples/pom.xml
	web-services/examples/query-war/pom.xml
	web-services/map-reduce-embedded/pom.xml
	web-services/map-reduce-status/pom.xml
	web-services/map-reduce/pom.xml
	web-services/model/pom.xml
	web-services/modification/pom.xml
	web-services/pom.xml
	web-services/query-websocket/pom.xml
	web-services/query/pom.xml
	web-services/rest-api/pom.xml
	web-services/security/pom.xml
	web-services/web-root/pom.xml
2022-12-09 16:51:09 +00:00