Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/forgot-user…
Browse files Browse the repository at this point in the history 
…name

* origin/master:
  MID-8932: fix NPE for mapping description
  MID-8842 ninja - improved progress reporting for older actions
  MID-8842 ninja - logging improvements
  MID-8761: adding resource name to translation of text and subText of resourc wizard panel for choice of next step
  MID-8842 ninja - logging improvements
  MID-8842 ninja - use AuditService#getRepositoryDiag method in ninja pre-upgrade check
  MID-8842 ninja - AuditService#getRepositoryDiag method added, code reused from existing repository service
  • Loading branch information
@katkav
katkav committed Aug 4, 2023
2 parents d680893 + 55948ea commit 4ff6ea3
Show file tree
Hide file tree
Showing 27 changed files with 480 additions and 313 deletions.
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5579,7 +5579,7 @@ public static IModel<String> createMappingDescription(IModel<PrismContainerValue

String target = "";
VariableBindingDefinitionType targetv = mappingType.getTarget();
if (targetv != null) {
if (targetv != null && targetv.getPath() != null) {
target += targetv.getPath().toString();
}

Expand Down
5 changes: 4 additions & 1 deletion .../main/java/com/evolveum/midpoint/gui/impl/component/data/column/SimulationModeColumn.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;

Expand All @@ -27,7 +28,9 @@ public SimulationModeColumn(IModel<? extends PrismContainerDefinition<C>> mainMo

@Override
protected <IW extends ItemWrapper> Component createColumnPanel(String componentId, IModel<IW> rowModel) {
return new SimulationModePanel(componentId, (IModel<PrismPropertyWrapper<String>>) rowModel);
SimulationModePanel panel = new SimulationModePanel(componentId, (IModel<PrismPropertyWrapper<String>>) rowModel);
panel.add(AttributeAppender.append("class", "d-inline"));
return panel;
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions ...um/midpoint/gui/impl/page/admin/resource/component/wizard/ResourceWizardPreviewPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ public String getIcon() {

@Override
protected @NotNull IModel<String> getBreadcrumbLabel() {
String name = WebComponentUtil.getDisplayNameOrName(getAssignmentHolderDetailsModel().getObjectWrapper().getObject());
if (StringUtils.isEmpty(name)) {
return getPageBase().createStringResource("ResourceWizardPreviewPanel.title");
}
return Model.of(name);
return Model.of(getResourceName());
}

private String getResourceName() {
return WebComponentUtil.getDisplayNameOrName(getAssignmentHolderDetailsModel().getObjectWrapper().getObject());
}

@Override
protected IModel<String> getSubTextModel() {
return getPageBase().createStringResource("ResourceWizardPreviewPanel.subText");
return getPageBase().createStringResource("ResourceWizardPreviewPanel.subText", getResourceName());
}

@Override
protected IModel<String> getTextModel() {
return getPageBase().createStringResource("ResourceWizardPreviewPanel.text");
return getPageBase().createStringResource("ResourceWizardPreviewPanel.text", getResourceName());
}

}
8 changes: 4 additions & 4 deletions repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@

import java.util.Collection;

import com.evolveum.midpoint.schema.*;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.schema.GetOperationOptions;
import com.evolveum.midpoint.schema.SearchResultList;
import com.evolveum.midpoint.schema.SearchResultMetadata;
import com.evolveum.midpoint.schema.SelectorOptions;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.util.annotation.Experimental;
Expand Down Expand Up @@ -125,4 +123,6 @@ SearchResultMetadata searchObjectsIterative(
@NotNull AuditResultHandler handler,
@Nullable Collection<SelectorOptions<GetOperationOptions>> options,
@NotNull OperationResult parentResult) throws SchemaException;

@NotNull RepositoryDiag getRepositoryDiag();
}
7 changes: 7 additions & 0 deletions ...audit-log-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,11 @@ public SearchResultMetadata searchObjectsIterative(
@NotNull OperationResult parentResult) throws SchemaException {
throw new UnsupportedOperationException("searchObjectsIterative not supported");
}

@Override
public @NotNull RepositoryDiag getRepositoryDiag() {
RepositoryDiag diag = new RepositoryDiag();
diag.setImplementationShortName(getClass().getSimpleName());
return diag;
}
}
122 changes: 6 additions & 116 deletions repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,15 @@
import static com.evolveum.midpoint.schema.GetOperationOptions.isAllowNotFound;

import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.*;
import java.util.function.Consumer;

import java.util.stream.Collectors;

import com.google.common.base.Strings;
import com.google.common.collect.ObjectArrays;
import com.querydsl.core.Tuple;
import com.querydsl.core.types.*;
import com.querydsl.core.types.dsl.*;
import com.querydsl.core.types.Path;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.sql.SQLQuery;
import org.apache.commons.lang3.Validate;
import org.jetbrains.annotations.NotNull;
Expand All @@ -47,8 +42,6 @@
import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
import com.evolveum.midpoint.repo.api.*;
import com.evolveum.midpoint.repo.sqale.mapping.SqaleTableMapping;
import com.evolveum.midpoint.repo.sqale.qmodel.common.MGlobalMetadata;
import com.evolveum.midpoint.repo.sqale.qmodel.common.QGlobalMetadata;
import com.evolveum.midpoint.repo.sqale.qmodel.object.MObject;
import com.evolveum.midpoint.repo.sqale.qmodel.object.MObjectType;
import com.evolveum.midpoint.repo.sqale.qmodel.object.QObject;
Expand All @@ -73,7 +66,10 @@
import com.evolveum.midpoint.schema.result.OperationResultStatus;
import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.util.exception.*;
import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SystemException;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;

Expand All @@ -96,13 +92,6 @@
*/
public class SqaleRepositoryService extends SqaleServiceBase implements RepositoryService {

/**
* Name of the repository implementation, returned by {@link #getRepositoryType()}.
* While public, the value is often copied because this service class is implementation
* detail for the rest of the midPoint.
*/
public static final String REPOSITORY_IMPL_NAME = "Native";

public static final int INITIAL_VERSION_NUMBER = 0;
public static final String INITIAL_VERSION_STRING = String.valueOf(INITIAL_VERSION_NUMBER);

Expand Down Expand Up @@ -1672,110 +1661,11 @@ private void executeReturnUnusedValuesToSequence(UUID oid, Collection<Long> unus
}
}

@Override
public RepositoryDiag getRepositoryDiag() {
logger.debug("Getting repository diagnostics.");

RepositoryDiag diag = new RepositoryDiag();
diag.setImplementationShortName(REPOSITORY_IMPL_NAME);
diag.setImplementationDescription(
"Implementation that stores data in PostgreSQL database using JDBC with Querydsl.");

JdbcRepositoryConfiguration config = repositoryConfiguration();
diag.setDriverShortName(config.getDriverClassName());
diag.setRepositoryUrl(config.getJdbcUrl());
diag.setEmbedded(config.isEmbedded());

Enumeration<Driver> drivers = DriverManager.getDrivers();
while (drivers.hasMoreElements()) {
Driver driver = drivers.nextElement();
if (!driver.getClass().getName().equals(config.getDriverClassName())) {
continue;
}

diag.setDriverVersion(driver.getMajorVersion() + "." + driver.getMinorVersion());
}

List<LabeledString> details = new ArrayList<>();
diag.setAdditionalDetails(details);
details.add(new LabeledString("dataSource", config.getDataSource()));

try (JdbcSession jdbcSession = sqlRepoContext.newJdbcSession().startTransaction()) {
details.add(new LabeledString("transactionIsolation",
getTransactionIsolation(jdbcSession.connection(), config)));

try {
Properties info = jdbcSession.connection().getClientInfo();
if (info != null) {
for (String name : info.stringPropertyNames()) {
details.add(new LabeledString("clientInfo." + name, info.getProperty(name)));
}
}
} catch (SQLException e) {
details.add(new LabeledString("clientInfo-error", e.toString()));
}

long startMs = System.currentTimeMillis();
jdbcSession.executeStatement("select 1");
details.add(new LabeledString("select-1-round-trip-ms",
String.valueOf(System.currentTimeMillis() - startMs)));

addGlobalMetadataInfo(jdbcSession, details);
}

details.sort((o1, o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.getLabel(), o2.getLabel()));

return diag;
}

private void addGlobalMetadataInfo(JdbcSession jdbcSession, List<LabeledString> details) {
List<MGlobalMetadata> list = jdbcSession.newQuery()
.from(QGlobalMetadata.DEFAULT)
.select(QGlobalMetadata.DEFAULT)
.fetch();

for (MGlobalMetadata metadata : list) {
details.add(new LabeledString(metadata.name, metadata.value));
}
}

@Override
public @NotNull String getRepositoryType() {
return REPOSITORY_IMPL_NAME;
}

private String getTransactionIsolation(
Connection connection, JdbcRepositoryConfiguration config) {
String value = config.getTransactionIsolation() != null ?
config.getTransactionIsolation().name() + "(read from repo configuration)" : null;

try {
switch (connection.getTransactionIsolation()) {
case Connection.TRANSACTION_NONE:
value = "TRANSACTION_NONE (read from connection)";
break;
case Connection.TRANSACTION_READ_COMMITTED:
value = "TRANSACTION_READ_COMMITTED (read from connection)";
break;
case Connection.TRANSACTION_READ_UNCOMMITTED:
value = "TRANSACTION_READ_UNCOMMITTED (read from connection)";
break;
case Connection.TRANSACTION_REPEATABLE_READ:
value = "TRANSACTION_REPEATABLE_READ (read from connection)";
break;
case Connection.TRANSACTION_SERIALIZABLE:
value = "TRANSACTION_SERIALIZABLE (read from connection)";
break;
default:
value = "Unknown value in connection.";
}
} catch (Exception ex) {
//nowhere to report error (no operation result available)
}

return value;
}

@Override
public void repositorySelfTest(OperationResult parentResult) {
OperationResult operationResult =
Expand Down

0 comments on commit 4ff6ea3

Please sign in to comment.