You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/12/20 15:45:13 UTC
ambari git commit: AMBARI-19419. Code cleanup: unchecked casts in
*AuditEventBuilder (Attila Doroszlai via ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 749a5b2dc -> d1317dfba
AMBARI-19419. Code cleanup: unchecked casts in *AuditEventBuilder (Attila Doroszlai via ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d1317dfb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d1317dfb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d1317dfb
Branch: refs/heads/trunk
Commit: d1317dfba2ea3499c2bf4d42daf0f2a278d1227f
Parents: 749a5b2
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Dec 20 10:34:18 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Dec 20 10:34:18 2016 -0500
----------------------------------------------------------------------
.../server/audit/event/AbstractAuditEvent.java | 10 +++-
.../audit/event/AbstractUserAuditEvent.java | 8 ++-
.../event/AccessUnauthorizedAuditEvent.java | 4 ++
.../server/audit/event/LoginAuditEvent.java | 1 +
.../server/audit/event/LogoutAuditEvent.java | 1 +
.../audit/event/OperationStatusAuditEvent.java | 1 +
.../audit/event/TaskStatusAuditEvent.java | 1 +
.../kerberos/AbstractKerberosAuditEvent.java | 12 +++--
.../ChangeSecurityStateKerberosAuditEvent.java | 1 +
.../CreateKeyTabKerberosAuditEvent.java | 1 +
.../CreatePrincipalKerberosAuditEvent.java | 1 +
.../DestroyPrincipalKerberosAuditEvent.java | 1 +
.../request/ActivateUserRequestAuditEvent.java | 1 +
.../request/AddAlertGroupRequestAuditEvent.java | 1 +
.../AddAlertTargetRequestAuditEvent.java | 1 +
.../request/AddBlueprintRequestAuditEvent.java | 1 +
.../AddComponentToHostRequestAuditEvent.java | 1 +
.../request/AddCredentialRequestAuditEvent.java | 1 +
.../event/request/AddHostRequestAuditEvent.java | 1 +
.../request/AddRepositoryRequestAuditEvent.java | 1 +
.../AddRepositoryVersionRequestAuditEvent.java | 1 +
.../request/AddRequestRequestAuditEvent.java | 1 +
.../request/AddUpgradeRequestAuditEvent.java | 1 +
.../AddUserToGroupRequestAuditEvent.java | 1 +
.../AddViewInstanceRequestAuditEvent.java | 1 +
.../request/AdminUserRequestAuditEvent.java | 1 +
.../BlueprintExportRequestAuditEvent.java | 1 +
.../ChangeAlertGroupRequestAuditEvent.java | 1 +
.../ChangeAlertTargetRequestAuditEvent.java | 1 +
...hangeRepositoryVersionRequestAuditEvent.java | 1 +
.../ChangeViewInstanceRequestAuditEvent.java | 1 +
.../ClientConfigDownloadRequestAuditEvent.java | 1 +
.../ClusterNameChangeRequestAuditEvent.java | 1 +
...ClusterPrivilegeChangeRequestAuditEvent.java | 1 +
.../ConfigurationChangeRequestAuditEvent.java | 1 +
.../request/CreateGroupRequestAuditEvent.java | 1 +
.../request/CreateUserRequestAuditEvent.java | 1 +
.../event/request/DefaultRequestAuditEvent.java | 54 ++++++++++++++++++++
.../DeleteAlertGroupRequestAuditEvent.java | 1 +
.../DeleteAlertTargetRequestAuditEvent.java | 1 +
.../DeleteBlueprintRequestAuditEvent.java | 1 +
.../request/DeleteGroupRequestAuditEvent.java | 1 +
.../request/DeleteHostRequestAuditEvent.java | 1 +
...eleteRepositoryVersionRequestAuditEvent.java | 1 +
.../request/DeleteServiceRequestAuditEvent.java | 1 +
.../request/DeleteUserRequestAuditEvent.java | 1 +
.../DeleteViewInstanceRequestAuditEvent.java | 1 +
.../MembershipChangeRequestAuditEvent.java | 1 +
.../PrivilegeChangeRequestAuditEvent.java | 1 +
.../RemoveUserFromGroupRequestAuditEvent.java | 1 +
.../StartOperationRequestAuditEvent.java | 1 +
.../UpdateRepositoryRequestAuditEvent.java | 1 +
.../UpdateUpgradeItemRequestAuditEvent.java | 1 +
.../UserPasswordChangeRequestAuditEvent.java | 1 +
.../ViewPrivilegeChangeRequestAuditEvent.java | 1 +
.../server/audit/request/RequestAuditEvent.java | 31 ++++-------
.../eventcreator/DefaultEventCreator.java | 4 +-
57 files changed, 142 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractAuditEvent.java
index 558b0ea..cdf7455 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractAuditEvent.java
@@ -47,7 +47,7 @@ public abstract class AbstractAuditEvent implements AuditEvent {
private Long timestamp;
private String auditMessage;
-
+ private final Class<? extends TBuilder> builderClass;
/**
* Creates a new audit event instance from this builder.
@@ -63,6 +63,9 @@ public abstract class AbstractAuditEvent implements AuditEvent {
*/
protected abstract void buildAuditMessage(StringBuilder builder);
+ protected AbstractAuditEventBuilder(Class<? extends TBuilder> builderClass) {
+ this.builderClass = builderClass;
+ }
/**
* The timestamp of the audit event.
@@ -73,7 +76,7 @@ public abstract class AbstractAuditEvent implements AuditEvent {
public TBuilder withTimestamp(Long timestamp) {
this.timestamp = timestamp;
- return (TBuilder) this;
+ return self();
}
/**
@@ -89,6 +92,9 @@ public abstract class AbstractAuditEvent implements AuditEvent {
return newAuditEvent();
}
+ protected TBuilder self() {
+ return builderClass.cast(this);
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java
index 6aab071..1edf22e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AbstractUserAuditEvent.java
@@ -40,6 +40,10 @@ public abstract class AbstractUserAuditEvent extends AbstractAuditEvent {
*/
private String remoteIp;
+ protected AbstractUserAuditEventBuilder(Class<? extends TBuilder> builderClass) {
+ super(builderClass);
+ }
+
/**
* Appends to audit event details the user name and remote ip of the host
* where user actions originates from.
@@ -65,7 +69,7 @@ public abstract class AbstractUserAuditEvent extends AbstractAuditEvent {
public TBuilder withUserName(String userName) {
this.userName = userName;
- return (TBuilder) this;
+ return self();
}
/**
@@ -77,7 +81,7 @@ public abstract class AbstractUserAuditEvent extends AbstractAuditEvent {
public TBuilder withRemoteIp(String ip) {
this.remoteIp = ip;
- return (TBuilder) this;
+ return self();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AccessUnauthorizedAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AccessUnauthorizedAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AccessUnauthorizedAuditEvent.java
index b6e60e1..94c668f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AccessUnauthorizedAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/AccessUnauthorizedAuditEvent.java
@@ -39,6 +39,10 @@ public class AccessUnauthorizedAuditEvent extends AbstractUserAuditEvent {
*/
private String resourcePath;
+ private AccessUnauthorizedAuditEventBuilder() {
+ super(AccessUnauthorizedAuditEventBuilder.class);
+ }
+
/**
* Appends to the aduit event detail the list of the privileges
* possessed by the principal requesting access to a resource.
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LoginAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LoginAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LoginAuditEvent.java
index 223dd18..9583b84 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LoginAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LoginAuditEvent.java
@@ -36,6 +36,7 @@ public class LoginAuditEvent extends AbstractUserAuditEvent {
extends AbstractUserAuditEventBuilder<LoginAuditEvent, LoginAuditEventBuilder> {
private LoginAuditEventBuilder() {
+ super(LoginAuditEventBuilder.class);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LogoutAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LogoutAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LogoutAuditEvent.java
index 3ce8c31..4aaeda3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LogoutAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/LogoutAuditEvent.java
@@ -28,6 +28,7 @@ public class LogoutAuditEvent extends AbstractUserAuditEvent {
extends AbstractUserAuditEventBuilder<LogoutAuditEvent, LogoutAuditEventBuilder> {
private LogoutAuditEventBuilder() {
+ super(LogoutAuditEventBuilder.class);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/OperationStatusAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/OperationStatusAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/OperationStatusAuditEvent.java
index fd0068e..65f1b42 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/OperationStatusAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/OperationStatusAuditEvent.java
@@ -50,6 +50,7 @@ public class OperationStatusAuditEvent extends AbstractAuditEvent {
private String userName;
private OperationStatusAuditEventBuilder() {
+ super(OperationStatusAuditEventBuilder.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/TaskStatusAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/TaskStatusAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/TaskStatusAuditEvent.java
index 1682e74..890724c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/TaskStatusAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/TaskStatusAuditEvent.java
@@ -65,6 +65,7 @@ public class TaskStatusAuditEvent extends AbstractAuditEvent {
private String userName;
private TaskStatusAuditEventBuilder() {
+ super(TaskStatusAuditEventBuilder.class);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/AbstractKerberosAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/AbstractKerberosAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/AbstractKerberosAuditEvent.java
index 3de4e48..709fe5e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/AbstractKerberosAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/AbstractKerberosAuditEvent.java
@@ -51,6 +51,10 @@ public class AbstractKerberosAuditEvent extends AbstractAuditEvent {
*/
protected Long taskId;
+ protected AbstractKerberosAuditEventBuilder(Class<? extends TBuilder> builderClass) {
+ super(builderClass);
+ }
+
/**
* Builds and audit log message based on the member variables
*
@@ -79,22 +83,22 @@ public class AbstractKerberosAuditEvent extends AbstractAuditEvent {
public TBuilder withOperation(String operation) {
this.operation = operation;
- return (TBuilder) this;
+ return self();
}
public TBuilder withReasonOfFailure(String reasonOfFailure) {
this.reasonOfFailure = reasonOfFailure;
- return (TBuilder) this;
+ return self();
}
public TBuilder withRequestId(Long requestId) {
this.requestId = requestId;
- return (TBuilder) this;
+ return self();
}
public TBuilder withTaskId(Long taskId) {
this.taskId = taskId;
- return (TBuilder) this;
+ return self();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/ChangeSecurityStateKerberosAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/ChangeSecurityStateKerberosAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/ChangeSecurityStateKerberosAuditEvent.java
index ffb7e8a..a8dd01d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/ChangeSecurityStateKerberosAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/ChangeSecurityStateKerberosAuditEvent.java
@@ -49,6 +49,7 @@ public class ChangeSecurityStateKerberosAuditEvent extends AbstractKerberosAudit
private String state;
private ChangeSecurityStateKerberosAuditEventBuilder() {
+ super(ChangeSecurityStateKerberosAuditEventBuilder.class);
this.withOperation("Security state change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreateKeyTabKerberosAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreateKeyTabKerberosAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreateKeyTabKerberosAuditEvent.java
index 7ac3ef4..8109135 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreateKeyTabKerberosAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreateKeyTabKerberosAuditEvent.java
@@ -44,6 +44,7 @@ public class CreateKeyTabKerberosAuditEvent extends AbstractKerberosAuditEvent {
private String principal;
private CreateKeyTabKerberosAuditEventBuilder() {
+ super(CreateKeyTabKerberosAuditEventBuilder.class);
this.withOperation("Keytab file creation");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreatePrincipalKerberosAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreatePrincipalKerberosAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreatePrincipalKerberosAuditEvent.java
index 51c3c6b..3692b35 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreatePrincipalKerberosAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/CreatePrincipalKerberosAuditEvent.java
@@ -28,6 +28,7 @@ public class CreatePrincipalKerberosAuditEvent extends AbstractKerberosAuditEven
private String principal;
private CreatePrincipalKerberosAuditEventBuilder() {
+ super(CreatePrincipalKerberosAuditEventBuilder.class);
this.withOperation("Principal creation");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/DestroyPrincipalKerberosAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/DestroyPrincipalKerberosAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/DestroyPrincipalKerberosAuditEvent.java
index 1e3dd36..981d82b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/DestroyPrincipalKerberosAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/kerberos/DestroyPrincipalKerberosAuditEvent.java
@@ -34,6 +34,7 @@ public class DestroyPrincipalKerberosAuditEvent extends AbstractKerberosAuditEve
private String principal;
private DestroyPrincipalKerberosAuditEventBuilder() {
+ super(DestroyPrincipalKerberosAuditEventBuilder.class);
this.withOperation("Principal removal");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ActivateUserRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ActivateUserRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ActivateUserRequestAuditEvent.java
index c947fb1..765c988 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ActivateUserRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ActivateUserRequestAuditEvent.java
@@ -41,6 +41,7 @@ public class ActivateUserRequestAuditEvent extends RequestAuditEvent {
private String username;
public ActivateUserRequestAuditEventBuilder() {
+ super(ActivateUserRequestAuditEventBuilder.class);
super.withOperation("Set user active/inactive");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertGroupRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertGroupRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertGroupRequestAuditEvent.java
index cd92ba0..3975110 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertGroupRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertGroupRequestAuditEvent.java
@@ -49,6 +49,7 @@ public class AddAlertGroupRequestAuditEvent extends RequestAuditEvent {
private List<String> notificationIds;
public AddAlertGroupRequestAuditEventBuilder() {
+ super(AddAlertGroupRequestAuditEventBuilder.class);
super.withOperation("Alert group addition");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertTargetRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertTargetRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertTargetRequestAuditEvent.java
index 1c4a8d5..c9a5e74 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertTargetRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddAlertTargetRequestAuditEvent.java
@@ -69,6 +69,7 @@ public class AddAlertTargetRequestAuditEvent extends RequestAuditEvent {
private List<String> alertStates;
public AddAlertTargetRequestAuditEventBuilder() {
+ super(AddAlertTargetRequestAuditEventBuilder.class);
super.withOperation("Notification addition");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddBlueprintRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddBlueprintRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddBlueprintRequestAuditEvent.java
index 84431ab..60433c5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddBlueprintRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddBlueprintRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class AddBlueprintRequestAuditEvent extends RequestAuditEvent {
private String blueprintName;
public AddBlueprintRequestAuditEventBuilder() {
+ super(AddBlueprintRequestAuditEventBuilder.class);
super.withOperation("Upload blueprint");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddComponentToHostRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddComponentToHostRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddComponentToHostRequestAuditEvent.java
index c248665..bd4d3ab 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddComponentToHostRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddComponentToHostRequestAuditEvent.java
@@ -44,6 +44,7 @@ public class AddComponentToHostRequestAuditEvent extends RequestAuditEvent {
private Set<String> components;
public AddComponentToHostRequestAuditEventBuilder() {
+ super(AddComponentToHostRequestAuditEventBuilder.class);
super.withOperation("Component addition to host");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddCredentialRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddCredentialRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddCredentialRequestAuditEvent.java
index 5d27abf..6083b94 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddCredentialRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddCredentialRequestAuditEvent.java
@@ -51,6 +51,7 @@ public class AddCredentialRequestAuditEvent extends RequestAuditEvent {
private String alias;
public AddCredentialAuditEventBuilder() {
+ super(AddCredentialAuditEventBuilder.class);
super.withOperation("Credential addition");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddHostRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddHostRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddHostRequestAuditEvent.java
index c24175d..68c40c9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddHostRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddHostRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class AddHostRequestAuditEvent extends RequestAuditEvent {
private String hostName;
public AddHostRequestAuditEventBuilder() {
+ super(AddHostRequestAuditEventBuilder.class);
super.withOperation("Host addition");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryRequestAuditEvent.java
index ed6c1cd..6ebaff4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryRequestAuditEvent.java
@@ -56,6 +56,7 @@ public class AddRepositoryRequestAuditEvent extends RequestAuditEvent {
private String stackVersion;
public AddRepositoryRequestAuditEventBuilder() {
+ super(AddRepositoryRequestAuditEventBuilder.class);
super.withOperation("Repository addition");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryVersionRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryVersionRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryVersionRequestAuditEvent.java
index b4d3401..82207d2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryVersionRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRepositoryVersionRequestAuditEvent.java
@@ -60,6 +60,7 @@ public class AddRepositoryVersionRequestAuditEvent extends RequestAuditEvent {
private Map<String, List<Map<String, String>>> repos;
public AddRepositoryVersionAuditEventBuilder() {
+ super(AddRepositoryVersionAuditEventBuilder.class);
super.withOperation("Repository version addition");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRequestRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRequestRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRequestRequestAuditEvent.java
index 004c24a..2f88e34 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRequestRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddRequestRequestAuditEvent.java
@@ -41,6 +41,7 @@ public class AddRequestRequestAuditEvent extends RequestAuditEvent {
private String clusterName;
public AddRequestAuditEventBuilder() {
+ super(AddRequestAuditEventBuilder.class);
super.withOperation("Request from server");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUpgradeRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUpgradeRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUpgradeRequestAuditEvent.java
index 69b4536..2c6df7b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUpgradeRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUpgradeRequestAuditEvent.java
@@ -47,6 +47,7 @@ public class AddUpgradeRequestAuditEvent extends RequestAuditEvent {
public AddUpgradeRequestAuditEventBuilder() {
+ super(AddUpgradeRequestAuditEventBuilder.class);
super.withOperation("Upgrade addition");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUserToGroupRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUserToGroupRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUserToGroupRequestAuditEvent.java
index 33293c0..fa8b3b6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUserToGroupRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddUserToGroupRequestAuditEvent.java
@@ -41,6 +41,7 @@ public class AddUserToGroupRequestAuditEvent extends RequestAuditEvent {
private String affectedUserName;
public AddUserToGroupRequestAuditEventBuilder() {
+ super(AddUserToGroupRequestAuditEventBuilder.class);
super.withOperation("User addition to group");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddViewInstanceRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddViewInstanceRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddViewInstanceRequestAuditEvent.java
index d9ab59a..8373168 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddViewInstanceRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AddViewInstanceRequestAuditEvent.java
@@ -56,6 +56,7 @@ public class AddViewInstanceRequestAuditEvent extends RequestAuditEvent {
private String version;
public AddViewInstanceRequestAuditEventBuilder() {
+ super(AddViewInstanceRequestAuditEventBuilder.class);
super.withOperation("View addition");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AdminUserRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AdminUserRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AdminUserRequestAuditEvent.java
index a43d783..9666e59 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AdminUserRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/AdminUserRequestAuditEvent.java
@@ -41,6 +41,7 @@ public class AdminUserRequestAuditEvent extends RequestAuditEvent {
private String username;
public AdminUserRequestAuditEventBuilder() {
+ super(AdminUserRequestAuditEventBuilder.class);
super.withOperation("Set user admin");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/BlueprintExportRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/BlueprintExportRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/BlueprintExportRequestAuditEvent.java
index e5ea1bd..b44caa7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/BlueprintExportRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/BlueprintExportRequestAuditEvent.java
@@ -31,6 +31,7 @@ public class BlueprintExportRequestAuditEvent extends RequestAuditEvent {
public static class BlueprintExportRequestAuditEventBuilder extends RequestAuditEventBuilder<BlueprintExportRequestAuditEvent, BlueprintExportRequestAuditEventBuilder> {
public BlueprintExportRequestAuditEventBuilder() {
+ super(BlueprintExportRequestAuditEventBuilder.class);
super.withOperation("Blueprint export");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertGroupRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertGroupRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertGroupRequestAuditEvent.java
index d5a59df..97b677b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertGroupRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertGroupRequestAuditEvent.java
@@ -49,6 +49,7 @@ public class ChangeAlertGroupRequestAuditEvent extends RequestAuditEvent {
private List<String> notificationIds;
public ChangeAlertGroupRequestAuditEventBuilder() {
+ super(ChangeAlertGroupRequestAuditEventBuilder.class);
super.withOperation("Alert group change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertTargetRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertTargetRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertTargetRequestAuditEvent.java
index 63a45ca..227e90e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertTargetRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeAlertTargetRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class ChangeAlertTargetRequestAuditEvent extends RequestAuditEvent {
private List<String> alertStates;
public ChangeAlertTargetRequestAuditEventBuilder() {
+ super(ChangeAlertTargetRequestAuditEventBuilder.class);
super.withOperation("Notification change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
index 702cd6f..fdba4eb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeRepositoryVersionRequestAuditEvent.java
@@ -61,6 +61,7 @@ public class ChangeRepositoryVersionRequestAuditEvent extends RequestAuditEvent
private SortedMap<String, List<Map<String, String>>> repos;
public ChangeRepositoryVersionAuditEventBuilder() {
+ super(ChangeRepositoryVersionAuditEventBuilder.class);
super.withOperation("Repository version change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeViewInstanceRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeViewInstanceRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeViewInstanceRequestAuditEvent.java
index 4f719c6..e3a7363 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeViewInstanceRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ChangeViewInstanceRequestAuditEvent.java
@@ -56,6 +56,7 @@ public class ChangeViewInstanceRequestAuditEvent extends RequestAuditEvent {
private String version;
public ChangeViewInstanceRequestAuditEventBuilder() {
+ super(ChangeViewInstanceRequestAuditEventBuilder.class);
super.withOperation("View change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClientConfigDownloadRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClientConfigDownloadRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClientConfigDownloadRequestAuditEvent.java
index fd4071a..bdd35a1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClientConfigDownloadRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClientConfigDownloadRequestAuditEvent.java
@@ -41,6 +41,7 @@ public class ClientConfigDownloadRequestAuditEvent extends RequestAuditEvent {
private String component;
public ClientConfigDownloadRequestAuditEventBuilder() {
+ super(ClientConfigDownloadRequestAuditEventBuilder.class);
super.withOperation("Client config download");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterNameChangeRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterNameChangeRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterNameChangeRequestAuditEvent.java
index c4ad139..183a70f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterNameChangeRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterNameChangeRequestAuditEvent.java
@@ -32,6 +32,7 @@ public class ClusterNameChangeRequestAuditEvent extends RequestAuditEvent {
private String newName;
public ClusterNameChangeRequestAuditEventBuilder() {
+ super(ClusterNameChangeRequestAuditEventBuilder.class);
super.withOperation("Cluster name change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
index 29fb7b4..dab9719 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ClusterPrivilegeChangeRequestAuditEvent.java
@@ -56,6 +56,7 @@ public class ClusterPrivilegeChangeRequestAuditEvent extends RequestAuditEvent {
private Map<String, List<String>> roles;
public ClusterPrivilegeChangeRequestAuditEventBuilder() {
+ super(ClusterPrivilegeChangeRequestAuditEventBuilder.class);
super.withOperation("Role change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ConfigurationChangeRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ConfigurationChangeRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ConfigurationChangeRequestAuditEvent.java
index d24c623..086c978 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ConfigurationChangeRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ConfigurationChangeRequestAuditEvent.java
@@ -41,6 +41,7 @@ public class ConfigurationChangeRequestAuditEvent extends RequestAuditEvent {
private String versionNote;
public ConfigurationChangeRequestAuditEventBuilder() {
+ super(ConfigurationChangeRequestAuditEventBuilder.class);
super.withOperation("Configuration change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateGroupRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateGroupRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateGroupRequestAuditEvent.java
index 5b4558c..db6c47d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateGroupRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateGroupRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class CreateGroupRequestAuditEvent extends RequestAuditEvent {
private String groupName;
public CreateGroupRequestAuditEventBuilder() {
+ super(CreateGroupRequestAuditEventBuilder.class);
super.withOperation("Group creation");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateUserRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateUserRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateUserRequestAuditEvent.java
index 95a5825..4cec906 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateUserRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/CreateUserRequestAuditEvent.java
@@ -46,6 +46,7 @@ public class CreateUserRequestAuditEvent extends RequestAuditEvent {
private String username;
public CreateUserRequestAuditEventBuilder() {
+ super(CreateUserRequestAuditEventBuilder.class);
super.withOperation("User creation");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DefaultRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DefaultRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DefaultRequestAuditEvent.java
new file mode 100644
index 0000000..3bc4f04
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DefaultRequestAuditEvent.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.audit.event.request;
+
+import javax.annotation.concurrent.Immutable;
+
+import org.apache.ambari.server.audit.request.RequestAuditEvent;
+import org.apache.ambari.server.audit.request.RequestAuditLogger;
+
+/**
+ * Default audit event for {@link RequestAuditLogger}.
+ */
+@Immutable
+public class DefaultRequestAuditEvent extends RequestAuditEvent {
+
+ public static class DefaultRequestAuditEventBuilder
+ extends RequestAuditEvent.RequestAuditEventBuilder<DefaultRequestAuditEvent, DefaultRequestAuditEventBuilder> {
+
+ private DefaultRequestAuditEventBuilder() {
+ super(DefaultRequestAuditEventBuilder.class);
+ }
+
+ @Override
+ protected DefaultRequestAuditEvent newAuditEvent() {
+ return new DefaultRequestAuditEvent(this);
+ }
+ }
+
+ protected DefaultRequestAuditEvent() {
+ }
+
+ private DefaultRequestAuditEvent(DefaultRequestAuditEventBuilder builder) {
+ super(builder);
+ }
+
+ public static DefaultRequestAuditEventBuilder builder() {
+ return new DefaultRequestAuditEventBuilder();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertGroupRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertGroupRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertGroupRequestAuditEvent.java
index d78886b..541f6c1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertGroupRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertGroupRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class DeleteAlertGroupRequestAuditEvent extends RequestAuditEvent {
private String id;
public DeleteAlertGroupRequestAuditEventBuilder() {
+ super(DeleteAlertGroupRequestAuditEventBuilder.class);
super.withOperation("Alert group removal");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertTargetRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertTargetRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertTargetRequestAuditEvent.java
index 098cdc7..a5b75a5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertTargetRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteAlertTargetRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class DeleteAlertTargetRequestAuditEvent extends RequestAuditEvent {
private String id;
public DeleteAlertTargetRequestAuditEventBuilder() {
+ super(DeleteAlertTargetRequestAuditEventBuilder.class);
super.withOperation("Notification removal");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteBlueprintRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteBlueprintRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteBlueprintRequestAuditEvent.java
index 203f684..76559ad 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteBlueprintRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteBlueprintRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class DeleteBlueprintRequestAuditEvent extends RequestAuditEvent {
private String blueprintName;
public DeleteBlueprintRequestAuditEventBuilder() {
+ super(DeleteBlueprintRequestAuditEventBuilder.class);
super.withOperation("Delete blueprint");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteGroupRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteGroupRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteGroupRequestAuditEvent.java
index b348508..acfee41 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteGroupRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteGroupRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class DeleteGroupRequestAuditEvent extends RequestAuditEvent {
private String groupName;
public DeleteGroupRequestAuditEventBuilder() {
+ super(DeleteGroupRequestAuditEventBuilder.class);
super.withOperation("Group delete");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteHostRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteHostRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteHostRequestAuditEvent.java
index 27769ff..162b9c5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteHostRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteHostRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class DeleteHostRequestAuditEvent extends RequestAuditEvent {
private String hostName;
public DeleteHostRequestAuditEventBuilder() {
+ super(DeleteHostRequestAuditEventBuilder.class);
super.withOperation("Host deletion");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteRepositoryVersionRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteRepositoryVersionRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteRepositoryVersionRequestAuditEvent.java
index 4937087..7b2a256 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteRepositoryVersionRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteRepositoryVersionRequestAuditEvent.java
@@ -46,6 +46,7 @@ public class DeleteRepositoryVersionRequestAuditEvent extends RequestAuditEvent
private String repoVersion;
public DeleteRepositoryVersionAuditEventBuilder() {
+ super(DeleteRepositoryVersionAuditEventBuilder.class);
super.withOperation("Repository version removal");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteServiceRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteServiceRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteServiceRequestAuditEvent.java
index 14ec72e..ce59e34 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteServiceRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteServiceRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class DeleteServiceRequestAuditEvent extends RequestAuditEvent {
private String serviceName;
public DeleteServiceRequestAuditEventBuilder() {
+ super(DeleteServiceRequestAuditEventBuilder.class);
super.withOperation("Service deletion");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteUserRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteUserRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteUserRequestAuditEvent.java
index 1415518..e68aa1e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteUserRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteUserRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class DeleteUserRequestAuditEvent extends RequestAuditEvent {
private String username;
public DeleteUserRequestAuditEventBuilder() {
+ super(DeleteUserRequestAuditEventBuilder.class);
super.withOperation("User delete");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteViewInstanceRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteViewInstanceRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteViewInstanceRequestAuditEvent.java
index d3173ec..3440d6d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteViewInstanceRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/DeleteViewInstanceRequestAuditEvent.java
@@ -46,6 +46,7 @@ public class DeleteViewInstanceRequestAuditEvent extends RequestAuditEvent {
private String version;
public DeleteViewInstanceRequestAuditEventBuilder() {
+ super(DeleteViewInstanceRequestAuditEventBuilder.class);
super.withOperation("View deletion");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/MembershipChangeRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/MembershipChangeRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/MembershipChangeRequestAuditEvent.java
index 8bfe9cd..ad82617 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/MembershipChangeRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/MembershipChangeRequestAuditEvent.java
@@ -44,6 +44,7 @@ public class MembershipChangeRequestAuditEvent extends RequestAuditEvent {
private String groupName;
public AddUserToGroupRequestAuditEventBuilder() {
+ super(AddUserToGroupRequestAuditEventBuilder.class);
super.withOperation("Membership change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/PrivilegeChangeRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/PrivilegeChangeRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/PrivilegeChangeRequestAuditEvent.java
index b6c9002..c4a259f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/PrivilegeChangeRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/PrivilegeChangeRequestAuditEvent.java
@@ -46,6 +46,7 @@ public class PrivilegeChangeRequestAuditEvent extends RequestAuditEvent {
private String role;
public PrivilegeChangeRequestAuditEventBuilder() {
+ super(PrivilegeChangeRequestAuditEventBuilder.class);
super.withOperation("Role change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/RemoveUserFromGroupRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/RemoveUserFromGroupRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/RemoveUserFromGroupRequestAuditEvent.java
index b1169ad..3fb9087 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/RemoveUserFromGroupRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/RemoveUserFromGroupRequestAuditEvent.java
@@ -41,6 +41,7 @@ public class RemoveUserFromGroupRequestAuditEvent extends RequestAuditEvent {
private String affectedUserName;
public AddUserToGroupRequestAuditEventBuilder() {
+ super(AddUserToGroupRequestAuditEventBuilder.class);
super.withOperation("User removal from group");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/StartOperationRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/StartOperationRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/StartOperationRequestAuditEvent.java
index eb92480..f685461 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/StartOperationRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/StartOperationRequestAuditEvent.java
@@ -53,6 +53,7 @@ public class StartOperationRequestAuditEvent extends AbstractUserAuditEvent {
private String hostname;
private StartOperationAuditEventBuilder() {
+ super(StartOperationAuditEventBuilder.class);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateRepositoryRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateRepositoryRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateRepositoryRequestAuditEvent.java
index ea3a0de..ad614aa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateRepositoryRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateRepositoryRequestAuditEvent.java
@@ -56,6 +56,7 @@ public class UpdateRepositoryRequestAuditEvent extends RequestAuditEvent {
private String stackVersion;
public UpdateRepositoryRequestAuditEventBuilder() {
+ super(UpdateRepositoryRequestAuditEventBuilder.class);
super.withOperation("Repository update");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateUpgradeItemRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateUpgradeItemRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateUpgradeItemRequestAuditEvent.java
index 3475f0a..3fa312e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateUpgradeItemRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UpdateUpgradeItemRequestAuditEvent.java
@@ -47,6 +47,7 @@ public class UpdateUpgradeItemRequestAuditEvent extends RequestAuditEvent {
public UpdateUpgradeItemRequestAuditEventBuilder() {
+ super(UpdateUpgradeItemRequestAuditEventBuilder.class);
super.withOperation("Action confirmation by the user");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UserPasswordChangeRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UserPasswordChangeRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UserPasswordChangeRequestAuditEvent.java
index 64a5aa1..08c0c36 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UserPasswordChangeRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/UserPasswordChangeRequestAuditEvent.java
@@ -36,6 +36,7 @@ public class UserPasswordChangeRequestAuditEvent extends RequestAuditEvent {
private String username;
public UserPasswordChangeRequestAuditEventBuilder() {
+ super(UserPasswordChangeRequestAuditEventBuilder.class);
super.withOperation("Password change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
index 73c1aa6..f282b28 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/event/request/ViewPrivilegeChangeRequestAuditEvent.java
@@ -69,6 +69,7 @@ public class ViewPrivilegeChangeRequestAuditEvent extends RequestAuditEvent {
public ViewPrivilegeChangeRequestAuditEventBuilder() {
+ super(ViewPrivilegeChangeRequestAuditEventBuilder.class);
super.withOperation("View permission change");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/request/RequestAuditEvent.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/RequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/RequestAuditEvent.java
index 200ecfa..6b94b8a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/RequestAuditEvent.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/RequestAuditEvent.java
@@ -25,9 +25,10 @@ import org.apache.ambari.server.audit.event.AbstractUserAuditEvent;
/**
* Base class for start operation audit events.
*/
-public class RequestAuditEvent extends AbstractUserAuditEvent {
+public abstract class RequestAuditEvent extends AbstractUserAuditEvent {
- public static class RequestAuditEventBuilder<T extends RequestAuditEvent, TBuilder extends RequestAuditEventBuilder<T, TBuilder>> extends AbstractUserAuditEventBuilder<T, TBuilder> {
+ public abstract static class RequestAuditEventBuilder<T extends RequestAuditEvent, TBuilder extends RequestAuditEventBuilder<T, TBuilder>>
+ extends AbstractUserAuditEventBuilder<T, TBuilder> {
/**
* Request type (PUT, POST, DELETE, etc...)
@@ -49,12 +50,8 @@ public class RequestAuditEvent extends AbstractUserAuditEvent {
*/
private String operation;
- /**
- * {@inheritDoc}
- */
- @Override
- protected T newAuditEvent() {
- return (T) new RequestAuditEvent(this);
+ protected RequestAuditEventBuilder(Class<? extends TBuilder> builderClass) {
+ super(builderClass);
}
/**
@@ -99,7 +96,7 @@ public class RequestAuditEvent extends AbstractUserAuditEvent {
public TBuilder withRequestType(Request.Type requestType) {
this.requestType = requestType;
- return (TBuilder) this;
+ return self();
}
/**
@@ -111,7 +108,7 @@ public class RequestAuditEvent extends AbstractUserAuditEvent {
public TBuilder withUrl(String url) {
this.url = url;
- return (TBuilder) this;
+ return self();
}
/**
@@ -123,7 +120,7 @@ public class RequestAuditEvent extends AbstractUserAuditEvent {
public TBuilder withResultStatus(ResultStatus resultStatus) {
this.resultStatus = resultStatus;
- return (TBuilder) this;
+ return self();
}
/**
@@ -135,7 +132,7 @@ public class RequestAuditEvent extends AbstractUserAuditEvent {
public TBuilder withOperation(String operation) {
this.operation = operation;
- return (TBuilder) this;
+ return self();
}
}
@@ -149,13 +146,5 @@ public class RequestAuditEvent extends AbstractUserAuditEvent {
super(builder);
}
- /**
- * Returns an builder for {@link RequestAuditEvent}
- *
- * @return a builder instance
- */
- public static RequestAuditEventBuilder<?, ?> builder() {
- return new RequestAuditEventBuilder();
- }
-
}
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/d1317dfb/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java
index 3ca2241..c32d82c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DefaultEventCreator.java
@@ -25,7 +25,7 @@ import org.apache.ambari.server.api.services.Request;
import org.apache.ambari.server.api.services.Result;
import org.apache.ambari.server.api.services.ResultStatus;
import org.apache.ambari.server.audit.event.AuditEvent;
-import org.apache.ambari.server.audit.request.RequestAuditEvent;
+import org.apache.ambari.server.audit.event.request.DefaultRequestAuditEvent;
import org.apache.ambari.server.audit.request.RequestAuditLogger;
import org.apache.ambari.server.controller.spi.Resource;
@@ -72,7 +72,7 @@ public class DefaultEventCreator implements RequestAuditEventCreator {
@Override
public AuditEvent createAuditEvent(final Request request, final Result result) {
- return RequestAuditEvent.builder()
+ return DefaultRequestAuditEvent.builder()
.withTimestamp(System.currentTimeMillis())
.withRemoteIp(request.getRemoteAddress())
.withRequestType(request.getRequestType())