From 8f2ded2b3168f3c82030e3adbd62d335e6bcd558 Mon Sep 17 00:00:00 2001
From: Radhakrishna Pemmasani <radha.pemmasani@paysafe.com>
Date: Sat, 10 Apr 2021 13:48:52 +0530
Subject: [PATCH] resolves #341

---
 .../software/amazon/cloudformation/AbstractWrapper.java     | 6 +++---
 .../amazon/cloudformation/proxy/HandlerRequest.java         | 6 +++---
 .../amazon/cloudformation/proxy/ResourceHandlerRequest.java | 6 +++---
 .../cloudformation/proxy/handler/ServiceHandlerWrapper.java | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/software/amazon/cloudformation/AbstractWrapper.java b/src/main/java/software/amazon/cloudformation/AbstractWrapper.java
index f9cbb538..c1297ed1 100644
--- a/src/main/java/software/amazon/cloudformation/AbstractWrapper.java
+++ b/src/main/java/software/amazon/cloudformation/AbstractWrapper.java
@@ -264,9 +264,9 @@ public void processRequest(final InputStream inputStream, final OutputStream out
         if (resourceHandlerRequest != null) {
             resourceHandlerRequest.setPreviousResourceTags(getPreviousResourceTags(request));
             resourceHandlerRequest.setStackId(getStackId(request));
-            resourceHandlerRequest.setSnapshotRequested(request.getSnapshotRequested());
-            resourceHandlerRequest.setRollback(request.getRollback());
-            resourceHandlerRequest.setDriftable(request.getDriftable());
+            resourceHandlerRequest.setSnapshotRequested(request.isSnapshotRequested());
+            resourceHandlerRequest.setRollback(request.isRollback());
+            resourceHandlerRequest.setDriftable(request.isDriftable());
             if (request.getRequestData() != null) {
                 resourceHandlerRequest.setPreviousSystemTags(request.getRequestData().getPreviousSystemTags());
             }
diff --git a/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java b/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java
index 784087f3..cd32de38 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/HandlerRequest.java
@@ -34,8 +34,8 @@ public class HandlerRequest<ResourceT, CallbackT> {
     private RequestData<ResourceT> requestData;
     private String stackId;
     private CallbackT callbackContext;
-    private Boolean snapshotRequested;
-    private Boolean rollback;
-    private Boolean driftable;
+    private boolean snapshotRequested;
+    private boolean rollback;
+    private boolean driftable;
     private RequestContext<CallbackT> requestContext;
 }
diff --git a/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java b/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java
index c5f3f884..906b1f65 100644
--- a/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java
+++ b/src/main/java/software/amazon/cloudformation/proxy/ResourceHandlerRequest.java
@@ -43,9 +43,9 @@ public class ResourceHandlerRequest<T> {
     private String awsPartition;
     private String logicalResourceIdentifier;
     private String nextToken;
-    private Boolean snapshotRequested;
-    private Boolean rollback;
-    private Boolean driftable;
+    private boolean snapshotRequested;
+    private boolean rollback;
+    private boolean driftable;
     private String region;
     private String stackId;
 }
diff --git a/src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java b/src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java
index 7b1661f6..e5d2ee21 100644
--- a/src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java
+++ b/src/test/java/software/amazon/cloudformation/proxy/handler/ServiceHandlerWrapper.java
@@ -82,7 +82,7 @@ protected ResourceHandlerRequest<Model> transform(final HandlerRequest<Model, St
         return ResourceHandlerRequest.<Model>builder().desiredResourceState(desiredResourceState)
             .previousResourceState(previousResourceState).desiredResourceTags(getDesiredResourceTags(request))
             .systemTags(systemTags).logicalResourceIdentifier(request.getRequestData().getLogicalResourceId())
-            .nextToken(request.getNextToken()).snapshotRequested(request.getSnapshotRequested()).build();
+            .nextToken(request.getNextToken()).snapshotRequested(request.isSnapshotRequested()).build();
     }
 
     @Override