Update wrapper and scenario.

Author: rlhagerm

…etv4/DynamoDB/Actions/DynamoDbMethods.cs …etv4/DynamoDB/Actions/DynamoDbWrapper.csdotnetv4/DynamoDB/Actions/DynamoDbMethods.cs renamed to dotnetv4/DynamoDB/Actions/DynamoDbWrapper.cs dotnetv4/DynamoDB/Actions/DynamoDbMethods.cs renamed to dotnetv4/DynamoDB/Actions/DynamoDbWrapper.cs

@@ -9,8 +9,21 @@
 
 namespace DynamoDBActions;
 
-public class DynamoDbMethods
+/// <summary>
+/// Methods of this class perform Amazon DynamoDB operations.
+/// </summary>
+public class DynamoDbWrapper
 {
+    private readonly IAmazonDynamoDB _amazonDynamoDB;
+
+    /// <summary>
+    /// Constructor for the DynamoDbWrapper class.
+    /// </summary>
+    /// <param name="amazonDynamoDB">The injected DynamoDB client.</param>
+    public DynamoDbWrapper(IAmazonDynamoDB amazonDynamoDB)
+    {
+        _amazonDynamoDB = amazonDynamoDB;
+    }
     // snippet-start:[DynamoDB.dotnetv4.dynamodb-basics.CreateTable]
 
     /// <summary>
@@ -20,11 +33,11 @@ public class DynamoDbMethods
     /// <param name="client">An initialized Amazon DynamoDB client object.</param>
     /// <param name="tableName">The name of the table to create.</param>
     /// <returns>A Boolean value indicating the success of the operation.</returns>
-    public static async Task<bool> CreateMovieTableAsync(AmazonDynamoDBClient client, string tableName)
+    public async Task<bool> CreateMovieTableAsync(string tableName)
     {
         try
         {
-            var response = await client.CreateTableAsync(new CreateTableRequest
+            var response = await _amazonDynamoDB.CreateTableAsync(new CreateTableRequest
             {
                 TableName = tableName,
                 AttributeDefinitions = new List<AttributeDefinition>()
@@ -72,7 +85,7 @@ public static async Task<bool> CreateMovieTableAsync(AmazonDynamoDBClient client
             {
                 Thread.Sleep(sleepDuration);
 
-                var describeTableResponse = await client.DescribeTableAsync(request);
+                var describeTableResponse = await _amazonDynamoDB.DescribeTableAsync(request);
                 status = describeTableResponse.Table.TableStatus;
 
                 Console.Write(".");
@@ -110,7 +123,7 @@ public static async Task<bool> CreateMovieTableAsync(AmazonDynamoDBClient client
     /// the movie to add to the table.</param>
     /// <param name="tableName">The name of the table where the item will be added.</param>
     /// <returns>A Boolean value that indicates the results of adding the item.</returns>
-    public static async Task<bool> PutItemAsync(AmazonDynamoDBClient client, Movie newMovie, string tableName)
+    public async Task<bool> PutItemAsync(Movie newMovie, string tableName)
     {
         try
         {
@@ -126,7 +139,7 @@ public static async Task<bool> PutItemAsync(AmazonDynamoDBClient client, Movie n
                 Item = item,
             };
 
-            await client.PutItemAsync(request);
+            await _amazonDynamoDB.PutItemAsync(request);
             return true;
         }
         catch (ResourceNotFoundException ex)
@@ -160,8 +173,7 @@ public static async Task<bool> PutItemAsync(AmazonDynamoDBClient client, Movie n
     /// information that will be changed.</param>
     /// <param name="tableName">The name of the table that contains the movie.</param>
     /// <returns>A Boolean value that indicates the success of the operation.</returns>
-    public static async Task<bool> UpdateItemAsync(
-        AmazonDynamoDBClient client,
+    public async Task<bool> UpdateItemAsync(
         Movie newMovie,
         MovieInfo newInfo,
         string tableName)
@@ -195,7 +207,7 @@ public static async Task<bool> UpdateItemAsync(
                 TableName = tableName,
             };
 
-            await client.UpdateItemAsync(request);
+            await _amazonDynamoDB.UpdateItemAsync(request);
             return true;
         }
         catch (ResourceNotFoundException ex)
@@ -228,7 +240,7 @@ public static async Task<bool> UpdateItemAsync(
     /// <param name="tableName">The name of the table containing the movie.</param>
     /// <returns>A Dictionary object containing information about the item
     /// retrieved.</returns>
-    public static async Task<Dictionary<string, AttributeValue>> GetItemAsync(AmazonDynamoDBClient client, Movie newMovie, string tableName)
+    public async Task<Dictionary<string, AttributeValue>> GetItemAsync(Movie newMovie, string tableName)
     {
         try
         {
@@ -244,7 +256,7 @@ public static async Task<Dictionary<string, AttributeValue>> GetItemAsync(Amazon
                 TableName = tableName,
             };
 
-            var response = await client.GetItemAsync(request);
+            var response = await _amazonDynamoDB.GetItemAsync(request);
             return response.Item;
         }
         catch (ResourceNotFoundException ex)
@@ -274,7 +286,7 @@ public static async Task<Dictionary<string, AttributeValue>> GetItemAsync(Amazon
     /// </summary>
     /// <param name="movieFileName">The full path to the JSON file.</param>
     /// <returns>A generic list of movie objects.</returns>
-    public static List<Movie> ImportMovies(string movieFileName)
+    public List<Movie> ImportMovies(string movieFileName)
     {
         var moviesList = new List<Movie>();
         if (!File.Exists(movieFileName))
@@ -307,8 +319,7 @@ public static List<Movie> ImportMovies(string movieFileName)
     /// the JSON file containing movie data.</param>
     /// <returns>A long integer value representing the number of movies
     /// imported from the JSON file.</returns>
-    public static async Task<long> BatchWriteItemsAsync(
-        AmazonDynamoDBClient client,
+    public async Task<long> BatchWriteItemsAsync(
         string movieFileName, string tableName)
     {
         try
@@ -322,7 +333,7 @@ public static async Task<long> BatchWriteItemsAsync(
 
             var context = new DynamoDBContextBuilder()
                 // Optional call to provide a specific instance of IAmazonDynamoDB
-                .WithDynamoDBClient(() => client)
+                .WithDynamoDBClient(() => _amazonDynamoDB)
                 .Build();
 
             var movieBatch = context.CreateBatchWrite<Movie>(
@@ -368,8 +379,7 @@ public static async Task<long> BatchWriteItemsAsync(
     /// year of the movie to delete.</param>
     /// <returns>A Boolean value indicating the success or failure of the
     /// delete operation.</returns>
-    public static async Task<bool> DeleteItemAsync(
-        AmazonDynamoDBClient client,
+    public async Task<bool> DeleteItemAsync(
         string tableName,
         Movie movieToDelete)
     {
@@ -383,7 +393,7 @@ public static async Task<bool> DeleteItemAsync(
 
             var request = new DeleteItemRequest { TableName = tableName, Key = key, };
 
-            await client.DeleteItemAsync(request);
+            await _amazonDynamoDB.DeleteItemAsync(request);
             return true;
         }
         catch (ResourceNotFoundException ex)
@@ -416,11 +426,11 @@ public static async Task<bool> DeleteItemAsync(
     /// <param name="year">The release year for which we want to
     /// view movies.</param>
     /// <returns>The number of movies that match the query.</returns>
-    public static async Task<int> QueryMoviesAsync(AmazonDynamoDBClient client, string tableName, int year)
+    public async Task<int> QueryMoviesAsync(string tableName, int year)
     {
         try
         {
-            var movieTable = new TableBuilder(client, tableName)
+            var movieTable = new TableBuilder(_amazonDynamoDB, tableName)
                 .AddHashKey("year", DynamoDBEntryType.Numeric)
                 .AddRangeKey("title", DynamoDBEntryType.String)
                 .Build();
@@ -481,8 +491,7 @@ public static async Task<int> QueryMoviesAsync(AmazonDynamoDBClient client, stri
     // snippet-end:[DynamoDB.dotnetv4.dynamodb-basics.QueryItems]
 
     // snippet-start:[DynamoDB.dotnetv4.dynamodb-basics.ScanTable]
-    public static async Task<int> ScanTableAsync(
-        AmazonDynamoDBClient client,
+    public async Task<int> ScanTableAsync(
         string tableName,
         int startYear,
         int endYear)
@@ -512,7 +521,7 @@ public static async Task<int> ScanTableAsync(
             var response = new ScanResponse();
             do
             {
-                response = await client.ScanAsync(request);
+                response = await _amazonDynamoDB.ScanAsync(request);
                 foundCount += response.Items.Count;
                 response.Items.ForEach(i => DisplayItem(i));
                 request.ExclusiveStartKey = response.LastEvaluatedKey;
@@ -540,7 +549,7 @@ public static async Task<int> ScanTableAsync(
     // snippet-end:[DynamoDB.dotnetv4.dynamodb-basics.ScanTable]
 
     // snippet-start:[DynamoDB.dotnetv4.dynamodb-basics.DeleteTableExample]
-    public static async Task<bool> DeleteTableAsync(AmazonDynamoDBClient client, string tableName)
+    public async Task<bool> DeleteTableAsync(string tableName)
     {
         try
         {
@@ -549,7 +558,7 @@ public static async Task<bool> DeleteTableAsync(AmazonDynamoDBClient client, str
                 TableName = tableName,
             };
 
-            var response = await client.DeleteTableAsync(request);
+            var response = await _amazonDynamoDB.DeleteTableAsync(request);
 
             Console.WriteLine($"Table {response.TableDescription.TableName} successfully deleted.");
             return true;
@@ -578,7 +587,7 @@ public static async Task<bool> DeleteTableAsync(AmazonDynamoDBClient client, str
     /// Displays a DynamoDB document on the console.
     /// </summary>
     /// <param name="document">The DynamoDB document to display.</param>
-    public static void DisplayDocument(Document document)
+    public void DisplayDocument(Document document)
     {
         Console.WriteLine($"{document["year"]}\t{document["title"]}");
     }
@@ -587,7 +596,7 @@ public static void DisplayDocument(Document document)
     /// Displays a DynamoDB item on the console.
     /// </summary>
     /// <param name="item">The DynamoDB item to display.</param>
-    public static void DisplayItem(Dictionary<string, AttributeValue> item)
+    public void DisplayItem(Dictionary<string, AttributeValue> item)
     {
         Console.WriteLine($"{item["year"].N}\t{item["title"].S}");
     }

dotnetv4/DynamoDB/Scenarios/DynamoDB_Basics/Basics.csproj

@@ -9,6 +9,8 @@
   <ItemGroup>
     <PackageReference Include="AWSSDK.Core" Version="4.0.0.14" />
     <PackageReference Include="AWSSDK.DynamoDBv2" Version="4.0.2.1" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.0-preview.4" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>

…arios/DynamoDB_Basics/DynamoDB_Basics.cs …narios/DynamoDB_Basics/DynamoDbBasics.csdotnetv4/DynamoDB/Scenarios/DynamoDB_Basics/DynamoDB_Basics.cs renamed to dotnetv4/DynamoDB/Scenarios/DynamoDB_Basics/DynamoDbBasics.cs dotnetv4/DynamoDB/Scenarios/DynamoDB_Basics/DynamoDB_Basics.cs renamed to dotnetv4/DynamoDB/Scenarios/DynamoDB_Basics/DynamoDbBasics.cs

@@ -3,6 +3,7 @@
 
 using Amazon.DynamoDBv2;
 using DynamoDBActions;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Basics;
 
@@ -20,14 +21,24 @@ namespace Basics;
 //     Scan
 //     DeleteItemAsync
 
-public class DynamoDB_Basics
+public class DynamoDbBasics
 {
     // Separator for the console display.
     private static readonly string SepBar = new string('-', 80);
+    public static bool isInteractive = true;
 
-    public static async Task Main()
+    public static async Task Main(string[] args)
     {
-        var client = new AmazonDynamoDBClient();
+        // Set up dependency injection for Amazon DynamoDB.
+        using var host = Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder(args)
+            .ConfigureServices((_, services) =>
+                services.AddAWSService<IAmazonDynamoDB>()
+                    .AddTransient<DynamoDbWrapper>()
+            )
+            .Build();
+
+        // Now the wrapper is available for injection.
+        var dynamoDbWrapper = host.Services.GetRequiredService<DynamoDbWrapper>();
 
         var tableName = "movie_table4";
 
@@ -38,7 +49,7 @@ public static async Task Main()
         // Create a new table and wait for it to be active.
         Console.WriteLine($"Creating the new table: {tableName}");
 
-        var success = await DynamoDbMethods.CreateMovieTableAsync(client, tableName);
+        var success = await dynamoDbWrapper.CreateMovieTableAsync(tableName);
 
         Console.WriteLine(success
             ? $"\nTable: {tableName} successfully created."
@@ -53,7 +64,7 @@ public static async Task Main()
             Title = "Spider-Man: No Way Home",
         };
 
-        success = await DynamoDbMethods.PutItemAsync(client, newMovie, tableName);
+        success = await dynamoDbWrapper.PutItemAsync(newMovie, tableName);
         if (success)
         {
             Console.WriteLine($"Added {newMovie.Title} to the table.");
@@ -75,7 +86,7 @@ public static async Task Main()
             Rank = 9,
         };
 
-        success = await DynamoDbMethods.UpdateItemAsync(client, newMovie, newInfo, tableName);
+        success = await dynamoDbWrapper.UpdateItemAsync(newMovie, newInfo, tableName);
         if (success)
         {
             Console.WriteLine($"Successfully updated the movie: {newMovie.Title}");
@@ -89,7 +100,7 @@ public static async Task Main()
 
         // Add a batch of movies to the DynamoDB table from a list of
         // movies in a JSON file.
-        var itemCount = await DynamoDbMethods.BatchWriteItemsAsync(client, movieFileName, tableName);
+        var itemCount = await dynamoDbWrapper.BatchWriteItemsAsync(movieFileName, tableName);
         Console.WriteLine($"Added {itemCount} movies to the table.");
 
         WaitForEnter();
@@ -102,10 +113,10 @@ public static async Task Main()
         };
 
         Console.WriteLine("Looking for the movie \"Jurassic Park\".");
-        var item = await DynamoDbMethods.GetItemAsync(client, lookupMovie, tableName);
+        var item = await dynamoDbWrapper.GetItemAsync(lookupMovie, tableName);
         if (item?.Count > 0)
         {
-            DynamoDbMethods.DisplayItem(item);
+            dynamoDbWrapper.DisplayItem(item);
         }
         else
         {
@@ -121,7 +132,7 @@ public static async Task Main()
             Year = 2010,
         };
 
-        success = await DynamoDbMethods.DeleteItemAsync(client, tableName, movieToDelete);
+        success = await dynamoDbWrapper.DeleteItemAsync(tableName, movieToDelete);
 
         if (success)
         {
@@ -137,21 +148,21 @@ public static async Task Main()
         // Use Query to find all the movies released in 2010.
         int findYear = 2010;
         Console.WriteLine($"Movies released in {findYear}");
-        var queryCount = await DynamoDbMethods.QueryMoviesAsync(client, tableName, findYear);
+        var queryCount = await dynamoDbWrapper.QueryMoviesAsync(tableName, findYear);
         Console.WriteLine($"Found {queryCount} movies released in {findYear}");
 
         WaitForEnter();
 
         // Use Scan to get a list of movies from 2001 to 2011.
         int startYear = 2001;
         int endYear = 2011;
-        var scanCount = await DynamoDbMethods.ScanTableAsync(client, tableName, startYear, endYear);
+        var scanCount = await dynamoDbWrapper.ScanTableAsync(tableName, startYear, endYear);
         Console.WriteLine($"Found {scanCount} movies released between {startYear} and {endYear}");
 
         WaitForEnter();
 
         // Delete the table.
-        success = await DynamoDbMethods.DeleteTableAsync(client, tableName);
+        success = await dynamoDbWrapper.DeleteTableAsync(tableName);
 
         if (success)
         {
@@ -197,9 +208,12 @@ private static void DisplayInstructions()
     /// </summary>
     private static void WaitForEnter()
     {
-        Console.WriteLine("\nPress <Enter> to continue.");
-        Console.WriteLine(SepBar);
-        _ = Console.ReadLine();
+        if (isInteractive)
+        {
+            Console.WriteLine("\nPress <Enter> to continue.");
+            Console.WriteLine(SepBar);
+            _ = Console.ReadLine();
+        }
     }
 }