move tagging related classes into a namespace. (#539)

minio · May 19, 2021 · 54a1709 · 54a1709
1 parent 77bd34b
commit 54a1709
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 17 deletions.
diff --git a/Minio.Examples/Cases/CopyObjectReplaceTags.cs b/Minio.Examples/Cases/CopyObjectReplaceTags.cs
@@ -1,5 +1,5 @@
 /*
- * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2017-2021 MinIO, Inc.
+ * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2021 MinIO, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Threading.Tasks;
-using Minio.DataModel;
+using Minio.DataModel.Tags;
 
 namespace Minio.Examples.Cases
 {
@@ -38,13 +37,14 @@ public async static Task Run(MinioClient minio,
                 {
                     { "Test-TagKey", "Test-TagValue" },
                 };
+                Tagging tagObj = Tagging.GetObjectTags(tags);
                 CopySourceObjectArgs cpSrcArgs = new CopySourceObjectArgs()
                                                             .WithBucket(fromBucketName)
                                                             .WithObject(fromObjectName);
                 CopyObjectArgs args = new CopyObjectArgs()
                                                 .WithBucket(destBucketName)
                                                 .WithObject(destObjectName)
-                                                .WithTagging(Tagging.GetObjectTags(tags))
+                                                .WithTagging(tagObj)
                                                 .WithReplaceTagsDirective(true)
                                                 .WithCopyObjectSource(cpSrcArgs);
                 await minio.CopyObjectAsync(args).ConfigureAwait(false);

diff --git a/Minio.Examples/Cases/GetBucketTags.cs b/Minio.Examples/Cases/GetBucketTags.cs
@@ -1,5 +1,5 @@
 /*
- * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2020 MinIO, Inc.
+ * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2020, 2021 MinIO, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 using System;
 using System.Threading.Tasks;
 
+using Minio.DataModel.Tags;
+
 namespace Minio.Examples.Cases
 {
     public class GetBucketTags

diff --git a/Minio.Examples/Cases/GetObjectTags.cs b/Minio.Examples/Cases/GetObjectTags.cs
@@ -1,5 +1,5 @@
 /*
- * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2020 MinIO, Inc.
+ * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2020, 2021 MinIO, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 using System;
 using System.Threading.Tasks;
 
+using Minio.DataModel.Tags;
+
 namespace Minio.Examples.Cases
 {
     public class GetObjectTags

diff --git a/Minio.Examples/Cases/PutObjectWithTags.cs b/Minio.Examples/Cases/PutObjectWithTags.cs
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-using Minio.DataModel;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+using Minio.DataModel.Tags;
+
 namespace Minio.Examples.Cases
 {
     class PutObjectWithTags

diff --git a/Minio.Examples/Cases/SetBucketReplication.cs b/Minio.Examples/Cases/SetBucketReplication.cs
@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-using Minio.DataModel;
+using Minio.DataModel.Tags;
 using Minio.DataModel.Replication;
 
 namespace Minio.Examples.Cases

diff --git a/Minio.Examples/Cases/SetBucketTags.cs b/Minio.Examples/Cases/SetBucketTags.cs
@@ -1,5 +1,5 @@
 /*
- * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2020 MinIO, Inc.
+ * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2020, 2021 MinIO, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Minio.DataModel;
+using Minio.DataModel.Tags;
 
 namespace Minio.Examples.Cases
 {

diff --git a/Minio.Examples/Cases/SetObjectTags.cs b/Minio.Examples/Cases/SetObjectTags.cs
@@ -1,5 +1,5 @@
 /*
- * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2020 MinIO, Inc.
+ * MinIO .NET Library for Amazon S3 Compatible Cloud Storage, (C) 2020, 2021 MinIO, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Minio.DataModel;
+using Minio.DataModel.Tags;
 
 namespace Minio.Examples.Cases
 {

diff --git a/Minio.Functional.Tests/FunctionalTest.cs b/Minio.Functional.Tests/FunctionalTest.cs
@@ -18,13 +18,13 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Minio.DataModel;
 using Minio.DataModel.ILM;
+using Minio.DataModel.Tags;
 using Minio.DataModel.ObjectLock;
 using Minio.Exceptions;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Security.Cryptography;

diff --git a/Minio/ApiEndpoints/BucketOperations.cs b/Minio/ApiEndpoints/BucketOperations.cs
@@ -16,6 +16,7 @@
  */
 
 using Minio.DataModel;
+using Minio.DataModel.Tags;
 using Minio.Exceptions;
 using RestSharp;
 using System;

diff --git a/Minio/ApiEndpoints/IBucketOperations.cs b/Minio/ApiEndpoints/IBucketOperations.cs
@@ -23,6 +23,7 @@
 using Minio.DataModel;
 using Minio.DataModel.ILM;
 using Minio.DataModel.Replication;
+using Minio.DataModel.Tags;
 using Minio.DataModel.ObjectLock;
 using Minio.Exceptions;
 

diff --git a/Minio/ApiEndpoints/IObjectOperations.cs b/Minio/ApiEndpoints/IObjectOperations.cs
@@ -22,6 +22,7 @@
 using System.Threading.Tasks;
 
 using Minio.DataModel;
+using Minio.DataModel.Tags;
 using Minio.DataModel.ObjectLock;
 using Minio.Exceptions;
 

diff --git a/Minio/ApiEndpoints/ObjectOperations.cs b/Minio/ApiEndpoints/ObjectOperations.cs
@@ -28,6 +28,7 @@
 using System.Xml.Serialization;
 
 using Minio.DataModel;
+using Minio.DataModel.Tags;
 using Minio.Exceptions;
 using Minio.Helper;
 using Minio.DataModel.ObjectLock;

diff --git a/Minio/DataModel/BucketOperationsArgs.cs b/Minio/DataModel/BucketOperationsArgs.cs
@@ -20,6 +20,7 @@
 using Minio.DataModel;
 using Minio.DataModel.ILM;
 using Minio.DataModel.Replication;
+using Minio.DataModel.Tags;
 using Minio.DataModel.ObjectLock;
 using Minio.Exceptions;
 using RestSharp;

diff --git a/Minio/DataModel/BucketOperationsReponse.cs b/Minio/DataModel/BucketOperationsReponse.cs
@@ -17,6 +17,7 @@
 using Minio.DataModel;
 using Minio.DataModel.ILM;
 using Minio.DataModel.Replication;
+using Minio.DataModel.Tags;
 using Minio.DataModel.ObjectLock;
 
 using System;

diff --git a/Minio/DataModel/ILM/AndOperator.cs b/Minio/DataModel/ILM/AndOperator.cs
@@ -18,6 +18,8 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
+using Minio.DataModel.Tags;
+
 /*
  * AndOperator is used with Lifecycle RuleFilter to bind the rules together.
  * Please refer:

diff --git a/Minio/DataModel/ILM/RuleFilter.cs b/Minio/DataModel/ILM/RuleFilter.cs
@@ -16,6 +16,7 @@
 
 using System;
 using System.Xml.Serialization;
+using Minio.DataModel.Tags;
 
 /*
  * RuleFilter class used within LifecycleRule which encapsulates filter information.

diff --git a/Minio/DataModel/ObjectOperationsArgs.cs b/Minio/DataModel/ObjectOperationsArgs.cs
@@ -24,6 +24,7 @@
 using System.Linq;
 
 using Minio.DataModel;
+using Minio.DataModel.Tags;
 using Minio.DataModel.ObjectLock;
 using Minio.Exceptions;
 using Minio.Helper;

diff --git a/Minio/DataModel/ObjectOperationsResponse.cs b/Minio/DataModel/ObjectOperationsResponse.cs
@@ -23,6 +23,7 @@
 using System.Xml.Serialization;
 
 using Minio.DataModel;
+using Minio.DataModel.Tags;
 using Minio.DataModel.ObjectLock;
 using RestSharp;
 

diff --git a/Minio/DataModel/ObjectWriteArgs.cs b/Minio/DataModel/ObjectWriteArgs.cs
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-using Minio.DataModel;
+using Minio.DataModel.Tags;
 using Minio.DataModel.ObjectLock;
 
 namespace Minio

diff --git a/Minio/DataModel/Replication/AndOperator.cs b/Minio/DataModel/Replication/AndOperator.cs
@@ -18,6 +18,8 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
+using Minio.DataModel.Tags;
+
 /*
  * AndOperator class used within RuleFilter of ReplicationRule which is used to specify rule components and is equivalent of a Logical And for two or more predicates.
  * Please refer:

diff --git a/Minio/DataModel/Replication/RuleFilter.cs b/Minio/DataModel/Replication/RuleFilter.cs
@@ -17,6 +17,8 @@
 using System;
 using System.Xml.Serialization;
 
+using Minio.DataModel.Tags;
+
 /*
  * RuleFilter class used within ReplicationRule which encapsulates filter information.
  * Please refer:

diff --git a/Minio/DataModel/Tag.cs → Minio/DataModel/Tags/Tag.cs b/Minio/DataModel/Tag.cs → Minio/DataModel/Tags/Tag.cs
@@ -17,7 +17,7 @@
 using System;
 using System.Xml.Serialization;
 
-namespace Minio.DataModel
+namespace Minio.DataModel.Tags
 {
     [Serializable]
     [XmlRoot(ElementName = "Tag")]

diff --git a/Minio/DataModel/TagSet.cs → Minio/DataModel/Tags/TagSet.cs b/Minio/DataModel/TagSet.cs → Minio/DataModel/Tags/TagSet.cs
@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace Minio.DataModel
+namespace Minio.DataModel.Tags
 {
     [Serializable]
     [XmlRoot(ElementName = "TagSet")]

diff --git a/Minio/DataModel/Tagging.cs → Minio/DataModel/Tags/Tagging.cs b/Minio/DataModel/Tagging.cs → Minio/DataModel/Tags/Tagging.cs
@@ -21,7 +21,7 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace Minio.DataModel
+namespace Minio.DataModel.Tags
 {
     [Serializable]
     [XmlRoot(ElementName = "Tagging")]