From 9af691dec0ff59dcda260d83c03d5b57efafa5be Mon Sep 17 00:00:00 2001
From: Patrick Koenig <pkoenig10@gmail.com>
Date: Wed, 14 Sep 2022 22:11:39 -0700
Subject: [PATCH 1/3] Enable switchBlockAsSingleDecisionPoint

---
 .../resources/checkstyle/checkstyle.xml                       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
index 6803583ad..c0f6b053f 100644
--- a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
+++ b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
@@ -420,7 +420,9 @@
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
-        <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+        <module name="CyclomaticComplexity"> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+                <property name="switchBlockAsSingleDecisionPoint">true</property>
+        </module>
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
             <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
         </module>

From cac1d6e35e82c73f1f2b01913196bfb844703751 Mon Sep 17 00:00:00 2001
From: svc-changelog <svc-changelog@palantir.com>
Date: Thu, 15 Sep 2022 05:13:59 +0000
Subject: [PATCH 2/3] Add generated changelog entries

---
 changelog/@unreleased/pr-2383.v2.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelog/@unreleased/pr-2383.v2.yml

diff --git a/changelog/@unreleased/pr-2383.v2.yml b/changelog/@unreleased/pr-2383.v2.yml
new file mode 100644
index 000000000..16364a842
--- /dev/null
+++ b/changelog/@unreleased/pr-2383.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: The `CyclomaticComplexity` check is now configured with `switchBlockAsSingleDecisionPoint`.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/2383

From b65b89d97c1f9d978aa17daf5892346cc9f36685 Mon Sep 17 00:00:00 2001
From: Patrick Koenig <pkoenig10@gmail.com>
Date: Wed, 14 Sep 2022 22:19:37 -0700
Subject: [PATCH 3/3] Update
 gradle-baseline-java-config/resources/checkstyle/checkstyle.xml

Co-authored-by: David Schlosnagle <davids@palantir.com>
---
 gradle-baseline-java-config/resources/checkstyle/checkstyle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
index c0f6b053f..bc866b495 100644
--- a/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
+++ b/gradle-baseline-java-config/resources/checkstyle/checkstyle.xml
@@ -421,7 +421,7 @@
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
         <module name="CyclomaticComplexity"> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
-                <property name="switchBlockAsSingleDecisionPoint">true</property>
+            <property name="switchBlockAsSingleDecisionPoint">true</property>
         </module>
         <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
             <property name="ignoredAnnotations" value="ParameterizedTest, Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>