Skip to content

Commit 1c6d9fc

Browse files
joelverhagenjoelverhagen
authored
Merge pull request #9142 from NuGet/dev
RI dev -> main
2 parents 0e8706e + 0cf362a commit 1c6d9fc

14 files changed

Lines changed: 0 additions & 710 deletions

‎src/NuGetGallery.Services/Configuration/IODataCacheConfiguration.cs‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/NuGetGallery.Services/Configuration/ODataCacheConfiguration.cs‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/NuGetGallery.Services/ServicesConstants.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public static class ContentNames
5959
public static readonly string TyposquattingConfiguration = "Typosquatting-Configuration";
6060
public static readonly string NuGetPackagesGitHubDependencies = "GitHubUsage.v1";
6161
public static readonly string ABTestConfiguration = "AB-Test-Configuration";
62-
public static readonly string ODataCacheConfiguration = "OData-Cache-Configuration";
6362
public static readonly string CacheConfiguration = "Cache-Configuration";
6463
public static readonly string QueryHintConfiguration = "Query-Hint-Configuration";
6564
public static readonly string TrustedImageDomains = "Trusted-Image-Domains";

‎src/NuGetGallery.Services/Storage/ContentObjectService.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public ContentObjectService(IContentService contentService)
2525
TyposquattingConfiguration = new TyposquattingConfiguration();
2626
GitHubUsageConfiguration = new GitHubUsageConfiguration(Array.Empty<RepositoryInformation>());
2727
ABTestConfiguration = new ABTestConfiguration();
28-
ODataCacheConfiguration = new ODataCacheConfiguration();
2928
CacheConfiguration = new CacheConfiguration();
3029
QueryHintConfiguration = new QueryHintConfiguration();
3130
TrustedImageDomains = new TrustedImageDomains();
@@ -37,7 +36,6 @@ public ContentObjectService(IContentService contentService)
3736
public ITyposquattingConfiguration TyposquattingConfiguration { get; private set; }
3837
public IGitHubUsageConfiguration GitHubUsageConfiguration { get; private set; }
3938
public IABTestConfiguration ABTestConfiguration { get; private set; }
40-
public IODataCacheConfiguration ODataCacheConfiguration { get; private set; }
4139
public ICacheConfiguration CacheConfiguration { get; private set; }
4240
public IQueryHintConfiguration QueryHintConfiguration { get; private set; }
4341
public ITrustedImageDomains TrustedImageDomains { get; private set; }
@@ -69,10 +67,6 @@ await Refresh<IReadOnlyCollection<RepositoryInformation>>(ServicesConstants.Cont
6967
await Refresh<ABTestConfiguration>(ServicesConstants.ContentNames.ABTestConfiguration) ??
7068
new ABTestConfiguration();
7169

72-
ODataCacheConfiguration =
73-
await Refresh<ODataCacheConfiguration>(ServicesConstants.ContentNames.ODataCacheConfiguration) ??
74-
new ODataCacheConfiguration();
75-
7670
CacheConfiguration =
7771
await Refresh<CacheConfiguration>(ServicesConstants.ContentNames.CacheConfiguration) ??
7872
new CacheConfiguration();

‎src/NuGetGallery.Services/Storage/IContentObjectService.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ public interface IContentObjectService
1414
ITyposquattingConfiguration TyposquattingConfiguration { get; }
1515
IGitHubUsageConfiguration GitHubUsageConfiguration { get; }
1616
IABTestConfiguration ABTestConfiguration { get; }
17-
IODataCacheConfiguration ODataCacheConfiguration { get; }
1817
ICacheConfiguration CacheConfiguration { get; }
1918
IQueryHintConfiguration QueryHintConfiguration { get; }
2019
ITrustedImageDomains TrustedImageDomains { get; }

‎src/NuGetGallery/Controllers/AccountsController.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -645,10 +645,6 @@ public virtual JsonResult GetCertificate(string accountName, string thumbprint)
645645
}
646646

647647
[HttpGet]
648-
[OutputCache(
649-
Duration = GalleryConstants.GravatarCacheDurationSeconds,
650-
Location = OutputCacheLocation.Downstream,
651-
VaryByParam = "imageSize")]
652648
public async Task<ActionResult> GetAvatar(
653649
string accountName,
654650
int? imageSize = GalleryConstants.GravatarImageSize)

