Skip to content

Commit

Permalink
Query playground: removed Execute "hibernate" query (not that useful)
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Apr 26, 2022
1 parent 4093105 commit d3c6c09
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 58 deletions.
6 changes: 1 addition & 5 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2015 Evolveum
~ Copyright (C) 2010-2022 Evolveum
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
Expand Down Expand Up @@ -41,11 +41,7 @@ <h3><div wicket:id="queryLabel"/></h3>
<h4>
<wicket:message key="PageRepositoryQuery.hibernateParameters"/>
</h4>
<p class="small" wicket:id="hibernateParametersNote"/>
<textarea wicket:id="parameters"></textarea>
<div class="form-group" style="margin-top: 15px">
<a class="btn btn-primary" wicket:id="executeHibernate"/>
</div>
</div>
</div>

Expand Down
73 changes: 20 additions & 53 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2010-2021 Evolveum and contributors
* Copyright (C) 2010-2022 Evolveum and contributors
*
* This work is dual-licensed under the Apache License 2.0
* and European Union Public License. See LICENSE file for details.
Expand Down Expand Up @@ -102,7 +102,6 @@ public class PageRepositoryQuery extends PageAdminConfiguration {
private static final String ID_EXECUTE_MIDPOINT = "executeMidPoint";
private static final String ID_COMPILE_MIDPOINT = "compileMidPoint";
private static final String ID_USE_IN_OBJECT_LIST = "useInObjectList";
private static final String ID_EXECUTE_HIBERNATE = "executeHibernate";
private static final String ID_EDITOR_MIDPOINT = "editorMidPoint";
private static final String ID_QUERY_EDITOR = "queryEditor";
private static final String ID_QUERY_LABEL = "queryLabel";
Expand All @@ -112,7 +111,6 @@ public class PageRepositoryQuery extends PageAdminConfiguration {
private static final String ID_QUERY_SAMPLE = "querySample";
private static final String ID_OBJECT_TYPE = "objectType";
private static final String ID_DISTINCT = "distinct";
private static final String ID_HIBERNATE_PARAMETERS_NOTE = "hibernateParametersNote";
private static final String ID_INCOMPLETE_RESULTS_NOTE = "incompleteResultsNote";
private static final String ID_VIEW_BUTTON_PANEL = "viewButtonPanel";

Expand Down Expand Up @@ -146,7 +144,7 @@ public class PageRepositoryQuery extends PageAdminConfiguration {

private String dataLanguage;

enum Action {TRANSLATE_ONLY, EXECUTE_MIDPOINT, @Deprecated EXECUTE_HIBERNATE}
enum Action {TRANSLATE_ONLY, EXECUTE_MIDPOINT}

@Override
protected void onInitialize() {
Expand Down Expand Up @@ -223,11 +221,6 @@ protected void onUpdate(AjaxRequestTarget target) {
hibernateParameters.setMode(null);
mainForm.add(hibernateParameters);

Label hibernateParametersNote = new Label(ID_HIBERNATE_PARAMETERS_NOTE, createStringResource("PageRepositoryQuery.hibernateParametersNote",
WebComponentUtil.getMidpointCustomSystemName(PageRepositoryQuery.this, "midPoint")));
hibernateParametersNote.setVisible(isAdmin && !isNativeRepo());
mainForm.add(hibernateParametersNote);

Label queryVsFilterNote = new Label(ID_QUERY_VS_FILTER_NOTE, createStringResource("PageRepositoryQuery.queryVsFilterNote",
WebComponentUtil.getMidpointCustomSystemName(PageRepositoryQuery.this, "midPoint")));
queryVsFilterNote.setOutputMarkupId(true);
Expand Down Expand Up @@ -348,35 +341,18 @@ protected void onUpdate(AjaxRequestTarget target) {
});
mainForm.add(sampleChoice);

AjaxSubmitButton executeHibernate = new AjaxSubmitButton(ID_EXECUTE_HIBERNATE, createStringResource("PageRepositoryQuery.button.execute")) {
@Override
protected void onError(AjaxRequestTarget target) {
target.add(getFeedbackPanel());
}

@Override
protected void onSubmit(AjaxRequestTarget target) {
queryPerformed(Action.EXECUTE_HIBERNATE, target);
Label resultLabel = new Label(ID_RESULT_LABEL, (IModel<String>) () -> {
if (model.getObject().getQueryResultText() == null) {
return "";
}
};
executeHibernate.setVisible(isAdmin && !isNativeRepo());
mainForm.add(executeHibernate);

Label resultLabel = new Label(ID_RESULT_LABEL, new IModel<String>() {
@Override
public String getObject() {
if (model.getObject().getQueryResultText() == null) {
return "";
}
Object queryResult = model.getObject().getQueryResultObject();
if (queryResult instanceof List) {
return getString("PageRepositoryQuery.resultObjects", ((List) queryResult).size());
} else if (queryResult instanceof Throwable) {
return getString("PageRepositoryQuery.resultException", queryResult.getClass().getName());
} else {
// including null
return getString("PageRepositoryQuery.result");
}
Object queryResult = model.getObject().getQueryResultObject();
if (queryResult instanceof List) {
return getString("PageRepositoryQuery.resultObjects", ((List<?>) queryResult).size());
} else if (queryResult instanceof Throwable) {
return getString("PageRepositoryQuery.resultException", queryResult.getClass().getName());
} else {
// including null
return getString("PageRepositoryQuery.result");
}
});
mainForm.add(resultLabel);
Expand Down Expand Up @@ -478,14 +454,9 @@ private void queryPerformed(Action action, AjaxRequestTarget target) {
RepositoryQueryDiagRequest request = new RepositoryQueryDiagRequest();

switch (action) {
// TODO we don't want this anymore
case EXECUTE_HIBERNATE:
String hqlText = dto.getHibernateQuery();
queryPresent = StringUtils.isNotBlank(hqlText);
request.setImplementationLevelQuery(hqlText);
break;
case TRANSLATE_ONLY:
request.setTranslateOnly(true);
// Falls through to the next section, we want this.
case EXECUTE_MIDPOINT:
queryPresent = StringUtils.isNotBlank(dto.getMidPointQuery());
if (queryPresent) {
Expand All @@ -509,7 +480,6 @@ private void queryPerformed(Action action, AjaxRequestTarget target) {
queryResult = response.getQueryResult();
} else {
request.setTranslateOnly(true);
request.setImplementationLevelQuery(null); // just to be sure
response = getModelDiagnosticService().executeRepositoryQuery(request, task, result);

if (action != Action.TRANSLATE_ONLY) {
Expand All @@ -521,16 +491,13 @@ private void queryPerformed(Action action, AjaxRequestTarget target) {
}
}

if (action != Action.EXECUTE_HIBERNATE) {
dto.setHibernateQuery(String.valueOf(response.getImplementationLevelQuery()));
StringBuilder sb = new StringBuilder();
for (Map.Entry<String, RepositoryQueryDiagResponse.ParameterValue> entry : response.getImplementationLevelQueryParameters().entrySet()) {
sb.append(entry.getKey()).append(" = ").append(entry.getValue().displayValue).append("\n");
}
dto.setHibernateParameters(sb.toString());
} else {
dto.setHibernateParameters("");
dto.setHibernateQuery(String.valueOf(response.getImplementationLevelQuery()));
StringBuilder sb = new StringBuilder();
for (Map.Entry<String, RepositoryQueryDiagResponse.ParameterValue> entry : response.getImplementationLevelQueryParameters().entrySet()) {
sb.append(entry.getKey()).append(" = ").append(entry.getValue().displayValue).append("\n");
}
dto.setHibernateParameters(sb.toString());

if (action != Action.TRANSLATE_ONLY) {
dto.setQueryResultText(formatQueryResult(queryResult));
dto.setQueryResultObject(queryResult);
Expand Down

0 comments on commit d3c6c09

Please sign in to comment.