Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-10 00:26:52 +01:00
Code Issues Packages Projects Releases Activity

Fix minor review mentions

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-08-11 08:07:06 +02:00
parent 0dc84ed94e
commit 50608b0189
8 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scm-webapp/src/main/java/sonia/scm/plugin/PluginInstaller.java
View File

@@ -38,7 +38,8 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Optional;
@SuppressWarnings("UnstableApiUsage") // guava hash is marked as unstable
@SuppressWarnings("UnstableApiUsage")
// guava hash is marked as unstable
class PluginInstaller {
private final SCMContextProvider scmContext;
@@ -76,28 +77,28 @@ class PluginInstaller {
}
}
private void verifyInformation(AvailablePluginDescriptor api, InstalledPluginDescriptor downloaded) {
verifyInformation(api.getInformation(), downloaded.getInformation());
private void verifyInformation(AvailablePluginDescriptor descriptorFromPluginCenter, InstalledPluginDescriptor downloadedDescriptor) {
verifyInformation(descriptorFromPluginCenter.getInformation(), downloadedDescriptor.getInformation());
}
private void verifyInformation(PluginInformation api, PluginInformation downloaded) {
if (!api.getName().equals(downloaded.getName())) {
private void verifyInformation(PluginInformation informationFromPluginCenter, PluginInformation downloadedInformation) {
if (!informationFromPluginCenter.getName().equals(downloadedInformation.getName())) {
throw new PluginInformationMismatchException(
api, downloaded,
informationFromPluginCenter, downloadedInformation,
String.format(
"downloaded plugin name \"%s\" does not match the expected name \"%s\" from plugin-center",
downloaded.getName(),
api.getName()
downloadedInformation.getName(),
informationFromPluginCenter.getName()
)
);
}
if (!api.getVersion().equals(downloaded.getVersion())) {
if (!informationFromPluginCenter.getVersion().equals(downloadedInformation.getVersion())) {
throw new PluginInformationMismatchException(
api, downloaded,
informationFromPluginCenter, downloadedInformation,
String.format(
"downloaded plugin version \"%s\" does not match the expected version \"%s\" from plugin-center",
downloaded.getVersion(),
api.getVersion()
downloadedInformation.getVersion(),
informationFromPluginCenter.getVersion()
)
);
}