‎src/NuGetGallery/Controllers/ODataV1FeedController.cs‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public ODataV1FeedController(
5353
// /api/v1/Packages
5454
[HttpGet]
5555
[HttpPost]
56-
[CacheOutput(NoCache = true)]
5756
public IHttpActionResult Get(ODataQueryOptions<V1FeedPackage> options)
5857
{
5958
_telemetryService.TrackApiRequest("/api/v1/Packages");
@@ -62,7 +61,6 @@ public IHttpActionResult Get(ODataQueryOptions<V1FeedPackage> options)
6261

6362
// /api/v1/Packages/$count
6463
[HttpGet]
65-
[CacheOutput(NoCache = true)]
6664
public IHttpActionResult GetCount(ODataQueryOptions<V1FeedPackage> options)
6765
{
6866
_telemetryService.TrackApiRequest("/api/v1/Packages/$count");
@@ -102,11 +100,6 @@ private IHttpActionResult Get(ODataQueryOptions<V1FeedPackage> options, bool isN
102100

103101
// /api/v1/Packages(Id=,Version=)
104102
[HttpGet]
105-
[ODataCacheOutput(
106-
ODataCachedEndpoint.GetSpecificPackage,
107-
serverTimeSpan: ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds,
108-
Private = true,
109-
ClientTimeSpan = ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds)]
110103
public async Task<IHttpActionResult> Get(ODataQueryOptions<V1FeedPackage> options, string id, string version)
111104
{
112105
_telemetryService.TrackApiRequest("/api/v1/Packages(Id=,Version=)");
@@ -122,11 +115,6 @@ public async Task<IHttpActionResult> Get(ODataQueryOptions<V1FeedPackage> option
122115
// /api/v1/FindPackagesById()?id=
123116
[HttpGet]
124117
[HttpPost]
125-
[ODataCacheOutput(
126-
ODataCachedEndpoint.FindPackagesById,
127-
serverTimeSpan: ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds,
128-
Private = true,
129-
ClientTimeSpan = ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds)]
130118
public async Task<IHttpActionResult> FindPackagesById(ODataQueryOptions<V1FeedPackage> options, [FromODataUri]string id)
131119
{
132120
_telemetryService.TrackApiRequest("/api/v1/FindPackagesById()?id=");
@@ -138,10 +126,6 @@ public async Task<IHttpActionResult> FindPackagesById(ODataQueryOptions<V1FeedPa
138126

139127
// /api/v1/FindPackagesById()/$count?id=
140128
[HttpGet]
141-
[ODataCacheOutput(
142-
ODataCachedEndpoint.FindPackagesByIdCount,
143-
serverTimeSpan: ODataCacheConfiguration.DefaultFindPackagesByIdCountCacheTimeInSeconds,
144-
NoCache = true)]
145129
public async Task<IHttpActionResult> FindPackagesByIdCount(ODataQueryOptions<V1FeedPackage> options, [FromODataUri] string id)
146130
{
147131
_telemetryService.TrackApiRequest("/api/v1/FindPackagesById()/$count?id=");
@@ -273,10 +257,6 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,
273257
// /api/v1/Search()?searchTerm=&targetFramework=&includePrerelease=
274258
[HttpGet]
275259
[HttpPost]
276-
[ODataCacheOutput(
277-
ODataCachedEndpoint.Search,
278-
serverTimeSpan: ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds,
279-
ClientTimeSpan = ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds)]
280260
public async Task<IHttpActionResult> Search(
281261
ODataQueryOptions<V1FeedPackage> options,
282262
[FromODataUri]string searchTerm = "",
@@ -292,10 +272,6 @@ public async Task<IHttpActionResult> Search(
292272

293273
// /api/v1/Search()/$count?searchTerm=&targetFramework=&includePrerelease=
294274
[HttpGet]
295-
[ODataCacheOutput(
296-
ODataCachedEndpoint.Search,
297-
serverTimeSpan: ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds,
298-
ClientTimeSpan = ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds)]
299275
public async Task<IHttpActionResult> SearchCount(
300276
ODataQueryOptions<V1FeedPackage> options,
301277
[FromODataUri]string searchTerm = "",
@@ -398,7 +374,6 @@ private async Task<IHttpActionResult> SearchAsync(
398374
}
399375

400376
[HttpGet]
401-
[CacheOutput(NoCache = true)]
402377
public virtual HttpResponseMessage SimulateError([FromUri] string type = "Exception")
403378
{
404379
if (!Enum.TryParse<SimulatedErrorType>(type, out var parsedType))

‎src/NuGetGallery/Controllers/ODataV2FeedController.cs‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public ODataV2FeedController(
5656
// /api/v2/Packages?semVerLevel=
5757
[HttpGet]
5858
[HttpPost]
59-
[CacheOutput(NoCache = true)]
6059
public async Task<IHttpActionResult> Get(
6160
ODataQueryOptions<V2FeedPackage> options,
6261
[FromUri]string semVerLevel = null)
@@ -70,7 +69,6 @@ public async Task<IHttpActionResult> Get(
7069

7170
// /api/v2/Packages/$count?semVerLevel=
7271
[HttpGet]
73-
[CacheOutput(NoCache = true)]
7472
public async Task<IHttpActionResult> GetCount(
7573
ODataQueryOptions<V2FeedPackage> options,
7674
[FromUri] string semVerLevel = null)
@@ -189,11 +187,6 @@ private async Task<IHttpActionResult> GetAsync(
189187

190188
// /api/v2/Packages(Id=,Version=)
191189
[HttpGet]
192-
[ODataCacheOutput(
193-
ODataCachedEndpoint.GetSpecificPackage,
194-
serverTimeSpan: ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds,
195-
Private = true,
196-
ClientTimeSpan = ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds)]
197190
public async Task<IHttpActionResult> Get(
198191
ODataQueryOptions<V2FeedPackage> options,
199192
string id,
@@ -219,11 +212,6 @@ public async Task<IHttpActionResult> Get(
219212
// /api/v2/FindPackagesById()?id=&semVerLevel=
220213
[HttpGet]
221214
[HttpPost]
222-
[ODataCacheOutput(
223-
ODataCachedEndpoint.FindPackagesById,
224-
serverTimeSpan: ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds,
225-
Private = true,
226-
ClientTimeSpan = ODataCacheConfiguration.DefaultGetByIdAndVersionCacheTimeInSeconds)]
227215
public async Task<IHttpActionResult> FindPackagesById(
228216
ODataQueryOptions<V2FeedPackage> options,
229217
[FromODataUri]string id,
@@ -239,10 +227,6 @@ public async Task<IHttpActionResult> FindPackagesById(
239227

240228
// /api/v2/FindPackagesById()/$count?semVerLevel=
241229
[HttpGet]
242-
[ODataCacheOutput(
243-
ODataCachedEndpoint.FindPackagesByIdCount,
244-
serverTimeSpan: ODataCacheConfiguration.DefaultFindPackagesByIdCountCacheTimeInSeconds,
245-
NoCache = true)]
246230
public async Task<IHttpActionResult> FindPackagesByIdCount(
247231
ODataQueryOptions<V2FeedPackage> options,
248232
[FromODataUri] string id,
@@ -431,10 +415,6 @@ public IHttpActionResult GetPropertyFromPackages(string propertyName, string id,
431415
// /api/v2/Search()?searchTerm=&targetFramework=&includePrerelease=
432416
[HttpGet]
433417
[HttpPost]
434-
[ODataCacheOutput(
435-
ODataCachedEndpoint.Search,
436-
serverTimeSpan: ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds,
437-
ClientTimeSpan = ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds)]
438418
public async Task<IHttpActionResult> Search(
439419
ODataQueryOptions<V2FeedPackage> options,
440420
[FromODataUri]string searchTerm = "",
@@ -454,10 +434,6 @@ public async Task<IHttpActionResult> Search(
454434

455435
// /api/v2/Search()/$count?searchTerm=&targetFramework=&includePrerelease=&semVerLevel=
456436
[HttpGet]
457-
[ODataCacheOutput(
458-
ODataCachedEndpoint.Search,
459-
serverTimeSpan: ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds,
460-
ClientTimeSpan = ODataCacheConfiguration.DefaultSearchCacheTimeInSeconds)]
461437
public async Task<IHttpActionResult> SearchCount(
462438
ODataQueryOptions<V2FeedPackage> options,
463439
[FromODataUri] string searchTerm = "",

0 commit comments

Comments
 (0)