diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
index 827d8bb81a..34b47ee0dc 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
@@ -157,7 +157,7 @@ public ResourceEventFilter<P> getEventFilter() {
   /**
    * @deprecated Use {@link OnAddFilter}, {@link OnUpdateFilter} and {@link GenericFilter} instead
    *
-   * @param eventFilter
+   * @param eventFilter generic event filter
    */
   @Deprecated(forRemoval = true)
   protected void setEventFilter(ResourceEventFilter<P> eventFilter) {
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DependentResourceWithExplicitState.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DependentResourceWithExplicitState.java
index 6829442b2e..284b215679 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DependentResourceWithExplicitState.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DependentResourceWithExplicitState.java
@@ -28,6 +28,8 @@ default Optional<String> eventSourceName() {
 
   /**
    * Class of the state resource.
+   *
+   * @return the type of the resource that stores state
    */
   Class<S> stateResourceClass();
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
index 3c2d3e8401..40e6a1a7cd 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesResourceMatcher.java
@@ -41,18 +41,20 @@ static <R extends HasMetadata, P extends HasMetadata> Matcher<R, P> matcherFor(
 
   /**
    * {@inheritDoc}
-   * <p/>
+   * <p>
    * This implementation attempts to cover most common cases out of the box by considering
    * non-additive changes to the resource's spec (if the resource in question has a {@code spec}
    * field), making special provisions for {@link ConfigMap} and {@link Secret} resources. Additive
    * changes (i.e. a field is added that previously didn't exist) are not considered as triggering a
    * mismatch by default to account for validating webhooks that might add default values
    * automatically when not present or some other controller adding labels and/or annotations.
-   * <p/>
+   * </p>
+   * <p>
    * It should be noted that this implementation is potentially intensive because it generically
    * attempts to cover common use cases by performing diffs on the JSON representation of objects.
    * If performance is a concern, it might be easier / simpler to provide a {@link Matcher}
    * implementation optimized for your use case.
+   * </p>
    */
   @Override
   public Result<R> match(R actualResource, P primary, Context<P> context) {