Remove IPackage and IPackageRepository implementations (#25)

Remove the IPackage interface from ServerPackage
Remove the IPackageRepository interface from ServerPackageRepository
This further decouples NuGet.Server from NuGet.Core (still a work in progress!)

Author: joelverhagen

src/HashCodeCombiner.cs

@@ -0,0 +1,118 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace NuGet.Shared
+{
+    /// <summary>
+    /// Hash code creator, based on the original NuGet hash code combiner/ASP hash code combiner implementations
+    /// </summary>
+    internal struct HashCodeCombiner
+    {
+        // seed from String.GetHashCode()
+        private const long Seed = 0x1505L;
+
+        private bool _initialized;
+        private long _combinedHash;
+
+        internal int CombinedHash
+        {
+            get { return _combinedHash.GetHashCode(); }
+        }
+
+        internal void AddInt32(int i)
+        {
+            CheckInitialized();
+            _combinedHash = ((_combinedHash << 5) + _combinedHash) ^ i;
+        }
+
+        internal void AddObject(int i)
+        {
+            CheckInitialized();
+            AddInt32(i);
+        }
+
+        internal void AddObject(bool b)
+        {
+            CheckInitialized();
+            AddInt32(b.GetHashCode());
+        }
+
+        internal void AddObject<TValue>(TValue o, IEqualityComparer<TValue> comparer)
+        {
+            CheckInitialized();
+            if (o != null)
+            {
+                AddInt32(comparer.GetHashCode(o));
+            }
+        }
+
+        internal void AddObject(object o)
+        {
+            CheckInitialized();
+            if (o != null)
+            {
+                AddInt32(o.GetHashCode());
+            }
+        }
+
+        internal void AddStringIgnoreCase(string s)
+        {
+            CheckInitialized();
+            if (s != null)
+            {
+                AddObject(s, StringComparer.OrdinalIgnoreCase);
+            }
+        }
+
+        internal void AddSequence<T>(IEnumerable<T> sequence)
+        {
+            if (sequence != null)
+            {
+                foreach (var item in sequence)
+                {
+                    AddObject(item);
+                }
+            }
+        }
+
+        internal void AddDictionary<TKey, TValue>(IEnumerable<KeyValuePair<TKey, TValue>> dictionary)
+        {
+            if (dictionary != null)
+            {
+                foreach (var pair in dictionary.OrderBy(x => x.Key))
+                {
+                    AddObject(pair.Key);
+                    AddObject(pair.Value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Create a unique hash code for the given set of items
+        /// </summary>
+        internal static int GetHashCode(params object[] objects)
+        {
+            var combiner = new HashCodeCombiner();
+
+            foreach (var obj in objects)
+            {
+                combiner.AddObject(obj);
+            }
+
+            return combiner.CombinedHash;
+        }
+
+        private void CheckInitialized()
+        {
+            if (!_initialized)
+            {
+                _combinedHash = Seed;
+                _initialized = true;
+            }
+        }
+    }
+}

src/NuGet.Server.Core/DataServices/PackageExtensions.cs

@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,52 +11,7 @@ namespace NuGet.Server.Core.DataServices
 {
     public static class PackageExtensions
     {
-        public static ODataPackage AsODataPackage(this IPackage package)
-        {
-            var serverPackage = package as ServerPackage;
-            if (serverPackage != null)
-            {
-                return AsODataPackage(serverPackage);
-            }
-
-            var utcNow = DateTime.UtcNow;
-
-            return new ODataPackage
-            {
-                Id = package.Id,
-                Version = package.Version.ToString(),
-                NormalizedVersion = package.Version.ToNormalizedString(),
-                IsPrerelease = !package.IsReleaseVersion(),
-                Title = package.Title,
-                Authors = string.Join(",", package.Authors),
-                Owners = string.Join(",", package.Owners),
-                IconUrl = package.IconUrl == null ? null : package.IconUrl.GetComponents(UriComponents.HttpRequestUrl, UriFormat.Unescaped),
-                LicenseUrl = package.LicenseUrl == null ? null : package.LicenseUrl.GetComponents(UriComponents.HttpRequestUrl, UriFormat.Unescaped),
-                ProjectUrl = package.ProjectUrl == null ? null : package.ProjectUrl.GetComponents(UriComponents.HttpRequestUrl, UriFormat.Unescaped),
-                DownloadCount = package.DownloadCount,
-                RequireLicenseAcceptance = package.RequireLicenseAcceptance,
-                DevelopmentDependency = package.DevelopmentDependency,
-                Description = package.Description,
-                Summary = package.Summary,
-                ReleaseNotes = package.ReleaseNotes,
-                Published = package.Published.HasValue ? package.Published.Value.UtcDateTime : utcNow,
-                LastUpdated = package.Published.HasValue ? package.Published.Value.UtcDateTime : utcNow,
-                Dependencies = string.Join("|", package.DependencySets.SelectMany(ConvertDependencySetToStrings)),
-                PackageHash = package.GetHash(Constants.HashAlgorithm),
-                PackageHashAlgorithm = Constants.HashAlgorithm,
-                PackageSize = package.GetStream().Length,
-                Copyright = package.Copyright,
-                Tags = package.Tags,
-                IsAbsoluteLatestVersion = package.IsAbsoluteLatestVersion,
-                IsLatestVersion = package.IsLatestVersion,
-                Listed = package.Listed,
-                VersionDownloadCount = package.DownloadCount,
-                MinClientVersion = package.MinClientVersion == null ? null : package.MinClientVersion.ToString(),
-                Language = package.Language
-            };
-        }
-
-        public static ODataPackage AsODataPackage(this ServerPackage package)
+        public static ODataPackage AsODataPackage(this IServerPackage package)
         {
             return new ODataPackage
             {

src/NuGet.Server.Core/Infrastructure/IServerPackage.cs

@@ -0,0 +1,43 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.Versioning;
+
+namespace NuGet.Server.Core.Infrastructure
+{
+    public interface IServerPackage
+    {
+        string Id { get; }
+        SemanticVersion Version { get; }
+        string Title { get; }
+        IEnumerable<string> Authors { get; }
+        IEnumerable<string> Owners { get; }
+        Uri IconUrl { get; }
+        Uri LicenseUrl { get; }
+        Uri ProjectUrl { get; }
+        int DownloadCount { get; }
+        bool RequireLicenseAcceptance { get; }
+        bool DevelopmentDependency { get; }
+        string Description { get; }
+        string Summary { get; }
+        string ReleaseNotes { get; }
+        IEnumerable<PackageDependencySet> DependencySets { get; }
+        string Copyright { get; }
+        string Tags { get; }
+        bool IsAbsoluteLatestVersion { get; }
+        bool IsLatestVersion { get; }
+        bool Listed { get; }
+        Version MinClientVersion { get; }
+        string Language { get; }
+        long PackageSize { get; }
+        string PackageHash { get; }
+        string PackageHashAlgorithm { get; }
+        string FullPath { get; }
+        DateTimeOffset LastUpdated { get; }
+        DateTimeOffset Created { get; }
+
+        IEnumerable<FrameworkName> GetSupportedFrameworks();
+    }
+}

src/NuGet.Server.Core/Infrastructure/IServerPackageRepository.cs

@@ -1,11 +1,34 @@
 // Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. 
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Versioning;
+
 namespace NuGet.Server.Core.Infrastructure
 {
-    public interface IServerPackageRepository 
-        : IServiceBasedRepository
+    public interface IServerPackageRepository
     {
+        string Source { get; }
+
+        void AddPackage(IPackage package);
+
+        IQueryable<IServerPackage> GetPackages();
+
+        IEnumerable<IServerPackage> GetUpdates(
+            IEnumerable<IPackageName> packages,
+            bool includePrerelease,
+            bool includeAllVersions,
+            IEnumerable<FrameworkName> targetFrameworks,
+            IEnumerable<IVersionSpec> versionConstraints);
+
+        IQueryable<IServerPackage> Search(
+            string searchTerm,
+            IEnumerable<string> targetFrameworks,
+            bool allowPrereleaseVersions);
+
         void ClearCache();
+
         void RemovePackage(string packageId, SemanticVersion version);
     }
 }

src/NuGet.Server.Core/Infrastructure/IdAndVersionEqualityComparer.cs

@@ -0,0 +1,42 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using NuGet.Shared;
+
+namespace NuGet.Server.Core.Infrastructure
+{
+    public class IdAndVersionEqualityComparer : IEqualityComparer<IServerPackage>
+    {
+        private static readonly IdAndVersionEqualityComparer _instance = new IdAndVersionEqualityComparer();
+        public static IdAndVersionEqualityComparer Instance => _instance;
+
+        public bool Equals(IServerPackage x, IServerPackage y)
+        {
+            // If both are null or the same instance, this condition will be true.
+            if (ReferenceEquals(x, y))
+            {
+                return true;
+            }
+
+            if (x == null || y == null)
+            {
+                return false;
+            }
+
+            return StringComparer.OrdinalIgnoreCase.Equals(x.Id, y.Id) &&
+                   x.Version == y.Version;
+        }
+
+        public int GetHashCode(IServerPackage obj)
+        {
+            var combiner = new HashCodeCombiner();
+
+            combiner.AddStringIgnoreCase(obj.Id);
+            combiner.AddObject(obj.Version);
+
+            return combiner.CombinedHash;
+        }
+    }
+}

src/NuGet.Server.Core/Infrastructure/PackageDerivedData.cs

@@ -16,7 +16,6 @@ public PackageDerivedData()
         public string PackageHashAlgorithm { get; set; }
         public DateTimeOffset LastUpdated { get; set; }
         public DateTimeOffset Created { get; set; }
-        public string Path { get; set; }
         public string FullPath { get; set; }
     }
 }