瀏覽代碼

AMBARI-25516. Missing @Override on 91 methods (#3198) (rickyma via dgrinenko)

RickyMa 5 年之前
父節點
當前提交
24dbed27b9
共有 49 個文件被更改,包括 132 次插入61 次删除
  1. 1 0
      ambari-agent/src/main/java/org/apache/ambari/tools/zk/ZkConnection.java
  2. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ServiceComponentHostEventWrapper.java
  3. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
  4. 2 0
      ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java
  5. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/bootstrap/FifoLinkedHashMap.java
  6. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/cleanup/CleanupServiceImpl.java
  7. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/configuration/SingleFileWatch.java
  8. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
  9. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java
  10. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/controller/ShortTaskStatus.java
  11. 5 0
      ambari-server/src/main/java/org/apache/ambari/server/controller/ViewPrivilegeRequest.java
  12. 2 0
      ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AppCookieManager.java
  13. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java
  14. 2 0
      ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
  15. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/events/AgentConfigsUpdateEvent.java
  16. 2 0
      ambari-server/src/main/java/org/apache/ambari/server/events/TopologyUpdateEvent.java
  17. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
  18. 2 0
      ambari-server/src/main/java/org/apache/ambari/server/metrics/system/impl/AmbariMetricSinkImpl.java
  19. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/notifications/dispatchers/AmbariSNMPDispatcher.java
  20. 4 0
      ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
  21. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/orm/cache/HostConfigMappingImpl.java
  22. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java
  23. 8 0
      ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintConfigEntity.java
  24. 8 0
      ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostGroupConfigEntity.java
  25. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/orm/entities/SettingEntity.java
  26. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/scheduler/ExecutionScheduleManager.java
  27. 3 0
      ambari-server/src/main/java/org/apache/ambari/server/security/InternalSSLSocketFactory.java
  28. 1 6
      ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapBindAuthenticator.java
  29. 44 54
      ambari-server/src/main/java/org/apache/ambari/server/security/authorization/Users.java
  30. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/security/credential/GenericKeyCredential.java
  31. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/security/credential/PrincipalKeyCredential.java
  32. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java
  33. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/state/action/ActionId.java
  34. 2 0
      ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
  35. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/state/host/HostStatusUpdatesReceivedEvent.java
  36. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorContainer.java
  37. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/state/quicklinksprofile/DefaultQuickLinkVisibilityController.java
  38. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/state/stack/MetricDefinition.java
  39. 5 0
      ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
  40. 2 0
      ambari-server/src/main/java/org/apache/ambari/server/topology/HostGroupImpl.java
  41. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/topology/RepositorySetting.java
  42. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/topology/tasks/TopologyHostTask.java
  43. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/topology/validators/RequiredPasswordValidator.java
  44. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
  45. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/utils/ManagedThreadPoolExecutor.java
  46. 4 1
      ambari-server/src/main/java/org/apache/ambari/server/utils/ScheduledExecutorCompletionService.java
  47. 1 0
      ambari-server/src/main/java/org/apache/ambari/server/view/ViewDirectoryWatcher.java
  48. 4 0
      ambari-server/src/main/java/org/apache/ambari/server/view/events/EventImpl.java
  49. 1 0
      ambari-utility/src/main/java/org/apache/ambari/swagger/AmbariSwaggerReader.java

+ 1 - 0
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();

+ 1 - 0
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();

+ 1 - 0
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 + "," +

+ 2 - 0
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;
   }

+ 1 - 0
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;

+ 1 - 0
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;

+ 1 - 0
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();
   }

+ 1 - 0
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<>();

+ 1 - 0
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 + " }";
   }

+ 1 - 0
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 ")

+ 5 - 0
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;

+ 2 - 0
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;
     }

+ 1 - 0
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 {

+ 2 - 0
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

+ 1 - 0
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;
   }

+ 2 - 0
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;
   }

+ 1 - 0
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);
   }

+ 2 - 0
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;
   }

+ 1 - 0
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());

+ 4 - 0
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);
 

+ 1 - 0
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;
   }

+ 1 - 0
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...

+ 8 - 0
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;
   }

+ 8 - 0
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;
   }

+ 1 - 0
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);

+ 1 - 0
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;
         }

+ 3 - 0
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];
     }

+ 1 - 6
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);

+ 44 - 54
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);
   }
 

+ 1 - 0
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;
   }

+ 1 - 0
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");

+ 1 - 0
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;
   }

+ 1 - 0
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 + "]";

+ 2 - 0
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;
   }

+ 1 - 0
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;
   }

+ 1 - 0
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;
   }

+ 1 - 0
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);

+ 1 - 0
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);

+ 5 - 0
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;
   }

+ 2 - 0
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;
   }

+ 1 - 0
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);

+ 1 - 0
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 {

+ 1 - 0
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();

+ 1 - 0
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;
   }

+ 1 - 0
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();

+ 4 - 1
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;
   }
 

+ 1 - 0
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 {

+ 4 - 0
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;
   }

+ 1 - 0
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();
   }