Misc changes

1. Aligned license headers, so it is the same as in other Aiven projects
2. Added java.header with the license info, which Aiven uses for all java projects
3. Aligned checkstyle, so it is the same as in other Aiven java projects

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Aiven Oy
+ * Copyright 2021 Aiven Oy https://aiven.io
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,6 @@ java {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
 
-    withJavadocJar()
     withSourcesJar()
 }
 

checkstyle/checkstyle-suppressions.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-// Copyright (c) 2019 Aiven, Helsinki, Finland. https://aiven.io/
+// Copyright 2019 Aiven Oy https://aiven.io
 -->
 <!DOCTYPE suppressions PUBLIC
         "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"

checkstyle/checkstyle.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-// Copyright 2019 Aiven Oy
+// Copyright 2019 Aiven Oy https://aiven.io
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -28,10 +28,9 @@
 <!-- See http://checkstyle.sourceforge.net/config.html#Checker -->
 <module name="Checker">
     <!-- See http://checkstyle.sourceforge.net/config_filters.html#SuppressionFilter -->
-    <!-- FIXME uncomment wioth normal headers later-->
-    <!--    <module name="SuppressionFilter">-->
-    <!--        <property name="file" value="${config_loc}/suppressions.xml" default="config/checkstyle/suppressions.xml"/>-->
-    <!--    </module>-->
+    <module name="SuppressionFilter">
+        <property name="file" value="${config_loc}/checkstyle-suppressions.xml" default="checkstyle/checkstyle-suppressions.xml"/>
+    </module>
 
     <property name="charset" value="UTF-8"/>
     <!--    <property name="severity" value="warning"/>-->
@@ -45,11 +44,10 @@
     </module>
 
     <!-- See http://checkstyle.sourceforge.net/config_header.html#RegexpHeader -->
-    <!-- FIXME uncomment wioth normal headers later-->
-    <!--    <module name="RegexpHeader">-->
-    <!--        <property name="fileExtensions" value="java"/>-->
-    <!--        <property name="headerFile" value="${config_loc}/java.header" default="config/checkstyle/java.header"/>-->
-    <!--    </module>-->
+    <module name="RegexpHeader">
+        <property name="fileExtensions" value="java"/>
+        <property name="headerFile" value="${config_loc}/java.header" default="checkstyle/java.header"/>
+    </module>
 
     <!-- See http://checkstyle.sourceforge.net/config_whitespace.html#FileTabCharacter -->
     <module name="FileTabCharacter">
@@ -334,4 +332,4 @@
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
     </module>
-</module>
+</module>

checkstyle/java.header

@@ -0,0 +1,15 @@
+/\*
+ \* Copyright 20(19|2[0-9]) Aiven Oy https://aiven.io
+ \*
+ \* Licensed under the Apache License, Version 2.0 \(the "License"\);
+ \* you may not use this file except in compliance with the License.
+ \* You may obtain a copy of the License at
+ \*
+ \* http://www.apache.org/licenses/LICENSE-2.0
+ \*
+ \* Unless required by applicable law or agreed to in writing, software
+ \* distributed under the License is distributed on an "AS IS" BASIS,
+ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ \* See the License for the specific language governing permissions and
+ \* limitations under the License.
+ \*/

gradle.properties

@@ -1,5 +1,5 @@
-#
-# Copyright 2021 Aiven Oy
+##
+# Copyright 2021 Aiven Oy https://aiven.io
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,5 +12,5 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+##
 version=3.2.0-SNAPSHOT

settings.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Aiven Oy
+ * Copyright 2021 Aiven Oy https://aiven.io
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/io/aiven/kafka/auth/AivenAclAuthorizer.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2019 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth;

src/main/java/io/aiven/kafka/auth/AivenAclAuthorizerConfig.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2019 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth;

src/main/java/io/aiven/kafka/auth/AivenKafkaPrincipalBuilder.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2019 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth;
@@ -31,7 +43,6 @@ public AivenKafkaPrincipalBuilder() {
         this.time = new TimeWithTimer(Time.SYSTEM);
     }
 
-    /** Visible for testing. */
     public AivenKafkaPrincipalBuilder(final TimeWithTimer time) {
         this.time = time;
     }
@@ -62,7 +73,7 @@ public void configure(final java.util.Map<String, ?> configs) {
             configFileLocation, refreshTimeout, time, cacheCapacity);
     }
 
-    /** Map a ssl principal (subject) to a Kafka principal (type + name). */
+    /* Map a ssl principal (subject) to a Kafka principal (type + name).*/
     public KafkaPrincipal mapSslPrincipal(final String sslPrincipal) {
         return principalMappers.match(sslPrincipal);
     }

src/main/java/io/aiven/kafka/auth/AivenSaslPlainServerCallbackHandler.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2019 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth;

src/main/java/io/aiven/kafka/auth/AivenSaslScramServerCallbackHandler.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2019 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth;

src/main/java/io/aiven/kafka/auth/PrincipalMappers.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2019 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth;

src/main/java/io/aiven/kafka/auth/PrincipalMappersState.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2019 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.aiven.kafka.auth;
 
 import java.nio.file.attribute.FileTime;

src/main/java/io/aiven/kafka/auth/audit/Auditor.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2020 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth.audit;

src/main/java/io/aiven/kafka/auth/audit/AuditorConfig.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2020 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth.audit;

src/main/java/io/aiven/kafka/auth/audit/NoAuditor.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2020 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth.audit;

src/main/java/io/aiven/kafka/auth/audit/UserActivity.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2020 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth.audit;

src/main/java/io/aiven/kafka/auth/audit/UserActivityAuditor.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2020 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth.audit;

src/main/java/io/aiven/kafka/auth/audit/UserOperation.java

@@ -1,5 +1,17 @@
-/**
- * Copyright (c) 2020 Aiven, Helsinki, Finland. https://aiven.io/
+/*
+ * Copyright 2020 Aiven Oy https://aiven.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package io.aiven.kafka.auth.audit;