Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update query-metric service to generate HTML response via Spring MVC #6

Merged
merged 1 commit into from
May 6, 2024
Merged

Update query-metric service to generate HTML response via Spring MVC #6

merged 1 commit into from
May 6, 2024

Conversation

kevinrr888
Copy link
Collaborator

@kevinrr888 kevinrr888 commented Aug 11, 2022 •
edited
Loading

For DW#1666.

Changes:

  • Created createModelAndView() methods in BaseQueryMetricListResponse, QueryMetricsDetailListResponse, and QueryMetricsSummaryResponse. Creates the model and view for the appropriate webpage.
  • BaseQueryMetricListResponse, QueryMetricsDetailListResponse, and QueryMetricsSummaryResponse no longer use HtmlProvider and a StringBuilder to produce the HTML. Added new methods queryWebpage(), getQueryMetricsSummaryWebpage(), and getQueryMetricsUserSummaryWebpage() to QueryMetricOperations which handles HTML responses for the Query Metrics webpages and the Query Metrics Summary webpages. Calls appropriate createModelAndView() method.
  • Added dependencies for jQuery in service/pom.xml and fixed src tags of scripts using jquery.min.js to link to the correct location of jquery.min.js (originally wrong link and jQuery wasn't a dependency)
  • Added thymeleaf dependency to service/pom.xml
  • Added spring-webmvc dependency to api/pom.xml so ModelAndView can be used in the api (used in BaseQueryMetricListResponse and QueryMetricsDetailListResponse)

@billoley billoley changed the base branch from feature/queryMicroservices to main April 22, 2024 16:10
@billoley billoley force-pushed the feature/DATAWAVE-1666 branch 2 times, most recently from 8f1798c to 9bcaa5f Compare May 2, 2024 19:19
@billoley billoley merged commit 3203a04 into main May 6, 2024
1 of 2 checks passed
billoley pushed a commit that referenced this pull request May 6, 2024
@kevinrr888 @billoley
Update query-metric service to generate HTML response via Spring MVC (#6
062a8d0 
)
billoley pushed a commit that referenced this pull request May 9, 2024
@kevinrr888 @billoley
Update query-metric service to generate HTML response via Spring MVC (#6
1b56d17 
)
billoley pushed a commit that referenced this pull request May 16, 2024
@kevinrr888 @billoley
Update query-metric service to generate HTML response via Spring MVC (#6
03e993f 
)
jwomeara added a commit that referenced this pull request May 20, 2024
@jwomeara @kevinrr888
@cbevard1 @billoley
Feature/query microservices (#18)
4049b64 
* updated package locations of various classes

* Updated datawave to 5.4.0-SNAPSHOT

* bumped datawave version.

* bumped datawave version

* Updated to use jexl3

* Moved Query, QueryImpl to query-api

* Updated with latest changes from integration

* removed banned dependency

* bumped release version

* formatting

* bumped versions for some modules

* Updated with latest changes from main/integration

* fixed confirm ack configuration, and updated query client response type.

* updated with latest from integration

* PR feedback

* PR feedback

* Update query-metric service to generate HTML response via Spring MVC (#6)

* replaced apache commons base64 encoder/decoder with native java (#17)

* datawave version to 6.9.3

* Release datawave-query-metric api/service 3.0.9

* Set version to 3.0.10-SNAPSHOT

* Fixed setter typo

* Update query-metric service to generate HTML response via Spring MVC (#6)

* replaced apache commons base64 encoder/decoder with native java (#17)

* datawave version to 6.9.3

* Release datawave-query-metric api/service 3.0.9

* Set version to 3.0.10-SNAPSHOT

* fix typo in QueryGeometryHandler

---------

Co-authored-by: Kevin Rathbun <43969518+kevinrr888@users.noreply.github.com>
Co-authored-by: Chris <cbevard1@gmail.com>
Co-authored-by: Bill Oley <bill.oley@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ivakegg ivakegg ivakegg approved these changes

@jwomeara jwomeara Awaiting requested review from jwomeara

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kevinrr888 @ivakegg @billoley