[pull] master from apache:master

.asf.yaml

@@ -40,3 +40,11 @@ github:
     jira_options: worklog link label
   protected_branches:
     master: {}
+  collaborators:
+    - ashutoshm
+    - DishaTalreja3
+    - kevalbhatt
+    - nixonrodrigues
+    - pinal-shah
+    - rkundam
+    - sarathsubramanian

common/pom.xml

@@ -31,6 +31,11 @@
     <name>Apache Atlas Common</name>
     <description>Apache Atlas Common</description>
 
+    <properties>
+        <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+        <checkstyle.skip>false</checkstyle.skip>
+    </properties>
+
     <dependencies>
 
         <dependency>

common/src/main/java/org/apache/atlas/AtlasConstants.java

@@ -6,9 +6,9 @@
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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.
@@ -22,20 +22,20 @@
  * Constants used in Atlas configuration.
  */
 public final class AtlasConstants {
-    private AtlasConstants() {
-    }
-
     public static final String CLUSTER_NAME_KEY              = "atlas.cluster.name";
     public static final String METADATA_NAMESPACE_KEY        = "atlas.metadata.namespace";
     public static final String DEFAULT_CLUSTER_NAME          = "primary";
     public static final String SYSTEM_PROPERTY_APP_PORT      = "atlas.app.port";
     public static final String ATLAS_REST_ADDRESS_KEY        = "atlas.rest.address";
     public static final String ATLAS_MIGRATION_MODE_FILENAME = "atlas.migration.data.filename";
     public static final String ATLAS_SERVICES_ENABLED        = "atlas.services.enabled";
-
     public static final String CLUSTER_NAME_ATTRIBUTE        = "clusterName";
     public static final String DEFAULT_APP_PORT_STR          = "21000";
     public static final String DEFAULT_ATLAS_REST_ADDRESS    = "http://localhost:21000";
     public static final String DEFAULT_TYPE_VERSION          = "1.0";
     public static final int    ATLAS_SHUTDOWN_HOOK_PRIORITY  = 30;
-}
+
+    private AtlasConstants() {
+        // to block instantiation
+    }
+}

common/src/main/java/org/apache/atlas/annotation/ConditionalOnAtlasProperty.java

@@ -25,12 +25,13 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ ElementType.TYPE, ElementType.METHOD })
+@Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Conditional(OnAtlasPropertyCondition.class)
 public @interface ConditionalOnAtlasProperty {
     // Configured atlas property
     String property();
+
     // The default interface implementation should declare this as true
     boolean isDefault() default false;
 }

common/src/main/java/org/apache/atlas/annotation/Timed.java

@@ -6,9 +6,9 @@
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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.
@@ -17,16 +17,15 @@
  */
 package org.apache.atlas.annotation;
 
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.METHOD})
+@Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 public @interface Timed {
     String value() default "";
-}
+}