update quality plugin

xvik · xvik · commit 736a4189f413 · 2025-08-28T13:01:17.000+07:00
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,8 @@ plugins {
     id 'signing'
     id 'ru.vyarus.java-lib' version '3.0.0'
     id 'ru.vyarus.github-info' version '2.0.0'
-    id 'ru.vyarus.quality' version '5.0.0'
+    id 'ru.vyarus.quality' version '6.0.0'
+    id 'com.github.spotbugs' version '5.2.5' apply false
     id 'net.researchgate.release' version '3.1.0'
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
     id 'com.github.ben-manes.versions' version '0.52.0'
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/OrientModule.java b/src/main/java/ru/vyarus/guice/persist/orient/OrientModule.java
@@ -372,6 +372,7 @@ protected void loadOptionalPool(final String poolBinder) {
     }
 
     @Override
+    @SuppressWarnings("PMD.UseDiamondOperator")
     protected void bindInterceptor(final Matcher<? super Class<?>> classMatcher,
                                    final Matcher<? super Method> methodMatcher,
                                    final MethodInterceptor... interceptors) {
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/RepositoryModule.java b/src/main/java/ru/vyarus/guice/persist/orient/RepositoryModule.java
@@ -105,6 +105,7 @@ protected void configure() {
     /**
      * Configures repository annotations interceptor.
      */
+    @SuppressWarnings("PMD.UseDiamondOperator")
     protected void configureAop() {
         final RepositoryMethodInterceptor proxy = new RepositoryMethodInterceptor();
         requestInjection(proxy);
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/DatabaseManager.java b/src/main/java/ru/vyarus/guice/persist/orient/db/DatabaseManager.java
@@ -67,12 +67,7 @@ public DatabaseManager(
         this.dataInitializer = dataInitializer;
         this.txTemplate = txTemplate;
         // sort pools to correct startup order
-        Collections.sort(this.pools, new Comparator<PoolManager>() {
-            @Override
-            public int compare(final PoolManager o1, final PoolManager o2) {
-                return o1.getType().compareTo(o2.getType());
-            }
-        });
+        Collections.sort(this.pools, Comparator.comparing(PoolManager::getType));
     }
 
     @Override
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/pool/DocumentPool.java b/src/main/java/ru/vyarus/guice/persist/orient/db/pool/DocumentPool.java
@@ -54,7 +54,6 @@ public void start(final String database) {
     }
 
     @Override
-    @SuppressWarnings("PMD.NullAssignment")
     public void stop() {
         if (pool != null) {
             pool.close();
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/pool/object/OCommandSQLPojoWrapperFixed.java b/src/main/java/ru/vyarus/guice/persist/orient/db/pool/object/OCommandSQLPojoWrapperFixed.java
@@ -38,7 +38,7 @@ public OCommandSQLPojoWrapperFixed(final OObjectDatabaseTxFixed iDatabase,
 
     @Override
     @SuppressWarnings("unchecked")
-    public <RET> RET execute(final Object... iArgs) {
+    public <R> R execute(final Object... iArgs) {
         database.convertParameters(iArgs);
 
         Object result = command.execute(iArgs);
@@ -85,6 +85,6 @@ public <RET> RET execute(final Object... iArgs) {
             result = database.getUserObjectByRecord(((OResult) result).getIdentity().get(), getFetchPlan(), true);
         }
 
-        return (RET) result;
+        return (R) result;
     }
 }
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/pool/object/OObjectDatabaseTxFixed.java b/src/main/java/ru/vyarus/guice/persist/orient/db/pool/object/OObjectDatabaseTxFixed.java
@@ -29,19 +29,18 @@ public OObjectDatabaseTxFixed(final ODatabaseDocumentInternal iDatabase) {
     }
 
     @Override
-    public <RET extends OCommandRequest> RET command(final OCommandRequest iCommand) {
-        return (RET) new OCommandSQLPojoWrapperFixed(this, underlying.command(iCommand));
+    public <R extends OCommandRequest> R command(final OCommandRequest iCommand) {
+        return (R) new OCommandSQLPojoWrapperFixed(this, underlying.command(iCommand));
     }
 
     @Override
     // changing access, required for fixed wrapper command
-    @SuppressWarnings("PMD.UselessOverridingMethod")
     public void convertParameters(final Object... iArgs) {
         super.convertParameters(iArgs);
     }
 
     @Override
-    public <RET> RET load(final ORID iRecordId, final String iFetchPlan, final boolean iIgnoreCache) {
+    public <R> R load(final ORID iRecordId, final String iFetchPlan, final boolean iIgnoreCache) {
         // fixing behaviour after record deletion under ongoing transaction (to unify with legacy behaviour)
         try {
            return super.load(iRecordId, iFetchPlan, iIgnoreCache);
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/impl/AbstractObjectInitializer.java b/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/impl/AbstractObjectInitializer.java
@@ -65,12 +65,7 @@ public void initialize() {
      */
     private List<Class<?>> scan() {
         final List<Class<?>> modelClasses = Lists.newArrayList();
-        final Predicate<Class<?>> predicate = new Predicate<Class<?>>() {
-            @Override
-            public boolean apply(final Class<?> input) {
-                return classMatcher.matches(input);
-            }
-        };
+        final Predicate<Class<?>> predicate = classMatcher::matches;
         for (String pkg : packages) {
             try {
                 final List<Class<?>> classes = OReflectionHelper
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/ObjectSchemeInitializer.java b/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/ObjectSchemeInitializer.java
@@ -5,7 +5,9 @@
 import com.orientechnologies.orient.core.db.object.ODatabaseObject;
 import com.orientechnologies.orient.object.db.OObjectDatabaseTx;
 import com.orientechnologies.orient.object.metadata.schema.OSchemaProxyObject;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 import ru.vyarus.guice.persist.orient.db.scheme.SchemeInitializationException;
 import ru.vyarus.guice.persist.orient.db.scheme.initializer.core.ext.ExtensionsDescriptor;
 import ru.vyarus.guice.persist.orient.db.scheme.initializer.core.ext.ExtensionsDescriptorFactory;
@@ -14,9 +16,6 @@
 import ru.vyarus.guice.persist.orient.db.scheme.initializer.core.spi.type.TypeExtension;
 import ru.vyarus.guice.persist.orient.db.scheme.initializer.core.util.SchemeUtils;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Provider;
-import jakarta.inject.Singleton;
 import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.Set;
@@ -46,7 +45,6 @@
  * @since 04.03.2015
  */
 @Singleton
-@SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
 public class ObjectSchemeInitializer {
     private final Set<Class<?>> processingCache = Sets.newHashSet();
 
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/core/ext/ExtensionsDescriptorFactory.java b/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/core/ext/ExtensionsDescriptorFactory.java
@@ -67,7 +67,7 @@ private ExtensionsDescriptor.Ext<TypeExtension, Class> createTypeExtension(
         final Class<? extends TypeExtension> ext = ann.annotationType()
                 .getAnnotation(SchemeTypeInit.class).value();
         try {
-            return new ExtensionsDescriptor.Ext<TypeExtension, Class>(injector.getInstance(ext), ann, model);
+            return new ExtensionsDescriptor.Ext<>(injector.getInstance(ext), ann, model);
         } catch (Throwable th) {
             throw new SchemeInitializationException(String.format(
                     "Failed to create extension %s declared by annotation @%s on class %s",
@@ -89,7 +89,7 @@ private ExtensionsDescriptor.Ext<FieldExtension, Field> createFieldExtension(
         final Class<? extends FieldExtension> ext = ann.annotationType()
                 .getAnnotation(SchemeFieldInit.class).value();
         try {
-            return new ExtensionsDescriptor.Ext<FieldExtension, Field>(injector.getInstance(ext), ann, field);
+            return new ExtensionsDescriptor.Ext<>(injector.getInstance(ext), ann, field);
         } catch (Throwable th) {
             throw new SchemeInitializationException(String.format(
                     "Failed to create extension %s declared by annotation @%s on field %s#%s",
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/core/util/SchemeUtils.java b/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/core/util/SchemeUtils.java
@@ -5,7 +5,6 @@
 import com.orientechnologies.orient.core.db.object.ODatabaseObject;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
 import com.orientechnologies.orient.core.sql.OCommandSQL;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 
 import java.util.List;
@@ -90,7 +89,6 @@ public static void command(final ODatabaseObject db, final String command, final
      * @param indexName index name
      * @see com.orientechnologies.orient.core.index.OIndexManagerProxy#dropIndex(java.lang.String)
      */
-    @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT")
     public static void dropIndex(final ODatabaseObject db, final String indexName) {
         // Separated to overcome findbugs false positive "RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" for dropIndex method.
         db.getMetadata().getIndexManager().dropIndex(indexName);
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/ext/field/index/IndexFieldExtension.java b/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/ext/field/index/IndexFieldExtension.java
@@ -31,6 +31,7 @@ public void beforeRegistration(final ODatabaseObject db, final SchemeDescriptor
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryVarargsArrayCreation")
     public void afterRegistration(final ODatabaseObject db, final SchemeDescriptor descriptor,
                                   final Field field, final Index annotation) {
         final String property = field.getName();
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/ext/field/index/IndexValidationSupport.java b/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/ext/field/index/IndexValidationSupport.java
@@ -51,6 +51,7 @@ public OIndex getIndex() {
      *
      * @param types allowed index types
      */
+    @SuppressWarnings("PMD.UseDiamondOperator")
     public void checkTypeCompatible(final OClass.INDEX_TYPE... types) {
         final Set<String> allowed = Sets.newHashSet(Iterables.transform(Arrays.asList(types),
                 new Function<OClass.INDEX_TYPE, String>() {
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/ext/field/index/fulltext/FulltextIndexFieldExtension.java b/src/main/java/ru/vyarus/guice/persist/orient/db/scheme/initializer/ext/field/index/fulltext/FulltextIndexFieldExtension.java
@@ -39,6 +39,7 @@ public void beforeRegistration(final ODatabaseObject db, final SchemeDescriptor
     }
 
     @Override
+    @SuppressWarnings("PMD.UnnecessaryVarargsArrayCreation")
     public void afterRegistration(final ODatabaseObject db, final SchemeDescriptor descriptor,
                                   final Field field, final FulltextIndex annotation) {
         final String property = field.getName();
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/transaction/internal/DefaultTransactionManager.java b/src/main/java/ru/vyarus/guice/persist/orient/db/transaction/internal/DefaultTransactionManager.java
@@ -149,7 +149,7 @@ public boolean isExternalTransaction() {
      * @param e      The exception to test for rollback
      */
     private boolean canRecover(final TxConfig config, final Throwable e) {
-        boolean commit = config.getRollbackOn().size() > 0;
+        boolean commit = !config.getRollbackOn().isEmpty();
 
         //check rollback clauses
         for (Class<? extends Exception> rollBackOn : config.getRollbackOn()) {
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/transaction/internal/TransactionInterceptor.java b/src/main/java/ru/vyarus/guice/persist/orient/db/transaction/internal/TransactionInterceptor.java
@@ -1,16 +1,15 @@
 package ru.vyarus.guice.persist.orient.db.transaction.internal;
 
 
+import jakarta.inject.Inject;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ru.vyarus.guice.persist.orient.db.transaction.TransactionManager;
 import ru.vyarus.guice.persist.orient.db.transaction.TxConfig;
-import ru.vyarus.guice.persist.orient.db.transaction.template.TxAction;
 import ru.vyarus.guice.persist.orient.db.transaction.template.TxTemplate;
 
-import jakarta.inject.Inject;
 import java.lang.reflect.Method;
 
 /**
@@ -38,12 +37,7 @@ public Object invoke(final MethodInvocation invocation) throws Throwable {
             final TxConfig config = AnnotationTxConfigBuilder
                     .buildConfig(invocation.getThis().getClass(), method, true);
             logger.trace("Starting transaction for annotated method {}", method.getName());
-            res = template.doInTransaction(config, new TxAction<Object>() {
-                @Override
-                public Object execute() throws Throwable {
-                    return invocation.proceed();
-                }
-            });
+            res = template.doInTransaction(config, invocation::proceed);
         }
         return res;
     }
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/db/transaction/template/SpecificTxTemplate.java b/src/main/java/ru/vyarus/guice/persist/orient/db/transaction/template/SpecificTxTemplate.java
@@ -49,11 +49,6 @@ public <T> T doInTransaction(final SpecificTxAction<T, C> action) {
      */
     public <T> T doInTransaction(final TxConfig config,
                                  final SpecificTxAction<T, C> action) {
-        return template.doInTransaction(config, new TxAction<T>() {
-            @Override
-            public T execute() throws Throwable {
-                return action.execute(provider.get());
-            }
-        });
+        return template.doInTransaction(config, () -> action.execute(provider.get()));
     }
 }
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/RepositoryMethodInterceptor.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/RepositoryMethodInterceptor.java
@@ -60,7 +60,7 @@ private RepositoryMethodDescriptor getMethodDescriptor(final Method method, fina
         return descriptor;
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "PMD.UnnecessaryCast"})
     private Object executeMethod(final RepositoryMethodDescriptor descriptor,
                                  final MethodInvocation methodInvocation) {
         final Method method = methodInvocation.getMethod();
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/async/AsyncQueryMethodExtension.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/async/AsyncQueryMethodExtension.java
@@ -62,9 +62,9 @@ protected OCommandRequest createQueryCommand(final CommandMethodDescriptor descr
         final boolean blocking = (Boolean) descriptor.extDescriptors.get(EXT_BLOCKING);
         // correct listener will be set by @Listen extension
         if (blocking) {
-            return new OSQLAsynchQuery(desc.command);
+            return new OSQLAsynchQuery<>(desc.command);
         } else {
-            return new OSQLNonBlockingQuery(desc.command, null);
+            return new OSQLNonBlockingQuery<>(desc.command, null);
         }
     }
 
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/async/listener/AsyncQueryListenerParameterSupport.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/async/listener/AsyncQueryListenerParameterSupport.java
@@ -33,6 +33,7 @@
  */
 public class AsyncQueryListenerParameterSupport implements ListenerParameterSupport {
 
+    @SuppressWarnings("PMD.UseDiamondOperator")
     private static final Key<PersistentContext<ODatabaseDocument>> CONTEXT_KEY =
             Key.get(new TypeLiteral<PersistentContext<ODatabaseDocument>>() {
             });
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/async/listener/TransactionalAsyncAdapter.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/async/listener/TransactionalAsyncAdapter.java
@@ -6,7 +6,6 @@
 import org.slf4j.LoggerFactory;
 import ru.vyarus.guice.persist.orient.db.PersistentContext;
 import ru.vyarus.guice.persist.orient.db.transaction.TxConfig;
-import ru.vyarus.guice.persist.orient.db.transaction.template.TxAction;
 
 /**
  * Wraps {@link OCommandResultListener} with an external transaction (allows using thread bound connection
@@ -48,12 +47,7 @@ public boolean result(final Object iRecord) {
             return safeResult(iRecord);
         } else {
             // wrapping in external transaction (non blocking case)
-            return context.doInTransaction(TxConfig.external(), new TxAction<Boolean>() {
-                @Override
-                public Boolean execute() throws Throwable {
-                    return safeResult(iRecord);
-                }
-            });
+            return context.doInTransaction(TxConfig.external(), () -> safeResult(iRecord));
         }
     }
 
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/async/listener/mapper/AsyncResultMapper.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/async/listener/mapper/AsyncResultMapper.java
@@ -23,7 +23,7 @@ public class AsyncResultMapper implements OCommandResultListener {
     private final AsyncQueryListener listener;
     private final Class<?> targetType;
     // collect results
-    private final List results = new ArrayList();
+    private final List results = new ArrayList<>();
 
     public AsyncResultMapper(final RecordConverter converter,
                              final AsyncQueryListener listener,
@@ -34,7 +34,7 @@ public AsyncResultMapper(final RecordConverter converter,
     }
 
     @Override
-    @SuppressWarnings({"unchecked", "PMD.ConsecutiveLiteralAppends"})
+    @SuppressWarnings("unchecked")
     public boolean result(final Object rec) {
         // in all cases rec will be ORecord, but any other type would also be handled properly (just in case)
         try {
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/core/AbstractCommandExtension.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/core/AbstractCommandExtension.java
@@ -149,7 +149,7 @@ private Object executeCommand(final RepositoryMethodDescriptor descriptor,
             final OCommandRequest cmd = descriptor.executor.wrapCommand(query);
             final Object result;
             if (desc.useNamedParams) {
-                result = desc.namedParams.size() > 0
+                result = !desc.namedParams.isEmpty()
                         ? cmd.execute(desc.namedParams) : cmd.execute();
             } else {
                 result = desc.params.length > 0
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/core/param/CommandParamsContext.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/core/param/CommandParamsContext.java
@@ -91,7 +91,7 @@ public void process(final CommandMethodDescriptor descriptor) {
                 "Ordinal and named parameters can't be used together");
         if (named.isEmpty()) {
             desc.parametersIndex = Lists.transform(getOrdinals(), PARAM_INDEX_FUNCTION)
-                    .toArray(new Integer[getOrdinals().size()]);
+                    .toArray(new Integer[0]);
         } else {
             desc.useNamedParameters = true;
             desc.namedParametersIndex = Maps.transformValues(named, PARAM_INDEX_FUNCTION);
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/ext/elvar/Converters.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/ext/elvar/Converters.java
@@ -15,23 +15,14 @@ public final class Converters {
      * Uses object toString method.
      * If value is null, null returned.
      */
-    public static final ValueConverter<Object> DEFAULT = new ValueConverter<Object>() {
-        @Override
-        public String convert(final Object value) {
-            return value == null ? null : Strings.emptyToNull(value.toString());
-        }
-    };
+    public static final ValueConverter<Object> DEFAULT = value -> value == null
+            ? null : Strings.emptyToNull(value.toString());
 
     /**
      * Class value converter.
      * Returns class name or null if null provided.
      */
-    public static final ValueConverter<Class> CLASS = new ValueConverter<Class>() {
-        @Override
-        public String convert(final Class value) {
-            return value == null ? "" : value.getSimpleName();
-        }
-    };
+    public static final ValueConverter<Class> CLASS = value -> value == null ? "" : value.getSimpleName();
 
     private Converters() {
     }
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/ext/listen/ListenParamExtension.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/ext/listen/ListenParamExtension.java
@@ -88,8 +88,7 @@ public void amendCommandDescriptor(final SqlCommandDescriptor sql, final Command
     @SuppressWarnings("unchecked")
     public void amendCommand(final OCommandRequest query, final CommandMethodDescriptor descriptor,
                              final Object instance, final Object... arguments) {
-        final ListenParamDescriptor extDesc = (ListenParamDescriptor) descriptor
-                .extDescriptors.get(ListenParamExtension.KEY);
+        final ListenParamDescriptor extDesc = (ListenParamDescriptor) descriptor.extDescriptors.get(KEY);
         final Object listener = arguments[extDesc.position];
         // null listener makes no sense: method is void and results are not handled anywhere
         checkExec(listener != null, "Listener can't be null");
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/live/LiveQueryMethodExtension.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/live/LiveQueryMethodExtension.java
@@ -58,6 +58,6 @@ public CommandMethodDescriptor createDescriptor(final DescriptorContext context,
     protected OCommandRequest createQueryCommand(final CommandMethodDescriptor descriptor,
                                                  final SqlCommandDescriptor desc) {
         // live listener will be applied by @Listen extension
-        return new OLiveQuery<Object>(desc.command, null);
+        return new OLiveQuery<>(desc.command, null);
     }
 }
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/live/listener/LiveListenerParameterSupport.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/live/listener/LiveListenerParameterSupport.java
@@ -38,6 +38,7 @@
  */
 public class LiveListenerParameterSupport implements ListenerParameterSupport {
 
+    @SuppressWarnings("PMD.UseDiamondOperator")
     private static final Key<PersistentContext<ODatabaseDocument>> CONTEXT_KEY =
             Key.get(new TypeLiteral<PersistentContext<ODatabaseDocument>>() {
             });
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/command/live/listener/mapper/RecordOperation.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/command/live/listener/mapper/RecordOperation.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/service/AmendExtensionsService.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/service/AmendExtensionsService.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/service/ParamsService.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/service/ParamsService.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/util/ExtCompatibilityUtils.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/util/ExtCompatibilityUtils.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/util/ExtUtils.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/util/ExtUtils.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/util/ResultUtils.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/core/ext/util/ResultUtils.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/core/spi/parameter/ParamsContext.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/core/spi/parameter/ParamsContext.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/delegate/ext/generic/GenericParamExtension.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/delegate/ext/generic/GenericParamExtension.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/delegate/method/MethodFilters.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/delegate/method/MethodFilters.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/repository/delegate/method/TargetMethodAnalyzer.java b/src/main/java/ru/vyarus/guice/persist/orient/repository/delegate/method/TargetMethodAnalyzer.java
diff --git a/src/main/java/ru/vyarus/guice/persist/orient/support/repository/mixin/pagination/PageSupportDelegate.java b/src/main/java/ru/vyarus/guice/persist/orient/support/repository/mixin/pagination/PageSupportDelegate.java

Original file line number	Diff line number	Diff line change
`@@ -372,6 +372,7 @@ protected void loadOptionalPool(final String poolBinder) {`
`372`	`372`	`}`
`373`	`373`
`374`	`374`	`@Override`
	`375`	`+ @SuppressWarnings("PMD.UseDiamondOperator")`
`375`	`376`	`protected void bindInterceptor(final Matcher<? super Class<?>> classMatcher,`
`376`	`377`	`final Matcher<? super Method> methodMatcher,`
`377`	`378`	`final MethodInterceptor... interceptors) {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ public void start(final String database) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- @SuppressWarnings("PMD.NullAssignment")`
`58`	`57`	`public void stop() {`
`59`	`58`	`if (pool != null) {`
`60`	`59`	`pool.close();`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public OCommandSQLPojoWrapperFixed(final OObjectDatabaseTxFixed iDatabase,`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`@SuppressWarnings("unchecked")`
`41`		`- public <RET> RET execute(final Object... iArgs) {`
	`41`	`+ public <R> R execute(final Object... iArgs) {`
`42`	`42`	`database.convertParameters(iArgs);`
`43`	`43`
`44`	`44`	`Object result = command.execute(iArgs);`
`@@ -85,6 +85,6 @@ public <RET> RET execute(final Object... iArgs) {`
`85`	`85`	`result = database.getUserObjectByRecord(((OResult) result).getIdentity().get(), getFetchPlan(), true);`
`86`	`86`	`}`
`87`	`87`
`88`		`- return (RET) result;`
	`88`	`+ return (R) result;`
`89`	`89`	`}`
`90`	`90`	`}`