Skip to content

Commit

Permalink
style(core): Align variable names
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Oct 27, 2022
1 parent 436705f commit 313ec3f
Show file tree
Hide file tree
Showing 19 changed files with 194 additions and 194 deletions.
Expand Up @@ -417,12 +417,12 @@ public org.jreleaser.model.api.assemble.JlinkAssembler.Jdeps asImmutable() {
}

@Override
public void merge(Jdeps jdeps) {
this.multiRelease = this.merge(this.multiRelease, jdeps.multiRelease);
this.ignoreMissingDeps = this.merge(this.ignoreMissingDeps, jdeps.ignoreMissingDeps);
this.useWildcardInPath = this.merge(this.useWildcardInPath, jdeps.useWildcardInPath);
this.enabled = merge(this.enabled, jdeps.enabled);
setTargets(merge(this.targets, jdeps.targets));
public void merge(Jdeps source) {
this.multiRelease = this.merge(this.multiRelease, source.multiRelease);
this.ignoreMissingDeps = this.merge(this.ignoreMissingDeps, source.ignoreMissingDeps);
this.useWildcardInPath = this.merge(this.useWildcardInPath, source.useWildcardInPath);
this.enabled = merge(this.enabled, source.enabled);
setTargets(merge(this.targets, source.targets));
}

public String getMultiRelease() {
Expand Down
Expand Up @@ -492,13 +492,13 @@ public org.jreleaser.model.api.assemble.JpackageAssembler.ApplicationPackage asI
}

@Override
public void merge(ApplicationPackage applicationPackage) {
this.appName = this.merge(this.appName, applicationPackage.appName);
this.appVersion = this.merge(this.appVersion, applicationPackage.appVersion);
this.vendor = this.merge(this.vendor, applicationPackage.vendor);
this.copyright = this.merge(this.copyright, applicationPackage.copyright);
this.licenseFile = this.merge(this.licenseFile, applicationPackage.licenseFile);
setFileAssociations(merge(this.fileAssociations, applicationPackage.fileAssociations));
public void merge(ApplicationPackage source) {
this.appName = this.merge(this.appName, source.appName);
this.appVersion = this.merge(this.appVersion, source.appVersion);
this.vendor = this.merge(this.vendor, source.vendor);
this.copyright = this.merge(this.copyright, source.copyright);
this.licenseFile = this.merge(this.licenseFile, source.licenseFile);
setFileAssociations(merge(this.fileAssociations, source.fileAssociations));
}

public String getResolvedAppVersion(JReleaserContext context, JpackageAssembler jpackage) {
Expand Down
Expand Up @@ -542,8 +542,8 @@ protected AbstractPlatformCustomizer(String platform) {
}

@Override
public void merge(S customizer) {
setArgs(merge(this.args, customizer.args));
public void merge(S source) {
setArgs(merge(this.args, source.args));
}

public List<String> getArgs() {
Expand Down
Expand Up @@ -126,18 +126,18 @@ public org.jreleaser.model.api.common.Artifact asImmutable() {
}

@Override
public void merge(Artifact artifact) {
this.effectivePath = merge(this.effectivePath, artifact.effectivePath);
this.path = merge(this.path, artifact.path);
this.platform = merge(this.platform, artifact.platform);
this.transform = merge(this.transform, artifact.transform);
this.resolvedPath = merge(this.resolvedPath, artifact.resolvedPath);
this.resolvedTransform = merge(this.resolvedTransform, artifact.resolvedTransform);
this.active = artifact.active;
setExtraProperties(merge(this.extraProperties, artifact.extraProperties));
public void merge(Artifact source) {
this.effectivePath = merge(this.effectivePath, source.effectivePath);
this.path = merge(this.path, source.path);
this.platform = merge(this.platform, source.platform);
this.transform = merge(this.transform, source.transform);
this.resolvedPath = merge(this.resolvedPath, source.resolvedPath);
this.resolvedTransform = merge(this.resolvedTransform, source.resolvedTransform);
this.active = source.active;
setExtraProperties(merge(this.extraProperties, source.extraProperties));

// do not merge
setHashes(artifact.hashes);
setHashes(source.hashes);
}

public boolean isActive() {
Expand Down
Expand Up @@ -52,9 +52,9 @@ public org.jreleaser.model.api.common.CommitAuthor asImmutable() {
}

@Override
public void merge(CommitAuthor author) {
this.email = merge(this.email, author.email);
this.name = merge(this.name, author.name);
public void merge(CommitAuthor source) {
this.email = merge(this.email, source.email);
this.name = merge(this.name, source.name);
}

public String getName() {
Expand Down
Expand Up @@ -234,19 +234,19 @@ public org.jreleaser.model.api.distributions.Distribution asImmutable() {
}

@Override
public void merge(Distribution distribution) {
super.merge(distribution);
this.active = merge(this.active, distribution.active);
this.enabled = merge(this.enabled, distribution.enabled);
this.name = merge(this.name, distribution.name);
this.type = merge(this.type, distribution.type);
this.stereotype = merge(this.stereotype, distribution.stereotype);
setExecutable(distribution.executable);
setPlatform(distribution.platform);
setJava(distribution.java);
setTags(merge(this.tags, distribution.tags));
setExtraProperties(merge(this.extraProperties, distribution.extraProperties));
setArtifacts(merge(this.artifacts, distribution.artifacts));
public void merge(Distribution source) {
super.merge(source);
this.active = merge(this.active, source.active);
this.enabled = merge(this.enabled, source.enabled);
this.name = merge(this.name, source.name);
this.type = merge(this.type, source.type);
this.stereotype = merge(this.stereotype, source.stereotype);
setExecutable(source.executable);
setPlatform(source.platform);
setJava(source.java);
setTags(merge(this.tags, source.tags));
setExtraProperties(merge(this.extraProperties, source.extraProperties));
setArtifacts(merge(this.artifacts, source.artifacts));
}

public Map<String, Object> props() {
Expand Down
Expand Up @@ -50,14 +50,14 @@ protected AbstractDownloader(String type) {
}

@Override
public void merge(S downloader) {
this.name = merge(this.name, downloader.name);
this.active = merge(this.active, downloader.active);
this.enabled = merge(this.enabled, downloader.enabled);
this.connectTimeout = merge(this.connectTimeout, downloader.connectTimeout);
this.readTimeout = merge(this.readTimeout, downloader.readTimeout);
setExtraProperties(merge(this.extraProperties, downloader.extraProperties));
setAssets(merge(this.assets, downloader.assets));
public void merge(S source) {
this.name = merge(this.name, source.name);
this.active = merge(this.active, source.active);
this.enabled = merge(this.enabled, source.enabled);
this.connectTimeout = merge(this.connectTimeout, source.connectTimeout);
this.readTimeout = merge(this.readTimeout, source.readTimeout);
setExtraProperties(merge(this.extraProperties, source.extraProperties));
setAssets(merge(this.assets, source.assets));
}

@Override
Expand Down
Expand Up @@ -130,12 +130,12 @@ public org.jreleaser.model.api.download.FtpDownloader asImmutable() {
}

@Override
public void merge(FtpDownloader ftp) {
super.merge(ftp);
this.username = merge(this.username, ftp.username);
this.password = merge(this.password, ftp.password);
this.host = merge(this.host, ftp.host);
this.port = merge(this.port, ftp.port);
public void merge(FtpDownloader source) {
super.merge(source);
this.username = merge(this.username, source.username);
this.password = merge(this.password, source.password);
this.host = merge(this.host, source.host);
this.port = merge(this.port, source.port);
}

public String getUsername() {
Expand Down
Expand Up @@ -130,12 +130,12 @@ public org.jreleaser.model.api.download.HttpDownloader asImmutable() {
}

@Override
public void merge(HttpDownloader http) {
super.merge(http);
this.username = merge(this.username, http.username);
this.password = merge(this.password, http.password);
this.authorization = merge(this.authorization, http.authorization);
setHeaders(merge(this.headers, http.headers));
public void merge(HttpDownloader source) {
super.merge(source);
this.username = merge(this.username, source.username);
this.password = merge(this.password, source.password);
this.authorization = merge(this.authorization, source.authorization);
setHeaders(merge(this.headers, source.headers));
}

@Override
Expand Down
Expand Up @@ -60,20 +60,20 @@ public abstract class AbstractDockerConfiguration<S extends AbstractDockerConfig
protected String baseImage;

@Override
public void merge(S docker) {
this.active = merge(this.active, docker.active);
this.enabled = merge(this.enabled, docker.enabled);
this.templateDirectory = merge(this.templateDirectory, docker.templateDirectory);
setSkipTemplates(merge(this.skipTemplates, docker.skipTemplates));
setExtraProperties(merge(this.extraProperties, docker.extraProperties));
this.baseImage = merge(this.baseImage, docker.baseImage);
this.useLocalArtifact = merge(this.useLocalArtifact, docker.useLocalArtifact);
setImageNames(merge(this.imageNames, docker.imageNames));
setBuildArgs(merge(this.buildArgs, docker.buildArgs));
setPreCommands(merge(this.preCommands, docker.preCommands));
setPostCommands(merge(this.postCommands, docker.postCommands));
setLabels(merge(this.labels, docker.labels));
setRegistries(merge(this.registries, docker.registries));
public void merge(S source) {
this.active = merge(this.active, source.active);
this.enabled = merge(this.enabled, source.enabled);
this.templateDirectory = merge(this.templateDirectory, source.templateDirectory);
setSkipTemplates(merge(this.skipTemplates, source.skipTemplates));
setExtraProperties(merge(this.extraProperties, source.extraProperties));
this.baseImage = merge(this.baseImage, source.baseImage);
this.useLocalArtifact = merge(this.useLocalArtifact, source.useLocalArtifact);
setImageNames(merge(this.imageNames, source.imageNames));
setBuildArgs(merge(this.buildArgs, source.buildArgs));
setPreCommands(merge(this.preCommands, source.preCommands));
setPostCommands(merge(this.postCommands, source.postCommands));
setLabels(merge(this.labels, source.labels));
setRegistries(merge(this.registries, source.registries));
}

@Override
Expand Down
Expand Up @@ -67,16 +67,16 @@ public void setTapName(String tapName) {
}

@Override
public void merge(S tap) {
this.active = merge(this.active, tap.active);
this.enabled = merge(this.enabled, tap.enabled);
this.owner = merge(this.owner, tap.owner);
this.name = merge(this.name, tap.name);
this.tagName = merge(this.tagName, tap.tagName);
this.branch = merge(this.branch, tap.branch);
this.username = merge(this.username, tap.username);
this.token = merge(this.token, tap.token);
this.commitMessage = merge(this.commitMessage, tap.commitMessage);
public void merge(S source) {
this.active = merge(this.active, source.active);
this.enabled = merge(this.enabled, source.enabled);
this.owner = merge(this.owner, source.owner);
this.name = merge(this.name, source.name);
this.tagName = merge(this.tagName, source.tagName);
this.branch = merge(this.branch, source.branch);
this.username = merge(this.username, source.username);
this.token = merge(this.token, source.token);
this.commitMessage = merge(this.commitMessage, source.commitMessage);
}

@Override
Expand Down
Expand Up @@ -519,15 +519,15 @@ public org.jreleaser.model.api.packagers.BrewPackager.Cask asImmutable() {
}

@Override
public void merge(Cask spurce) {
this.enabled = this.merge(this.enabled, spurce.enabled);
this.name = this.merge(this.name, spurce.name);
this.displayName = this.merge(this.displayName, spurce.displayName);
this.pkgName = this.merge(this.pkgName, spurce.pkgName);
this.appName = this.merge(this.appName, spurce.appName);
this.appcast = this.merge(this.appcast, spurce.appcast);
setUninstallItems(merge(this.uninstall, spurce.uninstall));
setZapItems(merge(this.zap, spurce.zap));
public void merge(Cask source) {
this.enabled = this.merge(this.enabled, source.enabled);
this.name = this.merge(this.name, source.name);
this.displayName = this.merge(this.displayName, source.displayName);
this.pkgName = this.merge(this.pkgName, source.pkgName);
this.appName = this.merge(this.appName, source.appName);
this.appcast = this.merge(this.appcast, source.appcast);
setUninstallItems(merge(this.uninstall, source.uninstall));
setZapItems(merge(this.zap, source.zap));
}

public void enable() {
Expand Down
Expand Up @@ -155,12 +155,12 @@ public org.jreleaser.model.api.packagers.DockerConfiguration.Registry asImmutabl
}

@Override
public void merge(DockerConfiguration.Registry registry) {
this.server = merge(this.server, registry.server);
this.serverName = merge(this.serverName, registry.serverName);
this.repositoryName = merge(this.repositoryName, registry.repositoryName);
this.username = merge(this.username, registry.username);
this.password = merge(this.password, registry.password);
public void merge(DockerConfiguration.Registry source) {
this.server = merge(this.server, source.server);
this.serverName = merge(this.serverName, source.serverName);
this.repositoryName = merge(this.repositoryName, source.repositoryName);
this.username = merge(this.username, source.username);
this.password = merge(this.password, source.password);
}

public String getResolvedPassword() {
Expand Down
Expand Up @@ -239,14 +239,14 @@ public org.jreleaser.model.api.packagers.DockerPackager asImmutable() {
}

@Override
public void merge(DockerPackager docker) {
super.merge(docker);
this.continueOnError = merge(this.continueOnError, docker.continueOnError);
this.downloadUrl = merge(this.downloadUrl, docker.downloadUrl);
this.failed = docker.failed;
setSpecs(mergeModel(this.specs, docker.specs));
setCommitAuthor(docker.commitAuthor);
setRepository(docker.repository);
public void merge(DockerPackager source) {
super.merge(source);
this.continueOnError = merge(this.continueOnError, source.continueOnError);
this.downloadUrl = merge(this.downloadUrl, source.downloadUrl);
this.failed = source.failed;
setSpecs(mergeModel(this.specs, source.specs));
setCommitAuthor(source.commitAuthor);
setRepository(source.repository);
}

@Override
Expand Down Expand Up @@ -483,9 +483,9 @@ public org.jreleaser.model.api.packagers.DockerPackager.DockerRepository asImmut
}

@Override
public void merge(DockerRepository tap) {
super.merge(tap);
this.versionedSubfolders = this.merge(this.versionedSubfolders, tap.versionedSubfolders);
public void merge(DockerRepository source) {
super.merge(source);
this.versionedSubfolders = this.merge(this.versionedSubfolders, source.versionedSubfolders);
}

public boolean isVersionedSubfolders() {
Expand Down
Expand Up @@ -137,20 +137,20 @@ public boolean hasEnabledPackagers() {
}

@Override
public void merge(S packagers) {
setAppImage(packagers.appImage);
setAsdf(packagers.asdf);
setBrew(packagers.brew);
setChocolatey(packagers.chocolatey);
setDocker(packagers.docker);
setFlatpak(packagers.flatpak);
setGofish(packagers.gofish);
setJbang(packagers.jbang);
setMacports(packagers.macports);
setScoop(packagers.scoop);
setSdkman(packagers.sdkman);
setSnap(packagers.snap);
setSpec(packagers.spec);
public void merge(S source) {
setAppImage(source.appImage);
setAsdf(source.asdf);
setBrew(source.brew);
setChocolatey(source.chocolatey);
setDocker(source.docker);
setFlatpak(source.flatpak);
setGofish(source.gofish);
setJbang(source.jbang);
setMacports(source.macports);
setScoop(source.scoop);
setSdkman(source.sdkman);
setSnap(source.snap);
setSpec(source.spec);
}

public AppImagePackager getAppImage() {
Expand Down
Expand Up @@ -55,8 +55,8 @@ public org.jreleaser.model.api.platform.Platform asImmutable() {
}

@Override
public void merge(Platform platform) {
setReplacements(merge(this.replacements, platform.replacements));
public void merge(Platform source) {
setReplacements(merge(this.replacements, source.replacements));
}

public boolean isSet() {
Expand Down

0 comments on commit 313ec3f

Please sign in to comment.