Skip to content

Commit

Permalink
Merge pull request #5094 from soul2zimate/WFCORE-5904-main
Browse files Browse the repository at this point in the history
[WFCORE-5904] Fix typo in some Handler filenames.
  • Loading branch information
yersan committed May 10, 2022
2 parents f8cfd2c + 4ef152c commit 6f488c2
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
*/
package org.jboss.as.controller.audit;

import static org.jboss.as.controller.audit.AuditLogItemFormatter.TYPE_JMX;
import static org.jboss.as.controller.audit.JsonAuditLogItemFormatter.AS_VERSION;
import static org.jboss.as.controller.audit.JsonAuditLogItemFormatter.ERROR;
import static org.jboss.as.controller.audit.JsonAuditLogItemFormatter.METHOD_NAME;
Expand Down Expand Up @@ -48,7 +47,7 @@
*
* @author <a href="mailto:ehugonne@redhat.com">Emmanuel Hugonnet</a> (c) 2015 Red Hat, inc.
*/
public final class InMemoryAuditLogHander extends AuditLogHandler {
public final class InMemoryAuditLogHandler extends AuditLogHandler {

public static final String OPERATION_DATE = "operation-date";
private static final ModelNode UNDEFINED = new ModelNode();
Expand All @@ -62,7 +61,7 @@ public final class InMemoryAuditLogHander extends AuditLogHandler {
private final AuditLogItemFormatter myFormatter = new InMemoryFormatter();


public InMemoryAuditLogHander(String name, int maxHistory) {
public InMemoryAuditLogHandler(String name, int maxHistory) {
super(name, IN_MEMORY_FORMATTER_NAME, maxHistory);
this.items = new ArrayList<>(maxHistory);
this.maxHistory = maxHistory;
Expand Down Expand Up @@ -92,7 +91,7 @@ public AuditLogItemFormatter getFormatter() {

@Override
boolean isDifferent(AuditLogHandler other) {
if (other instanceof InMemoryAuditLogHander == false) {
if (other instanceof InMemoryAuditLogHandler == false) {
return true;
}
return getName().equals(other.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ public List<ModelNode> listLastEntries(String name) {
public void updateInMemoryHandlerMaxHistory(String name, int maxHistory) {
config.lock();
try {
InMemoryAuditLogHander handler = (InMemoryAuditLogHander)config.getConfiguredHandler(name);
InMemoryAuditLogHandler handler = (InMemoryAuditLogHandler)config.getConfiguredHandler(name);
handler.setMaxHistory(maxHistory);
} finally {
config.unlock();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void execute(OperationContext context, ModelNode operation) throws Operat
WritableAuthorizerConfiguration authorizerConfiguration = configurableAuthorizer.getWritableAuthorizerConfiguration();

ModelNode provider = AccessAuthorizationResourceDefinition.PROVIDER.resolveModelAttribute(context, model);
AccessAuthorizationProviderWriteAttributeHander.updateAuthorizer(provider, configurableAuthorizer);
AccessAuthorizationProviderWriteAttributeHandler.updateAuthorizer(provider, configurableAuthorizer);
ModelNode combinationPolicy = AccessAuthorizationResourceDefinition.PERMISSION_COMBINATION_POLICY.resolveModelAttribute(context, model);
AccessAuthorizationCombinationPolicyWriteAttributeHandler.updateAuthorizer(combinationPolicy, authorizerConfiguration);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
* @author Brian Stansberry (c) 2013 Red Hat Inc.
* @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
*/
class AccessAuthorizationProviderWriteAttributeHander extends AbstractWriteAttributeHandler<Void> {
class AccessAuthorizationProviderWriteAttributeHandler extends AbstractWriteAttributeHandler<Void> {

private final DelegatingConfigurableAuthorizer configurableAuthorizer;

AccessAuthorizationProviderWriteAttributeHander(DelegatingConfigurableAuthorizer configurableAuthorizer) {
AccessAuthorizationProviderWriteAttributeHandler(DelegatingConfigurableAuthorizer configurableAuthorizer) {
super(AccessAuthorizationResourceDefinition.PROVIDER);
this.configurableAuthorizer = configurableAuthorizer;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ private AccessAuthorizationResourceDefinition(DelegatingConfigurableAuthorizer c
public void registerAttributes(ManagementResourceRegistration resourceRegistration) {
super.registerAttributes(resourceRegistration);
WritableAuthorizerConfiguration authorizerConfiguration = configurableAuthorizer.getWritableAuthorizerConfiguration();
resourceRegistration.registerReadWriteAttribute(PROVIDER, null, new AccessAuthorizationProviderWriteAttributeHander(configurableAuthorizer));
resourceRegistration.registerReadWriteAttribute(USE_IDENTITY_ROLES, null, new AccessAuthorizationUseIdentityRolesWriteAttributeHander(configurableAuthorizer.getWritableAuthorizerConfiguration()));
resourceRegistration.registerReadWriteAttribute(PROVIDER, null, new AccessAuthorizationProviderWriteAttributeHandler(configurableAuthorizer));
resourceRegistration.registerReadWriteAttribute(USE_IDENTITY_ROLES, null, new AccessAuthorizationUseIdentityRolesWriteAttributeHandler(configurableAuthorizer.getWritableAuthorizerConfiguration()));
resourceRegistration.registerReadWriteAttribute(PERMISSION_COMBINATION_POLICY, null,
new AccessAuthorizationCombinationPolicyWriteAttributeHandler(authorizerConfiguration));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
*
* @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
*/
class AccessAuthorizationUseIdentityRolesWriteAttributeHander extends AbstractWriteAttributeHandler<Void> {
class AccessAuthorizationUseIdentityRolesWriteAttributeHandler extends AbstractWriteAttributeHandler<Void> {

private final WritableAuthorizerConfiguration writableConfiguration;

AccessAuthorizationUseIdentityRolesWriteAttributeHander(WritableAuthorizerConfiguration writableConfiguration) {
AccessAuthorizationUseIdentityRolesWriteAttributeHandler(WritableAuthorizerConfiguration writableConfiguration) {
super(AccessAuthorizationResourceDefinition.USE_IDENTITY_ROLES);
this.writableConfiguration = writableConfiguration;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
import org.jboss.dmr.ModelNode;

/**
* A {@link OperationStepHandler} for writing the include-all attribute.
* An {@link org.jboss.as.controller.OperationStepHandler} for writing the include-all attribute.
*
* @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
*/
public class RoleIncludeAllWriteAttributeHander extends AbstractWriteAttributeHandler<Void> {
public class RoleIncludeAllWriteAttributeHandler extends AbstractWriteAttributeHandler<Void> {

private final WritableAuthorizerConfiguration authorizerConfiguration;

RoleIncludeAllWriteAttributeHander(final WritableAuthorizerConfiguration authorizerConfiguration) {
RoleIncludeAllWriteAttributeHandler(final WritableAuthorizerConfiguration authorizerConfiguration) {
super(RoleMappingResourceDefinition.INCLUDE_ALL);
this.authorizerConfiguration = authorizerConfiguration;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static SimpleResourceDefinition create(final DelegatingConfigurableAuthor
@Override
public void registerAttributes(ManagementResourceRegistration resourceRegistration) {
WritableAuthorizerConfiguration authorizerConfiguration = authorizer.getWritableAuthorizerConfiguration();
resourceRegistration.registerReadWriteAttribute(INCLUDE_ALL, null, new RoleIncludeAllWriteAttributeHander(authorizerConfiguration));
resourceRegistration.registerReadWriteAttribute(INCLUDE_ALL, null, new RoleIncludeAllWriteAttributeHandler(authorizerConfiguration));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
package org.jboss.as.domain.management.audit;

import static org.jboss.as.controller.audit.InMemoryAuditLogHander.OPERATION_DATE;
import static org.jboss.as.controller.audit.InMemoryAuditLogHandler.OPERATION_DATE;
import static org.jboss.as.controller.audit.JsonAuditLogItemFormatter.AS_VERSION;
import static org.jboss.as.controller.audit.JsonAuditLogItemFormatter.REMOTE_ADDRESS;
import static org.jboss.as.controller.audit.JsonAuditLogItemFormatter.USER_ID;
Expand All @@ -47,7 +47,7 @@
import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
import org.jboss.as.controller.SimpleListAttributeDefinition;
import org.jboss.as.controller.SimpleOperationDefinitionBuilder;
import org.jboss.as.controller.audit.InMemoryAuditLogHander;
import org.jboss.as.controller.audit.InMemoryAuditLogHandler;
import org.jboss.as.controller.audit.ManagedAuditLogger;
import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
import org.jboss.as.controller.operations.common.Util;
Expand Down Expand Up @@ -165,16 +165,16 @@ protected void populateModel(ModelNode operation, ModelNode model) throws Operat
MAX_OPERATION_COUNT.validateAndSet(operation, model);
}

private InMemoryAuditLogHander createHandler(final OperationContext context, final ModelNode model) throws OperationFailedException {
private InMemoryAuditLogHandler createHandler(final OperationContext context, final ModelNode model) throws OperationFailedException {
final String name = context.getCurrentAddressValue();
final int maxHistory = MAX_OPERATION_COUNT.resolveModelAttribute(context, model).asInt();
return new InMemoryAuditLogHander(name, maxHistory);
return new InMemoryAuditLogHandler(name, maxHistory);
}

@Override
protected void performRuntime(OperationContext context, ModelNode operation, ModelNode model)
throws OperationFailedException {
InMemoryAuditLogHander handler = createHandler(context, model);
InMemoryAuditLogHandler handler = createHandler(context, model);
auditLogger.getUpdater().addHandler(handler);
auditLogger.addFormatter(handler.getFormatter());
}
Expand Down

0 comments on commit 6f488c2

Please sign in to comment.