From c013c0177c03e296fd66d57d7fd4b5bac1611395 Mon Sep 17 00:00:00 2001 From: Eugene Petrenko Date: Tue, 19 Jul 2011 19:12:16 +0400 Subject: [PATCH] fix rename issue of NPE fix merge --- .../jetbrains/buildServer/nuget/server/exec/PackageInfo.java | 2 +- .../nuget/server/trigger/NamedPackagesUpdateChecker.java | 2 +- .../nuget/tests/server/ListPackagesCommandProcessorTest.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/exec/PackageInfo.java b/nuget-server/src/jetbrains/buildServer/nuget/server/exec/PackageInfo.java index f964f0a..0b318ff 100644 --- a/nuget-server/src/jetbrains/buildServer/nuget/server/exec/PackageInfo.java +++ b/nuget-server/src/jetbrains/buildServer/nuget/server/exec/PackageInfo.java @@ -28,7 +28,7 @@ public class PackageInfo { private final String myPackageId; private final String myVersion; - public SourcePackageInfo(@Nullable final String source, + public PackageInfo(@Nullable final String source, @NotNull final String packageId, @NotNull final String version) { mySource = source; diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java b/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java index 90020bb..06e2365 100644 --- a/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java +++ b/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/NamedPackagesUpdateChecker.java @@ -74,7 +74,7 @@ public class NamedPackagesUpdateChecker implements TriggerUpdateChecker { }); StringBuilder sb = new StringBuilder(); - for (SourcePackageInfo info : sorted) { + for (PackageInfo info : sorted) { String source = info.getSource(); if (source != null) { sb.append("|s:").append(source); diff --git a/nuget-tests/src/jetbrains/buildServer/nuget/tests/server/ListPackagesCommandProcessorTest.java b/nuget-tests/src/jetbrains/buildServer/nuget/tests/server/ListPackagesCommandProcessorTest.java index 27f6b17..2c01f64 100644 --- a/nuget-tests/src/jetbrains/buildServer/nuget/tests/server/ListPackagesCommandProcessorTest.java +++ b/nuget-tests/src/jetbrains/buildServer/nuget/tests/server/ListPackagesCommandProcessorTest.java @@ -82,9 +82,9 @@ public class ListPackagesCommandProcessorTest extends BaseTestCase { p = new ListPackagesCommandProcessor(null); p.onStdOutput("##teamcity[nuget-package Id='NUnit' Version='2.5.10.11092']"); - Collection result = p.getResult(); + Collection result = p.getResult(); Assert.assertEquals(result.size(), 1); - SourcePackageInfo next = result.iterator().next(); + PackageInfo next = result.iterator().next(); Assert.assertEquals(next.getSource(), null); Assert.assertEquals(next.getPackageId(), "NUnit"); -- 2.32.0