Skip to content

Commit 5032d1a

Browse files
committed
update quality plugin
(cherry picked from commit d6e5d74)
1 parent 7f15659 commit 5032d1a

96 files changed

Lines changed: 176 additions & 197 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
plugins {
22
id 'ru.vyarus.github-info' version '2.0.0' apply false
3-
id 'ru.vyarus.quality' version '5.0.0' apply false
4-
id 'org.cyclonedx.bom' version '2.3.0' apply false
3+
id 'ru.vyarus.quality' version '6.0.0' apply false
4+
id 'com.github.spotbugs' version '6.2.5' apply false
5+
id 'org.cyclonedx.bom' version '2.3.1' apply false
56
id 'ru.vyarus.mkdocs' version '4.0.1' apply false
67

78
id 'jacoco'
@@ -167,7 +168,7 @@ subprojects {
167168
// useJUnitPlatform()
168169
testLogging {
169170
events 'skipped', 'failed'
170-
exceptionFormat 'full'
171+
exceptionFormat = 'full'
171172
}
172173
maxHeapSize = '512m'
173174
}
@@ -239,5 +240,4 @@ afterReleaseBuild {
239240
doLast {
240241
logger.warn "RELEASED $project.group:$project.name:$project.version"
241242
}
242-
}
243-
243+
}

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/GuiceBundle.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@
124124
* @see ru.vyarus.dropwizard.guice.module.GuiceyConfigurationInfo for configuratio diagnostic
125125
* @since 31.08.2014
126126
*/
127-
@SuppressWarnings({"PMD.ExcessiveClassLength", "PMD.ExcessiveImports", "PMD.TooManyMethods",
128-
"PMD.ExcessivePublicCount", "PMD.GodClass"})
127+
@SuppressWarnings({"PMD.ExcessiveImports", "PMD.TooManyMethods",
128+
"PMD.ExcessivePublicCount", "PMD.GodClass", "PMD.CouplingBetweenObjects"})
129129
public final class GuiceBundle implements ConfiguredBundle<Configuration> {
130130

131131
private final ConfigurationContext context = new ConfigurationContext();
@@ -1209,7 +1209,7 @@ public Builder withSharedState(final Consumer<SharedConfigurationState> stateAct
12091209
* @return builder instance for chained calls
12101210
*/
12111211
public <C extends Configuration> Builder onGuiceyStartup(final GuiceyStartupListener<C> listener) {
1212-
return listen(new GuiceyStartupListenerAdapter<C>(listener));
1212+
return listen(new GuiceyStartupListenerAdapter<>(listener));
12131213
}
12141214

12151215
/**

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/GuiceyOptions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ public enum GuiceyOptions implements Option {
183183
*/
184184
UseHkBridge(Boolean.class, false);
185185

186-
private Class<?> type;
187-
private Object value;
186+
private final Class<?> type;
187+
private final Object value;
188188

189189
<T> GuiceyOptions(final Class<T> type, final T value) {
190190
this.type = type;

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/bundle/GuiceyBundleLookup.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* @author Vyacheslav Rusakov
1212
* @since 15.01.2016
1313
*/
14+
@FunctionalInterface
1415
public interface GuiceyBundleLookup {
1516

1617
/**

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/debug/LifecycleDiagnostic.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
* @author Vyacheslav Rusakov
5050
* @since 17.04.2018
5151
*/
52-
@SuppressWarnings({"checkstyle:ClassFanOutComplexity", "PMD.TooManyMethods", "PMD.ExcessiveImports"})
52+
@SuppressWarnings({"checkstyle:ClassFanOutComplexity", "PMD.ExcessiveImports", "PMD.CouplingBetweenObjects"})
5353
public class LifecycleDiagnostic extends UniqueGuiceyLifecycleListener {
5454

5555
private static final String BUNDLES = "bundles";
@@ -170,7 +170,7 @@ protected void modulesAnalyzed(final ModulesAnalyzedEvent event) {
170170
for (Binding binding : event.getBindingsRemoved()) {
171171
final List<String> modules = BindingUtils.getModules(binding).stream()
172172
.sorted(Collections.reverseOrder())
173-
.map(it -> it.substring(it.lastIndexOf(".") + 1))
173+
.map(it -> it.substring(it.lastIndexOf('.') + 1))
174174
.collect(Collectors.toList());
175175
bindings.add(String.join("/", modules) + " | " + RenderUtils
176176
.renderClassLine(binding.getKey().getTypeLiteral().getRawType()));
@@ -293,7 +293,7 @@ public void lifeCycleStopped(final LifeCycle event) {
293293
*/
294294
private final class JerseyEventListener implements ApplicationEventListener {
295295
@Override
296-
@SuppressWarnings({"checkstyle:MissingSwitchDefault", "PMD.SwitchStmtsShouldHaveDefault"})
296+
@SuppressWarnings({"checkstyle:MissingSwitchDefault", "PMD.NonExhaustiveSwitch"})
297297
@SuppressFBWarnings("SF_SWITCH_NO_DEFAULT")
298298
public void onEvent(final ApplicationEvent event) {
299299
switch (event.getType()) {

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/debug/StartupTimeDiagnostic.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public class StartupTimeDiagnostic extends UniqueGuiceyLifecycleListener {
6060
private final ShutdownTimeInfo stop = new ShutdownTimeInfo();
6161

6262
// for tracking dw phases in bundles tracker
63+
@SuppressWarnings("PMD.LooseCoupling")
6364
private DropwizardBundlesTracker bundlesTracker;
6465

6566
@Override
@@ -123,12 +124,10 @@ private class JettyListener implements LifeCycle.Listener {
123124
private final Stopwatch startTime;
124125
private final Stopwatch stopTime;
125126
private final List<Class<?>> startupEvents;
126-
private final ApplicationRunEvent event;
127127
private Duration startListenersTime;
128128
private final StatsInfo stats;
129129

130130
JettyListener(final ApplicationRunEvent event) {
131-
this.event = event;
132131
startTime = Stopwatch.createUnstarted();
133132
stopTime = Stopwatch.createUnstarted();
134133
startupEvents = new ArrayList<>();

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/debug/report/ReportRenderer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* @author Vyacheslav Rusakov
88
* @since 01.08.2016
99
*/
10+
@FunctionalInterface
1011
public interface ReportRenderer<T> {
1112

1213
/**

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/debug/report/guice/GuiceAopMapRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ru.vyarus.dropwizard.guice.debug.report.guice;
22
// CHECKSTYLE:OFF
33

4-
import com.google.inject.Module; // NOPMD
4+
import com.google.inject.Module;
55
// CHECKSTYLE:ON
66
import com.google.inject.*;
77
import com.google.inject.spi.ConstructorBinding;

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/debug/report/guice/GuiceBindingsRenderer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ private void markExtensions(final Map<Key, BindingDeclaration> moduleBindings) {
289289
}
290290

291291
@SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_INFERRED")
292-
@SuppressWarnings({"PMD.AvoidInstantiatingObjectsInLoops", "PMD.ConsecutiveLiteralAppends"})
293292
private void render(final TreeNode root, final ModuleDeclaration mod) {
294293
final TreeNode next = root.child(RenderUtils.renderClassLine(mod.getType(), mod.getMarkers()));
295294

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/debug/report/guice/model/BindingDeclaration.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ public void setModule(final String module) {
183183
}
184184

185185
@Override
186-
@SuppressWarnings("PMD.UseStringBufferForStringAppends")
187186
public String toString() {
188187
String res = type.name().toLowerCase() + " " + GuiceModelUtils.renderKey(key);
189188
if (module != null) {

0 commit comments

Comments
 (0)