From 6584ab3767e8e772cb55a5fd5f001a6c74393980 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 7 Jul 2019 19:48:23 -0700 Subject: [PATCH] StashBuildTrigger: Rename StashBuildTriggerDescriptor to DescriptorImpl DescriptorImpl is the standard name for a descriptor defined as an inner class. StashBuildTriggerDescriptor is a long name that duplicates the name of its containing class, StashBuildTrigger. --- .../stashpullrequestbuilder/StashBuildTrigger.java | 7 +++---- .../stashpullrequestbuilder/StashBuildTriggerTest.java | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java index 17656240..a9102bfa 100644 --- a/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java +++ b/src/main/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTrigger.java @@ -55,8 +55,7 @@ public class StashBuildTrigger extends Trigger> { private transient StashPullRequestsBuilder stashPullRequestsBuilder; - @Extension - public static final StashBuildTriggerDescriptor descriptor = new StashBuildTriggerDescriptor(); + @Extension public static final DescriptorImpl descriptor = new DescriptorImpl(); @DataBoundConstructor public StashBuildTrigger( @@ -229,8 +228,8 @@ public boolean getOnlyBuildOnComment() { return onlyBuildOnComment; } - public static final class StashBuildTriggerDescriptor extends TriggerDescriptor { - public StashBuildTriggerDescriptor() { + public static final class DescriptorImpl extends TriggerDescriptor { + public DescriptorImpl() { load(); } diff --git a/src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTriggerTest.java b/src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTriggerTest.java index 677f51fa..f5b42aa9 100644 --- a/src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTriggerTest.java +++ b/src/test/java/stashpullrequestbuilder/stashpullrequestbuilder/StashBuildTriggerTest.java @@ -14,7 +14,6 @@ import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoRule; import org.mockito.quality.Strictness; -import stashpullrequestbuilder.stashpullrequestbuilder.StashBuildTrigger.StashBuildTriggerDescriptor; @RunWith(MockitoJUnitRunner.class) public class StashBuildTriggerTest { @@ -24,7 +23,7 @@ public class StashBuildTriggerTest { @Test public void check_getters() throws Exception { - StashBuildTriggerDescriptor descriptor = StashBuildTrigger.descriptor; + StashBuildTrigger.DescriptorImpl descriptor = StashBuildTrigger.descriptor; // Field names from config.jelly Iterable properties =