Skip to content
Permalink
Browse files

[JENKINS-46064] CamelCase as requested

  • Loading branch information
rsandell committed Aug 18, 2017
1 parent 71eaf99 commit 2b14f519c268464c0cc6d5bfd579a4c966f5141b
@@ -42,13 +42,13 @@
*
* The build must first have collected the changelog via for example <code>checkout scm</code>.
*/
public class ChangelogConditional extends DeclarativeStageConditional<ChangelogConditional> {
public class ChangeLogConditional extends DeclarativeStageConditional<ChangeLogConditional> {

private Pattern pattern;
private Pattern multiLinePattern;

@DataBoundConstructor
public ChangelogConditional(String pattern) {
public ChangeLogConditional(String pattern) {
//TODO JENKINS-46065 validate the regexp when #179 is merged
this.pattern = Pattern.compile(pattern);
this.multiLinePattern = Pattern.compile("(?m)(?s)^[^\\r\\n]*?" + pattern + "[^\\r\\n]*?$",
@@ -65,7 +65,7 @@ public Pattern getMultiLinePattern() {

@Extension
@Symbol("changelog")
public static class DescriptorImpl extends DeclarativeStageConditionalDescriptor<ChangelogConditional> {
public static class DescriptorImpl extends DeclarativeStageConditionalDescriptor<ChangeLogConditional> {
@Override
public Expression transformToRuntimeAST(@CheckForNull ModelASTWhenContent original) {
return ASTParserUtils.transformWhenContentToRuntimeAST(original);
@@ -42,13 +42,13 @@
*
* The build must first have collected the changelog via for example <code>checkout scm</code>.
*/
public class ChangesetConditional extends DeclarativeStageConditional<ChangesetConditional> {
public class ChangeSetConditional extends DeclarativeStageConditional<ChangeSetConditional> {

private String glob;
private boolean caseSensitive;

@DataBoundConstructor
public ChangesetConditional(String glob) {
public ChangeSetConditional(String glob) {
this.glob = glob;
this.caseSensitive = false;
}
@@ -68,7 +68,7 @@ public void setCaseSensitive(boolean caseSensitive) {

@Extension
@Symbol("changeset")
public static class DescriptorImpl extends DeclarativeStageConditionalDescriptor<ChangesetConditional> {
public static class DescriptorImpl extends DeclarativeStageConditionalDescriptor<ChangeSetConditional> {
@Override
public Expression transformToRuntimeAST(@CheckForNull ModelASTWhenContent original) {
return ASTParserUtils.transformWhenContentToRuntimeAST(original);
@@ -28,11 +28,11 @@ package org.jenkinsci.plugins.pipeline.modeldefinition.when.impl
import hudson.scm.ChangeLogSet
import org.jenkinsci.plugins.workflow.cps.CpsScript

class ChangelogConditionalScript extends AbstractChangelogConditionalScript<ChangelogConditional> {
class ChangeLogConditionalScript extends AbstractChangelogConditionalScript<ChangeLogConditional> {

Class<?> gitChangeSetClass

ChangelogConditionalScript(CpsScript s, ChangelogConditional c) {
ChangeLogConditionalScript(CpsScript s, ChangeLogConditional c) {
super(s, c)
}

@@ -27,13 +27,12 @@ package org.jenkinsci.plugins.pipeline.modeldefinition.when.impl

import hudson.scm.ChangeLogSet
import org.apache.tools.ant.DirectoryScanner
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
import org.jenkinsci.plugins.workflow.cps.CpsScript

class ChangesetConditionalScript extends AbstractChangelogConditionalScript<ChangesetConditional> {
class ChangeSetConditionalScript extends AbstractChangelogConditionalScript<ChangeSetConditional> {
String glob

ChangesetConditionalScript(CpsScript s, ChangesetConditional c) {
ChangeSetConditionalScript(CpsScript s, ChangeSetConditional c) {
super(s, c)
}

0 comments on commit 2b14f51

Please sign in to comment.
You can’t perform that action at this time.