This is an automated email from the ASF dual-hosted git repository. hapylestat pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push: new 24dbed2 AMBARI-25516. Missing @Override on 91 methods (#3198) (rickyma via dgrinenko) 24dbed2 is described below commit 24dbed27b97f4c82835273758f0bceb3334b4ef2 Author: RickyMa <mhx8...@gmail.com> AuthorDate: Tue Jun 30 23:55:00 2020 +0800 AMBARI-25516. Missing @Override on 91 methods (#3198) (rickyma via dgrinenko) --- .../org/apache/ambari/tools/zk/ZkConnection.java | 1 + .../ServiceComponentHostEventWrapper.java | 1 + .../org/apache/ambari/server/agent/HostInfo.java | 1 + .../ambari/server/api/services/ResultImpl.java | 2 + .../ambari/server/bootstrap/FifoLinkedHashMap.java | 1 + .../ambari/server/cleanup/CleanupServiceImpl.java | 1 + .../server/configuration/SingleFileWatch.java | 1 + .../controller/AmbariManagementControllerImpl.java | 1 + .../ambari/server/controller/HostRequest.java | 1 + .../ambari/server/controller/ShortTaskStatus.java | 1 + .../server/controller/ViewPrivilegeRequest.java | 5 ++ .../controller/internal/AppCookieManager.java | 2 + .../internal/ExtensionLinkResourceProvider.java | 1 + .../logging/LoggingRequestHelperImpl.java | 2 + .../server/events/AgentConfigsUpdateEvent.java | 1 + .../ambari/server/events/TopologyUpdateEvent.java | 2 + .../ldap/domain/AmbariLdapConfiguration.java | 1 + .../metrics/system/impl/AmbariMetricSinkImpl.java | 2 + .../dispatchers/AmbariSNMPDispatcher.java | 1 + .../apache/ambari/server/orm/DBAccessorImpl.java | 4 + .../server/orm/cache/HostConfigMappingImpl.java | 1 + .../server/orm/dao/AmbariConfigurationDAO.java | 1 + .../server/orm/entities/BlueprintConfigEntity.java | 8 ++ .../server/orm/entities/HostGroupConfigEntity.java | 8 ++ .../ambari/server/orm/entities/SettingEntity.java | 1 + .../server/scheduler/ExecutionScheduleManager.java | 1 + .../server/security/InternalSSLSocketFactory.java | 3 + .../authorization/AmbariLdapBindAuthenticator.java | 7 +- .../server/security/authorization/Users.java | 98 ++++++++++------------ .../security/credential/GenericKeyCredential.java | 1 + .../credential/PrincipalKeyCredential.java | 1 + .../org/apache/ambari/server/stack/BaseModule.java | 1 + .../ambari/server/state/action/ActionId.java | 1 + .../apache/ambari/server/state/host/HostImpl.java | 2 + .../state/host/HostStatusUpdatesReceivedEvent.java | 1 + .../AbstractKerberosDescriptorContainer.java | 1 + .../DefaultQuickLinkVisibilityController.java | 1 + .../server/state/stack/MetricDefinition.java | 1 + .../ambari/server/topology/BlueprintImpl.java | 5 ++ .../ambari/server/topology/HostGroupImpl.java | 2 + .../ambari/server/topology/RepositorySetting.java | 1 + .../server/topology/tasks/TopologyHostTask.java | 1 + .../validators/RequiredPasswordValidator.java | 1 + .../server/upgrade/AbstractUpgradeCatalog.java | 1 + .../server/utils/ManagedThreadPoolExecutor.java | 1 + .../utils/ScheduledExecutorCompletionService.java | 5 +- .../ambari/server/view/ViewDirectoryWatcher.java | 1 + .../ambari/server/view/events/EventImpl.java | 4 + .../apache/ambari/swagger/AmbariSwaggerReader.java | 1 + 49 files changed, 132 insertions(+), 61 deletions(-) diff --git a/ambari-agent/src/main/java/org/apache/ambari/tools/zk/ZkConnection.java b/ambari-agent/src/main/java/org/apache/ambari/tools/zk/ZkConnection.java index 6bac892..ae74b4b 100644 --- a/ambari-agent/src/main/java/org/apache/ambari/tools/zk/ZkConnection.java +++ b/ambari-agent/src/main/java/org/apache/ambari/tools/zk/ZkConnection.java @@ -41,6 +41,7 @@ public class ZkConnection { { final CountDownLatch connSignal = new CountDownLatch(1); ZooKeeper zooKeeper = new ZooKeeper(serverAddress, sessionTimeoutMillis, new Watcher() { + @Override public void process(WatchedEvent event) { if (event.getState() == SyncConnected) { connSignal.countDown(); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java index 7bce6b8..f21cfba 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java @@ -66,6 +66,7 @@ public class ServiceComponentHostEventWrapper { } } + @Override public String toString() { if (event != null) { return event.toString(); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java index 8fe82de..6bbcbf6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java @@ -445,6 +445,7 @@ public class HostInfo { return ret.toString(); } + @Override public String toString() { return "[" + "hostname=" + this.hostname + "," + diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java index dd66c0d..6e03a33 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java @@ -88,10 +88,12 @@ public class ResultImpl implements Result { m_status = status; } + @Override public void setResultMetadata(ResultMetadata resultMetadata) { m_resultMetadata = resultMetadata; } + @Override public ResultMetadata getResultMetadata() { return m_resultMetadata; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/FifoLinkedHashMap.java b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/FifoLinkedHashMap.java index ab6765f..05f328c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/FifoLinkedHashMap.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/FifoLinkedHashMap.java @@ -29,6 +29,7 @@ import java.util.Map; public class FifoLinkedHashMap<K, V> extends LinkedHashMap<K, V> { public static final int MAX_ENTRIES = 100; + @Override protected boolean removeEldestEntry(Map.Entry<K, V> eldest) { return size() > MAX_ENTRIES; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java index 0436c92..d636c61 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java @@ -73,6 +73,7 @@ public class CleanupServiceImpl implements CleanupService<TimeBasedCleanupPolicy * @param cleanupPolicy the policy based on which the cleanup is done * @return the number of affected rows */ + @Override public CleanupResult cleanup(TimeBasedCleanupPolicy cleanupPolicy) { long affectedRows = 0; int errorCount = 0; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/SingleFileWatch.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/SingleFileWatch.java index 3d9e8e2..d06acdb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/SingleFileWatch.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/SingleFileWatch.java @@ -89,6 +89,7 @@ public class SingleFileWatch { watchdog.interrupt(); } + @Override public String toString() { return "SingleFileWatcher:" + file.getName(); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java index c6794f8..bb59855 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java @@ -870,6 +870,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle /** * {@inheritDoc} */ + @Override public TopologyUpdateEvent getAddedComponentsTopologyEvent(Set<ServiceComponentHostRequest> requests) throws AmbariException { TreeMap<String, TopologyCluster> topologyUpdates = new TreeMap<>(); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java index a40b68e..7ca1be0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java @@ -112,6 +112,7 @@ public class HostRequest implements ApiModel { return hostGroup; } + @Override public String toString() { return "{ hostname=" + hostname + ", clusterName=" + clusterName + " }"; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ShortTaskStatus.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ShortTaskStatus.java index df40aa8..287ccc4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ShortTaskStatus.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ShortTaskStatus.java @@ -142,6 +142,7 @@ public class ShortTaskStatus { this.status = status; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("ShortTaskStatusDump ") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ViewPrivilegeRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ViewPrivilegeRequest.java index c08dbc4..a0eadbb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ViewPrivilegeRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ViewPrivilegeRequest.java @@ -36,6 +36,7 @@ public class ViewPrivilegeRequest extends ViewPrivilegeResponse implements ApiMo * Hide privilege id in request body schema * @return privilege id */ + @Override @ApiModelProperty(name = PrivilegeResourceProvider.PRIVILEGE_ID_PROPERTY_ID, hidden = true) public Integer getPrivilegeId() { return privilegeId; @@ -45,6 +46,7 @@ public class ViewPrivilegeRequest extends ViewPrivilegeResponse implements ApiMo * Hide permission label in request body schema * @return permission label */ + @Override @ApiModelProperty(name = PrivilegeResourceProvider.PERMISSION_LABEL_PROPERTY_ID, hidden = true) public String getPermissionLabel() { return permissionLabel; @@ -54,6 +56,7 @@ public class ViewPrivilegeRequest extends ViewPrivilegeResponse implements ApiMo * Hide view name in request body schema * @return view name */ + @Override @ApiModelProperty(name = ViewPrivilegeResourceProvider.VIEW_NAME_PROPERTY_ID, hidden = true) public String getViewName() { return viewName; @@ -63,6 +66,7 @@ public class ViewPrivilegeRequest extends ViewPrivilegeResponse implements ApiMo * Hide view version in request body schema * @return view version */ + @Override @ApiModelProperty(name = ViewPrivilegeResourceProvider.VERSION_PROPERTY_ID, hidden = true) public String getVersion() { return version; @@ -72,6 +76,7 @@ public class ViewPrivilegeRequest extends ViewPrivilegeResponse implements ApiMo * Hide view instance name in request body schema * @return view instance name */ + @Override @ApiModelProperty(name = ViewPrivilegeResourceProvider.INSTANCE_NAME_PROPERTY_ID, hidden = true) public String getInstanceName() { return instanceName; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java index 4c63d1e..2e46176 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java @@ -196,10 +196,12 @@ public class AppCookieManager { private static class EmptyJaasCredentials implements Credentials { + @Override public String getPassword() { return null; } + @Override public Principal getUserPrincipal() { return null; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java index bbdfc82..f6e09fd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java @@ -131,6 +131,7 @@ public class ExtensionLinkResourceProvider extends AbstractControllerResourcePro return getRequestStatus(null); } + @Override protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java index 88b7fe9..4c7d031 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java @@ -156,6 +156,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper { this.logSearchReadTimeoutInMilliseconds = logSearchReadTimeoutInMilliseconds; } + @Override public LogQueryResponse sendQueryRequest(Map<String, String> queryParameters) { try { // use the Apache builder to create the correct URI @@ -302,6 +303,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper { return null; } + @Override public HostLogFilesResponse sendGetLogFileNamesRequest(String hostName) { try { // use the Apache builder to create the correct URI diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java index 6ded338..44355bc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java @@ -64,6 +64,7 @@ public class AgentConfigsUpdateEvent extends STOMPHostEvent implements Hashable return hash; } + @Override public void setHash(String hash) { this.hash = hash; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java index 6faa80d..b1197ea 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java @@ -81,10 +81,12 @@ public class TopologyUpdateEvent extends STOMPEvent implements Hashable { return eventType; } + @Override public String getHash() { return hash; } + @Override public void setHash(String hash) { this.hash = hash; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java index 43b11a9..d7a7d29 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java @@ -199,6 +199,7 @@ public class AmbariLdapConfiguration extends AmbariServerConfiguration { return Boolean.valueOf(configValue(AmbariServerConfigurationKey.DISABLE_ENDPOINT_IDENTIFICATION)); } + @Override public Map<String, String> toMap() { return new HashMap<>(configurationMap); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java index 0a1119e..2a5b69e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java @@ -300,10 +300,12 @@ public class AmbariMetricSinkImpl extends AbstractTimelineMetricsSink implements return hostName; } + @Override protected boolean isHostInMemoryAggregationEnabled() { return false; } + @Override protected int getHostInMemoryAggregationPort() { return 0; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java index f4b2564..0c2489a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java @@ -99,6 +99,7 @@ public class AmbariSNMPDispatcher extends SNMPDispatcher { * {@inheritDoc} * Uses default Ambari OIDs */ + @Override protected PDU prepareTrap(Notification notification, SnmpVersion snmpVersion) throws InvalidSnmpConfigurationException { AlertNotification alertNotification; PDU pdu = DefaultPDUFactory.createPDU(snmpVersion.getTargetVersion()); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java index 328cce6..379ce08 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java @@ -888,6 +888,7 @@ public class DBAccessorImpl implements DBAccessor { /** {@inheritDoc} */ + @Override public void executePreparedQuery(String query, Object...arguments) throws SQLException { executePreparedQuery(query, false, arguments); } @@ -895,6 +896,7 @@ public class DBAccessorImpl implements DBAccessor { /** {@inheritDoc} */ + @Override public void executePreparedQuery(String query, boolean ignoreFailure, Object...arguments) throws SQLException{ LOG.info("Executing prepared query: {}", query); @@ -920,6 +922,7 @@ public class DBAccessorImpl implements DBAccessor { /** {@inheritDoc} */ + @Override public void executePreparedUpdate(String query, Object...arguments) throws SQLException { executePreparedUpdate(query, false, arguments); } @@ -927,6 +930,7 @@ public class DBAccessorImpl implements DBAccessor { /** {@inheritDoc} */ + @Override public void executePreparedUpdate(String query, boolean ignoreFailure, Object...arguments) throws SQLException{ LOG.info("Executing prepared query: {}", query); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/cache/HostConfigMappingImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/cache/HostConfigMappingImpl.java index 5da7f95..7940ce8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/cache/HostConfigMappingImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/cache/HostConfigMappingImpl.java @@ -105,6 +105,7 @@ public class HostConfigMappingImpl implements HostConfigMapping { throw new RuntimeException("Version couldn't be null"); this.version = version; } + @Override public String getServiceName() { return serviceName; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java index e4446d7..4a40423 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java @@ -76,6 +76,7 @@ public class AmbariConfigurationDAO extends CrudDAO<AmbariConfigurationEntity, A return query.executeUpdate(); } + @Override @Transactional public void create(AmbariConfigurationEntity entity) { // make sure only one entry exists per configuration type... diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintConfigEntity.java index 1620779..80aabc9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintConfigEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintConfigEntity.java @@ -64,6 +64,7 @@ public class BlueprintConfigEntity implements BlueprintConfiguration { * * @return configuration type */ + @Override public String getType() { return type; } @@ -73,6 +74,7 @@ public class BlueprintConfigEntity implements BlueprintConfiguration { * * @param type configuration type */ + @Override public void setType(String type) { this.type = type; } @@ -100,6 +102,7 @@ public class BlueprintConfigEntity implements BlueprintConfiguration { * * @return blueprint name */ + @Override public String getBlueprintName() { return blueprintName; } @@ -109,6 +112,7 @@ public class BlueprintConfigEntity implements BlueprintConfiguration { * ' * @param blueprintName blueprint name */ + @Override public void setBlueprintName(String blueprintName) { this.blueprintName = blueprintName; } @@ -118,6 +122,7 @@ public class BlueprintConfigEntity implements BlueprintConfiguration { * * @return config data in json format */ + @Override public String getConfigData() { return configData; } @@ -127,6 +132,7 @@ public class BlueprintConfigEntity implements BlueprintConfiguration { * * @param configData all config data in json format */ + @Override public void setConfigData(String configData) { this.configData = configData; } @@ -136,6 +142,7 @@ public class BlueprintConfigEntity implements BlueprintConfiguration { * * @return config attributes in JSON format */ + @Override public String getConfigAttributes() { return configAttributes; } @@ -145,6 +152,7 @@ public class BlueprintConfigEntity implements BlueprintConfiguration { * * @param configAttributes all attribute values of configs in JSON format */ + @Override public void setConfigAttributes(String configAttributes) { this.configAttributes = configAttributes; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupConfigEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupConfigEntity.java index dc64712..a96b242 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupConfigEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupConfigEntity.java @@ -74,6 +74,7 @@ public class HostGroupConfigEntity implements BlueprintConfiguration { * * @return configuration type */ + @Override public String getType() { return type; } @@ -83,6 +84,7 @@ public class HostGroupConfigEntity implements BlueprintConfiguration { * * @param type configuration type */ + @Override public void setType(String type) { this.type = type; } @@ -110,6 +112,7 @@ public class HostGroupConfigEntity implements BlueprintConfiguration { * * @return blueprint name */ + @Override public String getBlueprintName() { return blueprintName; } @@ -119,6 +122,7 @@ public class HostGroupConfigEntity implements BlueprintConfiguration { * ' * @param blueprintName blueprint name */ + @Override public void setBlueprintName(String blueprintName) { this.blueprintName = blueprintName; } @@ -146,6 +150,7 @@ public class HostGroupConfigEntity implements BlueprintConfiguration { * * @return config data in json format */ + @Override public String getConfigData() { return configData; } @@ -155,6 +160,7 @@ public class HostGroupConfigEntity implements BlueprintConfiguration { * * @param configData all config data in json format */ + @Override public void setConfigData(String configData) { this.configData = configData; } @@ -164,6 +170,7 @@ public class HostGroupConfigEntity implements BlueprintConfiguration { * * @return config attributes in JSON format */ + @Override public String getConfigAttributes() { return configAttributes; } @@ -173,6 +180,7 @@ public class HostGroupConfigEntity implements BlueprintConfiguration { * * @param configAttributes all attribute values of configs in JSON format */ + @Override public void setConfigAttributes(String configAttributes) { this.configAttributes = configAttributes; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/SettingEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/SettingEntity.java index b9e047b..c11a5bd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/SettingEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/SettingEntity.java @@ -118,6 +118,7 @@ public class SettingEntity { this.updateTimestamp = updateTimestamp; } + @Override public SettingEntity clone() { SettingEntity cloned = new SettingEntity(); cloned.setId(id); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java index bf51abe..bdc08e4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java @@ -175,6 +175,7 @@ public class ExecutionScheduleManager { } + @Override public X509Certificate[] getAcceptedIssuers() { return null; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java index fa67889..d39e0a7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java @@ -99,14 +99,17 @@ public class InternalSSLSocketFactory extends SSLSocketFactory { * chain of trust or hostname. */ public static class LenientTrustManager extends X509ExtendedTrustManager implements X509TrustManager { + @Override public void checkClientTrusted(X509Certificate[] xcs, String string) throws CertificateException { // do nothing } + @Override public void checkServerTrusted(X509Certificate[] xcs, String string) throws CertificateException { // do nothing } + @Override public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java index ea0f5f0..4adbd2b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java @@ -289,12 +289,7 @@ public class AmbariLdapBindAuthenticator extends AbstractLdapAuthenticator { String setAmbariAdminAttrFilter = resolveAmbariAdminAttrFilter(ldapServerProperties, memberValue); LOG.debug("LDAP login - set admin attr filter: {}", setAmbariAdminAttrFilter); - AttributesMapper attributesMapper = new AttributesMapper() { - public Object mapFromAttributes(Attributes attrs) - throws NamingException { - return attrs.get(groupNamingAttribute).get(); - } - }; + AttributesMapper attributesMapper = attrs -> attrs.get(groupNamingAttribute).get(); LdapTemplate ldapTemplate = new LdapTemplate((getContextSource())); ldapTemplate.setIgnorePartialResultException(true); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java index 7ea5da6..b925860 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java @@ -1372,19 +1372,17 @@ public class Users { addAuthentication(userEntity, UserAuthenticationType.JWT, key, - new Validator() { - public void validate(UserEntity userEntity, String key) throws AmbariException { - List<UserAuthenticationEntity> authenticationEntities = userEntity.getAuthenticationEntities(); - - // Ensure only one UserAuthenticationEntity exists for JWT for the user... - for (UserAuthenticationEntity entity : authenticationEntities) { - if ((entity.getAuthenticationType() == UserAuthenticationType.JWT) && - ((key == null) ? (entity.getAuthenticationKey() == null) : key.equals(entity.getAuthenticationKey()))) { - throw new AmbariException("The authentication type already exists for this user"); + (user, authKey) -> { + List<UserAuthenticationEntity> authenticationEntities = user.getAuthenticationEntities(); + + // Ensure only one UserAuthenticationEntity exists for JWT for the user... + for (UserAuthenticationEntity entity : authenticationEntities) { + if ((entity.getAuthenticationType() == UserAuthenticationType.JWT) && + ((authKey == null) ? (entity.getAuthenticationKey() == null) : authKey.equals(entity.getAuthenticationKey()))) { + throw new AmbariException("The authentication type already exists for this user"); + } } - } - } - }, + }, persist); } @@ -1414,14 +1412,12 @@ public class Users { addAuthentication(userEntity, UserAuthenticationType.KERBEROS, principalName, - new Validator() { - public void validate(UserEntity userEntity, String key) throws AmbariException { - // Ensure no other authentication entries exist for the same principal... - if (!CollectionUtils.isEmpty(userAuthenticationDAO.findByTypeAndKey(UserAuthenticationType.KERBEROS, key))) { - throw new AmbariException("The authentication type already exists for this principal"); - } - } - }, + (user, key) -> { + // Ensure no other authentication entries exist for the same principal... + if (!CollectionUtils.isEmpty(userAuthenticationDAO.findByTypeAndKey(UserAuthenticationType.KERBEROS, key))) { + throw new AmbariException("The authentication type already exists for this principal"); + } + }, persist); } @@ -1462,18 +1458,16 @@ public class Users { addAuthentication(userEntity, UserAuthenticationType.LOCAL, encodedPassword, - new Validator() { - public void validate(UserEntity userEntity, String key) throws AmbariException { - List<UserAuthenticationEntity> authenticationEntities = userEntity.getAuthenticationEntities(); - - // Ensure only one UserAuthenticationEntity exists for LOCAL for the user... - for (UserAuthenticationEntity entity : authenticationEntities) { - if (entity.getAuthenticationType() == UserAuthenticationType.LOCAL) { - throw new AmbariException("The authentication type already exists for this user"); + (user, key) -> { + List<UserAuthenticationEntity> authenticationEntities = user.getAuthenticationEntities(); + + // Ensure only one UserAuthenticationEntity exists for LOCAL for the user... + for (UserAuthenticationEntity entity : authenticationEntities) { + if (entity.getAuthenticationType() == UserAuthenticationType.LOCAL) { + throw new AmbariException("The authentication type already exists for this user"); + } } - } - } - }, + }, persist); } @@ -1503,18 +1497,16 @@ public class Users { addAuthentication(userEntity, UserAuthenticationType.PAM, userName, - new Validator() { - public void validate(UserEntity userEntity, String key) throws AmbariException { - List<UserAuthenticationEntity> authenticationEntities = userEntity.getAuthenticationEntities(); - - // Ensure only one UserAuthenticationEntity exists for PAM for the user... - for (UserAuthenticationEntity entity : authenticationEntities) { - if (entity.getAuthenticationType() == UserAuthenticationType.PAM) { - throw new AmbariException("The authentication type already exists for this user"); + (user, key) -> { + List<UserAuthenticationEntity> authenticationEntities = user.getAuthenticationEntities(); + + // Ensure only one UserAuthenticationEntity exists for PAM for the user... + for (UserAuthenticationEntity entity : authenticationEntities) { + if (entity.getAuthenticationType() == UserAuthenticationType.PAM) { + throw new AmbariException("The authentication type already exists for this user"); + } } - } - } - }, + }, persist); } @@ -1544,19 +1536,17 @@ public class Users { addAuthentication(userEntity, UserAuthenticationType.LDAP, StringUtils.lowerCase(dn), // DNs are case-insensitive and are stored internally as the bytes of lowercase characters - new Validator() { - public void validate(UserEntity userEntity, String key) throws AmbariException { - List<UserAuthenticationEntity> authenticationEntities = userEntity.getAuthenticationEntities(); - - // Ensure only one UserAuthenticationEntity exists for LDAP for the user... - for (UserAuthenticationEntity entity : authenticationEntities) { - if ((entity.getAuthenticationType() == UserAuthenticationType.LDAP) && - ((key == null) ? (entity.getAuthenticationKey() == null) : key.equalsIgnoreCase(entity.getAuthenticationKey()))) { - throw new AmbariException("The authentication type already exists for this user"); + (user, key) -> { + List<UserAuthenticationEntity> authenticationEntities = user.getAuthenticationEntities(); + + // Ensure only one UserAuthenticationEntity exists for LDAP for the user... + for (UserAuthenticationEntity entity : authenticationEntities) { + if ((entity.getAuthenticationType() == UserAuthenticationType.LDAP) && + ((key == null) ? (entity.getAuthenticationKey() == null) : key.equalsIgnoreCase(entity.getAuthenticationKey()))) { + throw new AmbariException("The authentication type already exists for this user"); + } } - } - } - }, + }, persist); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/credential/GenericKeyCredential.java b/ambari-server/src/main/java/org/apache/ambari/server/security/credential/GenericKeyCredential.java index ac74017..d03ff99 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/credential/GenericKeyCredential.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/credential/GenericKeyCredential.java @@ -63,6 +63,7 @@ public class GenericKeyCredential implements Credential { * * @return a String containing the value representation of this GenericKeyCredential */ + @Override public char[] toValue() { return this.key; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java b/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java index 4133250..f019104 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java @@ -101,6 +101,7 @@ public class PrincipalKeyCredential implements Credential { * * @return a String containing the value representation of this PrincipalKeyCredential */ + @Override public char[] toValue() { StringBuilder builder = new StringBuilder(); builder.append("PrincipalKeyCredential"); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java index 3288eb9..72090e5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java @@ -45,6 +45,7 @@ public abstract class BaseModule<T, I> implements StackDefinitionModule<T, I> { * * @return the module's state */ + @Override public ModuleState getModuleState() { return moduleState; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionId.java b/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionId.java index d1a4804..ef0c293 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionId.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionId.java @@ -31,6 +31,7 @@ public class ActionId { this.actionType = actionType; } + @Override public String toString() { return "[ actionId=" + actionId + ", actionType=" + actionType + "]"; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java index 4b5a2dd..52b9a42 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java @@ -903,10 +903,12 @@ public class HostImpl implements Host { this.lastHeartbeatTime = lastHeartbeatTime; } + @Override public long getLastAgentStartTime() { return lastAgentStartTime; } + @Override public void setLastAgentStartTime(long lastAgentStartTime) { this.lastAgentStartTime = lastAgentStartTime; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostStatusUpdatesReceivedEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostStatusUpdatesReceivedEvent.java index 0b256c8..f64bb29 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostStatusUpdatesReceivedEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostStatusUpdatesReceivedEvent.java @@ -36,6 +36,7 @@ public class HostStatusUpdatesReceivedEvent extends HostEvent { /** * @return the timestamp */ + @Override public long getTimestamp() { return timestamp; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorContainer.java b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorContainer.java index bd98771..be90934 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorContainer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorContainer.java @@ -534,6 +534,7 @@ public abstract class AbstractKerberosDescriptorContainer extends AbstractKerber * * @return true if this AbstractKerberosDescriptor is a container, false otherwise */ + @Override public boolean isContainer() { return true; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/DefaultQuickLinkVisibilityController.java b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/DefaultQuickLinkVisibilityController.java index b8f6f1b..22165a6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/DefaultQuickLinkVisibilityController.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/DefaultQuickLinkVisibilityController.java @@ -116,6 +116,7 @@ public class DefaultQuickLinkVisibilityController implements QuickLinkVisibility * @param quickLink the quicklink * @return a boolean indicating whether the link in the parameter should be visible */ + @Override public boolean isVisible(@Nonnull String service, @Nonnull Link quickLink) { // First, component rules are evaluated if exist and applicable Optional<Boolean> componentResult = evaluateComponentRules(service, quickLink); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java index 1f2f873..181794f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java @@ -71,6 +71,7 @@ public class MetricDefinition { return metricMap; } + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{type=").append(type); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java index b18e9a6..049039b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java @@ -102,6 +102,7 @@ public class BlueprintImpl implements Blueprint { this.setting = setting; } + @Override public String getName() { return name; } @@ -114,6 +115,7 @@ public class BlueprintImpl implements Blueprint { return stack.getVersion(); } + @Override public SecurityConfiguration getSecurity() { return security; } @@ -330,6 +332,7 @@ public class BlueprintImpl implements Blueprint { validator.validateTopology(); } + @Override public BlueprintEntity toEntity() { BlueprintEntity entity = new BlueprintEntity(); @@ -617,6 +620,7 @@ public class BlueprintImpl implements Blueprint { /** * A config type is valid if there are services related to except cluster-env and global. */ + @Override public boolean isValidConfigType(String configType) { if (ConfigHelper.CLUSTER_ENV.equals(configType) || "global".equals(configType)) { return true; @@ -648,6 +652,7 @@ public class BlueprintImpl implements Blueprint { return result; } + @Override public List<RepositorySetting> getRepositorySettings(){ return repoSettings; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostGroupImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostGroupImpl.java index c60ec0a..29a59b8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostGroupImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostGroupImpl.java @@ -167,6 +167,7 @@ public class HostGroupImpl implements HostGroup { * * @return true if component was added; false if component already existed */ + @Override public boolean addComponent(String component, ProvisionAction provisionAction) { boolean added; if (!components.containsKey(component)) { @@ -284,6 +285,7 @@ public class HostGroupImpl implements HostGroup { Map<String, Map<String, Map<String, String>>> attributes = new HashMap<>(); configuration = new Configuration(config, attributes); } + @Override public String toString(){ return name; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/RepositorySetting.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/RepositorySetting.java index 35e370e..769f762 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/RepositorySetting.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/RepositorySetting.java @@ -105,6 +105,7 @@ public class RepositorySetting { this.baseUrl = baseUrl; } + @Override public String toString(){ StringBuilder strBldr = new StringBuilder(); strBldr.append(OVERRIDE_STRATEGY);strBldr.append(": ");strBldr.append(overrideStrategy); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java index c1fc99a..0bd1f56 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java @@ -46,6 +46,7 @@ public abstract class TopologyHostTask implements TopologyTask { /** * Run with an InternalAuthenticationToken as when running these tasks we might not have any active security context. */ + @Override public void run() { Authentication savedAuthContext = SecurityContextHolder.getContext().getAuthentication(); try { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/RequiredPasswordValidator.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/RequiredPasswordValidator.java index 3ad1a19..e4f3e66 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/RequiredPasswordValidator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/validators/RequiredPasswordValidator.java @@ -46,6 +46,7 @@ public class RequiredPasswordValidator implements TopologyValidator { * @throws InvalidTopologyException if required password properties are missing and no * default is specified via 'default_password' */ + @Override public void validate(ClusterTopology topology) throws InvalidTopologyException { defaultPassword = topology.getDefaultPassword(); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java index c8e0aa4..730a26b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java @@ -289,6 +289,7 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog { /** * {@inheritDoc} */ + @Override public Map<String,String> getUpgradeJsonOutput() { return upgradeJsonOutput; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/ManagedThreadPoolExecutor.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/ManagedThreadPoolExecutor.java index 3979c0e..eef40f5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/utils/ManagedThreadPoolExecutor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/ManagedThreadPoolExecutor.java @@ -42,6 +42,7 @@ public class ManagedThreadPoolExecutor extends ThreadPoolExecutor { isStopped = true; } + @Override protected void beforeExecute(Thread t, Runnable r) { super.beforeExecute(t, r); pauseLock.lock(); diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/ScheduledExecutorCompletionService.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/ScheduledExecutorCompletionService.java index 047cef9..c6416d0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/utils/ScheduledExecutorCompletionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/ScheduledExecutorCompletionService.java @@ -35,7 +35,10 @@ public class ScheduledExecutorCompletionService<V> extends ExecutorCompletionSer super(task, null); this.task = task; } - protected void done() { queue.add(task); } + @Override + protected void done() { + queue.add(task); + } private final Future<V> task; } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java index a1b984b..6f9c078 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java @@ -88,6 +88,7 @@ public class ViewDirectoryWatcher implements DirectoryWatcher { }; } + @Override public void start() { try { diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java index 05bdd16..c957901 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java @@ -92,6 +92,7 @@ public class EventImpl implements Event { * * @return the id */ + @Override public String getId() { return id; } @@ -101,6 +102,7 @@ public class EventImpl implements Event { * * @return the properties */ + @Override public Map<String, String> getProperties() { return properties; } @@ -110,6 +112,7 @@ public class EventImpl implements Event { * * @return the view subject */ + @Override public ViewDefinition getViewSubject() { return viewSubject; } @@ -119,6 +122,7 @@ public class EventImpl implements Event { * * @return the instance subject; null if this is a view level event */ + @Override public ViewInstanceDefinition getViewInstanceSubject() { return viewInstanceSubject; } diff --git a/ambari-utility/src/main/java/org/apache/ambari/swagger/AmbariSwaggerReader.java b/ambari-utility/src/main/java/org/apache/ambari/swagger/AmbariSwaggerReader.java index 4da9f2d..e2c7b59 100644 --- a/ambari-utility/src/main/java/org/apache/ambari/swagger/AmbariSwaggerReader.java +++ b/ambari-utility/src/main/java/org/apache/ambari/swagger/AmbariSwaggerReader.java @@ -253,6 +253,7 @@ public class AmbariSwaggerReader extends JaxrsReader { } class ParameterToName implements Function<Parameter, String> { + @Override public String apply(Parameter input) { return input.getName(); }