fix: 🚑 Sonar findings needs to be resolved (#111)

fix: Resolved Sonar findings --------- Co-authored-by: pawellabaj <pawellabaj@users.noreply.github.com> Co-authored-by: pawellabaj <pawel_labaj@epam.com>
pawellabaj · Aug 3, 2023 · e72f39b · e72f39b
1 parent 0272a02
commit e72f39b
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 181 deletions.
diff --git a/.github/semantic.yml b/.github/semantic.yml
@@ -1 +1,2 @@
-titleAndCommits: true
+titleAndCommits: true
+anyCommit: true
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Java record newContext generator
 [![javadoc](https://javadoc.io/badge2/pl.com.labaj.autorecord/auto-record-project/javadoc.svg)](https://javadoc.io/doc/pl.com.labaj.autorecord/auto-record-project)
 
 [![CI Verify Status](https://github.com/pawellabaj/auto-record/actions/workflows/verify.yml/badge.svg?branch=main)](https://github.com/pawellabaj/auto-record/actions/workflows/verify.yml)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=pl.com.labaj%3Aauto-record-project&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=pl.com.labaj%3Aauto-record-project)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=pl.com.labaj.autorecord%3Aauto-record-project&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=pl.com.labaj.autorecord%3Aauto-record-project)
 [![Sonatype Lift Status](https://lift.sonatype.com/api/badge/github.com/pawellabaj/auto-record)](https://lift.sonatype.com/results/github.com/pawellabaj/auto-record)
 [![Reproducible Builds](https://img.shields.io/badge/Reproducible_Builds-ok-success?labelColor=1e5b96)](https://github.com/jvm-repo-rebuild/reproducible-central#pl.com.labaj.autorecord:auto-record)
 [![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/7700/badge)](https://bestpractices.coreinfrastructure.org/projects/7700)

diff --git a/...extension/src/main/java/pl/com/labaj/autorecord/extension/arice/CopyMethodsGenerator.java b/...extension/src/main/java/pl/com/labaj/autorecord/extension/arice/CopyMethodsGenerator.java
@@ -71,11 +71,11 @@ List<MethodSpec> generateMethods(TypesStructure structure) {
 
     private static MethodGenerator builderFor(InterfaceType iType) {
         return (extContext, structure, staticImports, logger) -> {
-            var methodBuilder = getMethodBuilder(extContext, iType, logger);
+            var methodBuilder = getMethodBuilder(extContext, iType);
 
             immutableTypesBlock(structure, iType)
                     .ifPresent(methodBuilder::addCode);
-            subTypesBlocks(extContext, iType, structure, logger)
+            subTypesBlocks(extContext, iType, structure)
                     .forEach(methodBuilder::addCode);
 
             var returnStatement = isNull(iType.factoryClassName())
@@ -87,7 +87,7 @@ private static MethodGenerator builderFor(InterfaceType iType) {
         };
     }
 
-    private static MethodSpec.Builder getMethodBuilder(ExtensionContext extContext, InterfaceType iType, Logger logger) {
+    private static MethodSpec.Builder getMethodBuilder(ExtensionContext extContext, InterfaceType iType) {
         var builder = MethodSpec.methodBuilder("immutable")
                 .addModifiers(PUBLIC, STATIC);
 
@@ -117,7 +117,7 @@ private static TypeName getTypeName(ExtensionContext extContext, InterfaceType i
             return TypeName.get(mirrorType);
         }
 
-        var className = (ClassName) ClassName.get(mirrorType);
+        var className = (ClassName) TypeName.get(mirrorType);
         var typeVariableNames = iType.genericNames().stream()
                 .map(name -> full ? name : substringBefore(name, " "))
                 .map(TypeVariableName::get)
@@ -165,7 +165,7 @@ private static Optional<CodeBlock> immutableTypesBlock(TypesStructure structure,
         return Optional.of(block);
     }
 
-    private static List<CodeBlock> subTypesBlocks(ExtensionContext extContext, InterfaceType iType, TypesStructure structure, Logger logger) {
+    private static List<CodeBlock> subTypesBlocks(ExtensionContext extContext, InterfaceType iType, TypesStructure structure) {
         return iType.directSubTypes().stream()
                 .filter(structure::needsAdditionalMethod)
                 .sorted(reverseOrder())

diff --git a/.../utils/src/main/java/pl/com/labaj/autorecord/collections/AbstractImmutableCollection.java b/.../utils/src/main/java/pl/com/labaj/autorecord/collections/AbstractImmutableCollection.java
@@ -0,0 +1,94 @@
+package pl.com.labaj.autorecord.collections;
+
+/*-
+ * Copyright © 2023 Auto Record
+ *
+ * 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.
+ */
+
+import java.util.Collection;
+
+abstract class AbstractImmutableCollection<E> implements Collection<E> {
+    /**
+     * Guaranteed to throw an exception and leave the collection unmodified.
+     *
+     * @throws UnsupportedOperationException always
+     * @deprecated Unsupported operation.
+     */
+    @Override
+    @Deprecated(since = "1.0.0")
+    public final boolean add(E e) {
+        throw new UnsupportedOperationException("add");
+    }
+
+    /**
+     * Guaranteed to throw an exception and leave the collection unmodified.
+     *
+     * @throws UnsupportedOperationException always
+     * @deprecated Unsupported operation.
+     */
+    @Override
+    @Deprecated(since = "1.0.0")
+    public final boolean remove(Object o) {
+        throw new UnsupportedOperationException("remove");
+    }
+
+    /**
+     * Guaranteed to throw an exception and leave the collection unmodified.
+     *
+     * @throws UnsupportedOperationException always
+     * @deprecated Unsupported operation.
+     */
+    @Override
+    @Deprecated(since = "1.0.0")
+    public final boolean addAll(Collection<? extends E> c) {
+        throw new UnsupportedOperationException("addAll");
+    }
+
+    /**
+     * Guaranteed to throw an exception and leave the collection unmodified.
+     *
+     * @throws UnsupportedOperationException always
+     * @deprecated Unsupported operation.
+     */
+    @Override
+    @Deprecated(since = "1.0.0")
+    public final boolean removeAll(Collection<?> c) {
+        throw new UnsupportedOperationException("removeAll");
+    }
+
+    /**
+     * Guaranteed to throw an exception and leave the collection unmodified.
+     *
+     * @throws UnsupportedOperationException always
+     * @deprecated Unsupported operation.
+     */
+    @Override
+    @Deprecated(since = "1.0.0")
+    public final boolean retainAll(Collection<?> c) {
+        throw new UnsupportedOperationException("retainAll");
+    }
+
+    /**
+     * Guaranteed to throw an exception and leave the collection unmodified.
+     *
+     * @throws UnsupportedOperationException always
+     * @deprecated Unsupported operation.
+     */
+
+    @Override
+    @Deprecated(since = "1.0.0")
+    public final void clear() {
+        throw new UnsupportedOperationException("clear");
+    }
+}
diff --git a/arice/utils/src/main/java/pl/com/labaj/autorecord/collections/ImmutableCollection.java b/arice/utils/src/main/java/pl/com/labaj/autorecord/collections/ImmutableCollection.java
@@ -36,7 +36,7 @@
  * @param <E> the type of elements in the collection
  */
 @API(status = STABLE)
-public class ImmutableCollection<E> implements Collection<E> {
+public class ImmutableCollection<E> extends AbstractImmutableCollection<E> {
 
     private final com.google.common.collect.ImmutableCollection<E> delegate;
 
@@ -121,84 +121,11 @@ public <T> T[] toArray(T[] a) {
         return delegate.toArray(a);
     }
 
-    /**
-     * Guaranteed to throw an exception and leave the collection unmodified.
-     *
-     * @throws UnsupportedOperationException always
-     * @deprecated Unsupported operation.
-     */
-    @Override
-    @Deprecated
-    public final boolean add(E e) {
-        throw new UnsupportedOperationException("add");
-    }
-
-    /**
-     * Guaranteed to throw an exception and leave the collection unmodified.
-     *
-     * @throws UnsupportedOperationException always
-     * @deprecated Unsupported operation.
-     */
-    @Override
-    @Deprecated
-    public final boolean remove(Object o) {
-        throw new UnsupportedOperationException("remove");
-    }
-
     /**
      * {@inheritDoc}
      */
     @Override
     public final boolean containsAll(Collection<?> c) {
         return delegate.containsAll(c);
     }
-
-    /**
-     * Guaranteed to throw an exception and leave the collection unmodified.
-     *
-     * @throws UnsupportedOperationException always
-     * @deprecated Unsupported operation.
-     */
-    @Override
-    @Deprecated
-    public final boolean addAll(Collection<? extends E> c) {
-        throw new UnsupportedOperationException("addAll");
-    }
-
-    /**
-     * Guaranteed to throw an exception and leave the collection unmodified.
-     *
-     * @throws UnsupportedOperationException always
-     * @deprecated Unsupported operation.
-     */
-    @Override
-    @Deprecated
-    public final boolean removeAll(Collection<?> c) {
-        throw new UnsupportedOperationException("removeAll");
-    }
-
-    /**
-     * Guaranteed to throw an exception and leave the collection unmodified.
-     *
-     * @throws UnsupportedOperationException always
-     * @deprecated Unsupported operation.
-     */
-    @Override
-    @Deprecated
-    public final boolean retainAll(Collection<?> c) {
-        throw new UnsupportedOperationException("retainAll");
-    }
-
-    /**
-     * Guaranteed to throw an exception and leave the collection unmodified.
-     *
-     * @throws UnsupportedOperationException always
-     * @deprecated Unsupported operation.
-     */
-
-    @Override
-    @Deprecated
-    public final void clear() {
-        throw new UnsupportedOperationException("clear");
-    }
 }