Fix imports
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97766612 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97766612 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97766612 Branch: refs/heads/audit_logging Commit: 977666129229e40e32ec868cf231c0d6d51b0a4e Parents: b07aa18 Author: Daniel Gergely <dgerg...@hortonworks.com> Authored: Tue Feb 23 14:11:25 2016 +0100 Committer: Toader, Sebastian <stoa...@hortonworks.com> Committed: Thu Mar 24 13:06:46 2016 +0100 ---------------------------------------------------------------------- ...eleteRepositoryVersionRequestAuditEvent.java | 3 - .../event/DeleteServiceRequestAuditEvent.java | 77 ++++++++++++++++++++ .../eventcreator/AlertGroupEventCreator.java | 5 -- .../eventcreator/ComponentEventCreator.java | 1 - .../DeleteServiceRequestAuditEvent.java | 77 -------------------- .../request/eventcreator/HostEventCreator.java | 4 - .../eventcreator/RepositoryEventCreator.java | 6 -- .../RepositoryVersionEventCreator.java | 2 - .../eventcreator/ServiceEventCreator.java | 1 + 9 files changed, 78 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteRepositoryVersionRequestAuditEvent.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteRepositoryVersionRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteRepositoryVersionRequestAuditEvent.java index 25c3dc1..8e97fbd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteRepositoryVersionRequestAuditEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteRepositoryVersionRequestAuditEvent.java @@ -18,9 +18,6 @@ package org.apache.ambari.server.audit.request.event; -import java.util.List; -import java.util.Map; - import org.apache.ambari.server.audit.request.RequestAuditEvent; public class DeleteRepositoryVersionRequestAuditEvent extends RequestAuditEvent { http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteServiceRequestAuditEvent.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteServiceRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteServiceRequestAuditEvent.java new file mode 100644 index 0000000..6b5b262 --- /dev/null +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/event/DeleteServiceRequestAuditEvent.java @@ -0,0 +1,77 @@ +/* + * 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.request.event; + +import org.apache.ambari.server.audit.request.RequestAuditEvent; + +public class DeleteServiceRequestAuditEvent extends RequestAuditEvent { + + public static class DeleteServiceRequestAuditEventBuilder extends RequestAuditEventBuilder<DeleteServiceRequestAuditEvent, DeleteServiceRequestAuditEventBuilder> { + + private String serviceName; + + public DeleteServiceRequestAuditEventBuilder() { + super.withOperation("Service deletion"); + } + + @Override + protected DeleteServiceRequestAuditEvent newAuditEvent() { + return new DeleteServiceRequestAuditEvent(this); + } + + /** + * Appends to the event the details of the incoming request. + * @param builder builder for the audit event details. + */ + @Override + protected void buildAuditMessage(StringBuilder builder) { + super.buildAuditMessage(builder); + + builder + .append(", Service(") + .append(serviceName) + .append(")"); + } + + public DeleteServiceRequestAuditEventBuilder withService(String service) { + this.serviceName = service; + return this; + } + + } + + protected DeleteServiceRequestAuditEvent() { + } + + /** + * {@inheritDoc} + */ + protected DeleteServiceRequestAuditEvent(DeleteServiceRequestAuditEventBuilder builder) { + super(builder); + } + + /** + * Returns an builder for {@link DeleteServiceRequestAuditEvent} + * @return a builder instance + */ + public static DeleteServiceRequestAuditEventBuilder builder() { + return new DeleteServiceRequestAuditEventBuilder(); + } + +} http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java index a34e2d6..c4f2b9d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/AlertGroupEventCreator.java @@ -20,9 +20,7 @@ package org.apache.ambari.server.audit.request.eventcreator; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.ambari.server.api.services.Request; @@ -31,11 +29,8 @@ import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.audit.AuditEvent; import org.apache.ambari.server.audit.request.RequestAuditEventCreator; import org.apache.ambari.server.audit.request.event.AddAlertGroupRequestAuditEvent; -import org.apache.ambari.server.audit.request.event.AddUserToGroupRequestAuditEvent; import org.apache.ambari.server.audit.request.event.ChangeAlertGroupRequestAuditEvent; import org.apache.ambari.server.audit.request.event.DeleteAlertGroupRequestAuditEvent; -import org.apache.ambari.server.audit.request.event.MembershipChangeRequestAuditEvent; -import org.apache.ambari.server.audit.request.event.RemoveUserFromGroupRequestAuditEvent; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.joda.time.DateTime; http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java index 0068303..91dff07 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ComponentEventCreator.java @@ -18,7 +18,6 @@ package org.apache.ambari.server.audit.request.eventcreator; -import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DeleteServiceRequestAuditEvent.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DeleteServiceRequestAuditEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DeleteServiceRequestAuditEvent.java deleted file mode 100644 index f6083d1..0000000 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/DeleteServiceRequestAuditEvent.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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.request.eventcreator; - -import org.apache.ambari.server.audit.request.RequestAuditEvent; - -public class DeleteServiceRequestAuditEvent extends RequestAuditEvent { - - public static class DeleteServiceRequestAuditEventBuilder extends RequestAuditEventBuilder<DeleteServiceRequestAuditEvent, DeleteServiceRequestAuditEventBuilder> { - - private String serviceName; - - public DeleteServiceRequestAuditEventBuilder() { - super.withOperation("Service deletion"); - } - - @Override - protected DeleteServiceRequestAuditEvent newAuditEvent() { - return new DeleteServiceRequestAuditEvent(this); - } - - /** - * Appends to the event the details of the incoming request. - * @param builder builder for the audit event details. - */ - @Override - protected void buildAuditMessage(StringBuilder builder) { - super.buildAuditMessage(builder); - - builder - .append(", Service(") - .append(serviceName) - .append(")"); - } - - public DeleteServiceRequestAuditEventBuilder withService(String service) { - this.serviceName = service; - return this; - } - - } - - protected DeleteServiceRequestAuditEvent() { - } - - /** - * {@inheritDoc} - */ - protected DeleteServiceRequestAuditEvent(DeleteServiceRequestAuditEventBuilder builder) { - super(builder); - } - - /** - * Returns an builder for {@link DeleteServiceRequestAuditEvent} - * @return a builder instance - */ - public static DeleteServiceRequestAuditEventBuilder builder() { - return new DeleteServiceRequestAuditEventBuilder(); - } - -} http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java index 837f6b6..6ab03ca 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/HostEventCreator.java @@ -26,14 +26,10 @@ 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.AuditEvent; -import org.apache.ambari.server.audit.StartOperationFailedAuditEvent; -import org.apache.ambari.server.audit.StartOperationSucceededAuditEvent; import org.apache.ambari.server.audit.request.RequestAuditEventCreator; import org.apache.ambari.server.audit.request.event.AddComponentToHostRequestAuditEvent; import org.apache.ambari.server.audit.request.event.AddHostRequestAuditEvent; -import org.apache.ambari.server.audit.request.event.DeleteAlertGroupRequestAuditEvent; import org.apache.ambari.server.audit.request.event.DeleteHostRequestAuditEvent; -import org.apache.ambari.server.controller.internal.RequestOperationLevel; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.joda.time.DateTime; http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java index 6339727..1105811 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java @@ -19,11 +19,7 @@ package org.apache.ambari.server.audit.request.eventcreator; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import java.util.Set; import org.apache.ambari.server.api.services.Request; @@ -32,8 +28,6 @@ import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.audit.AuditEvent; import org.apache.ambari.server.audit.request.RequestAuditEventCreator; import org.apache.ambari.server.audit.request.event.AddRepositoryRequestAuditEvent; -import org.apache.ambari.server.audit.request.event.ClusterPrivilegeChangeRequestAuditEvent; -import org.apache.ambari.server.audit.request.event.PrivilegeChangeRequestAuditEvent; import org.apache.ambari.server.audit.request.event.UpdateRepositoryRequestAuditEvent; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.utilities.PropertyHelper; http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java index 7d5de64..468dd1c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java @@ -31,11 +31,9 @@ import org.apache.ambari.server.api.services.Result; import org.apache.ambari.server.api.services.ResultStatus; import org.apache.ambari.server.audit.AuditEvent; import org.apache.ambari.server.audit.request.RequestAuditEventCreator; -import org.apache.ambari.server.audit.request.event.AddRepositoryRequestAuditEvent; import org.apache.ambari.server.audit.request.event.AddRepositoryVersionRequestAuditEvent; import org.apache.ambari.server.audit.request.event.ChangeRepositoryVersionRequestAuditEvent; import org.apache.ambari.server.audit.request.event.DeleteRepositoryVersionRequestAuditEvent; -import org.apache.ambari.server.audit.request.event.UpdateRepositoryRequestAuditEvent; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.joda.time.DateTime; http://git-wip-us.apache.org/repos/asf/ambari/blob/97766612/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java index 9b2f064..352c3d0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/ServiceEventCreator.java @@ -29,6 +29,7 @@ import org.apache.ambari.server.audit.AuditEvent; import org.apache.ambari.server.audit.StartOperationFailedAuditEvent; import org.apache.ambari.server.audit.StartOperationSucceededAuditEvent; import org.apache.ambari.server.audit.request.RequestAuditEventCreator; +import org.apache.ambari.server.audit.request.event.DeleteServiceRequestAuditEvent; import org.apache.ambari.server.controller.internal.RequestOperationLevel; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.utilities.PropertyHelper;