From 3889b1e8558157f484dbdad3f73d163a1019ab0c Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vpavic@duck.com>
Date: Tue, 11 Jan 2022 23:19:11 +0100
Subject: [PATCH 1/2] Improve project setup for IntelliJ IDEA

This commit improves project setup for IntelliJ IDEA by adding code
style and inspection profile project files to version control.

See gh-29446
---
 .gitignore                                   |   5 +-
 .idea/codeStyles/Project.xml                 | 121 +++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml         |   5 +
 .idea/inspectionProfiles/Project_Default.xml |   6 +
 4 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml

diff --git a/.gitignore b/.gitignore
index 6edbdcda31..e7a9b8440f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,10 @@
 .classpath
 .factorypath
 .gradle
-.idea
+!.idea/
+.idea/*
+!.idea/codeStyles
+!.idea/inspectionProfiles
 .metadata
 .project
 .recommenders
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000000..fda7def5b9
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,121 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="AUTODETECT_INDENTS" value="false" />
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </value>
+    </option>
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.springframework" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
+    <option name="RIGHT_MARGIN" value="90" />
+    <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
+    <GroovyCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.springframework" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
+        </value>
+      </option>
+    </GroovyCodeStyleSettings>
+    <JavaCodeStyleSettings>
+      <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org.springframework" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
+        </value>
+      </option>
+      <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
+      <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+      <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+      <option name="JD_KEEP_INVALID_TAGS" value="false" />
+      <option name="JD_KEEP_EMPTY_LINES" value="false" />
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="false" />
+        </value>
+      </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="20" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="20" />
+    </JetCodeStyleSettings>
+    <editorconfig>
+      <option name="ENABLED" value="false" />
+    </editorconfig>
+    <codeStyleSettings language="Groovy">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+      <option name="BLANK_LINES_AROUND_FIELD" value="1" />
+      <option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE" value="true" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000000..79ee123c2b
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000000..80a42643de
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="UnqualifiedFieldAccess" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file

From 5663aaa7ec97aab133b709f79665764d961ff2fa Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 24 Jul 2023 14:35:13 +0200
Subject: [PATCH 2/2] Polish "Improve project setup for IntelliJ IDEA"

See gh-29446
---
 .gitignore                                   |   4 -
 .idea/.gitignore                             |  10 ++
 .idea/codeStyles/Project.xml                 |   4 +-
 .idea/copyright/java.xml                     |   6 +
 .idea/copyright/profiles_settings.xml        |   7 +
 .idea/inspectionProfiles/Project_Default.xml |   2 +-
 .idea/scopes/java.xml                        |   3 +
 idea/codeStyleConfig.xml                     | 128 -------------------
 8 files changed, 29 insertions(+), 135 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/copyright/java.xml
 create mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 .idea/scopes/java.xml
 delete mode 100644 idea/codeStyleConfig.xml

diff --git a/.gitignore b/.gitignore
index e7a9b8440f..a5256ecef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,10 +12,6 @@
 .classpath
 .factorypath
 .gradle
-!.idea/
-.idea/*
-!.idea/codeStyles
-!.idea/inspectionProfiles
 .metadata
 .project
 .recommenders
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000..f1e07ef8c3
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,10 @@
+.name
+*.xml
+/modules/
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index fda7def5b9..854b5bf052 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,7 +6,7 @@
         <option name="USE_TAB_CHARACTER" value="true" />
       </value>
     </option>
-    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
     <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
     <option name="IMPORT_LAYOUT_TABLE">
       <value>
@@ -43,7 +43,7 @@
     <JavaCodeStyleSettings>
       <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
       <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500" />
       <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
         <value />
diff --git a/.idea/copyright/java.xml b/.idea/copyright/java.xml
new file mode 100644
index 0000000000..f48ffaf6b6
--- /dev/null
+++ b/.idea/copyright/java.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright 2012-&amp;#36;today.year the original author or authors.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;     https://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="myName" value="java" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000000..d278876c98
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings>
+    <module2copyright>
+      <element module="java" copyright="java" />
+    </module2copyright>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 80a42643de..1ec9e6600d 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,6 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="UnqualifiedFieldAccess" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnqualifiedFieldAccess" enabled="true" level="ERROR" enabled_by_default="true" editorAttributes="ERRORS_ATTRIBUTES" />
   </profile>
 </component>
\ No newline at end of file
diff --git a/.idea/scopes/java.xml b/.idea/scopes/java.xml
new file mode 100644
index 0000000000..a4576baff9
--- /dev/null
+++ b/.idea/scopes/java.xml
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="java" pattern="file:*.java&amp;&amp;!file:*package-info.java" />
+</component>
\ No newline at end of file
diff --git a/idea/codeStyleConfig.xml b/idea/codeStyleConfig.xml
deleted file mode 100644
index 84141ac28f..0000000000
--- a/idea/codeStyleConfig.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<code_scheme name="SpringBoot" version="173">
-	<option name="AUTODETECT_INDENTS" value="false"/>
-	<option name="OTHER_INDENT_OPTIONS">
-		<value>
-			<option name="USE_TAB_CHARACTER" value="true"/>
-		</value>
-	</option>
-	<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50"/>
-	<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500"/>
-	<option name="IMPORT_LAYOUT_TABLE">
-		<value>
-			<package name="java" withSubpackages="true" static="false"/>
-			<emptyLine/>
-			<package name="javax" withSubpackages="true" static="false"/>
-			<emptyLine/>
-			<package name="" withSubpackages="true" static="false"/>
-			<emptyLine/>
-			<package name="org.springframework" withSubpackages="true" static="false"/>
-			<emptyLine/>
-			<package name="" withSubpackages="true" static="true"/>
-		</value>
-	</option>
-	<option name="RIGHT_MARGIN" value="90"/>
-	<option name="ENABLE_JAVADOC_FORMATTING" value="false"/>
-	<option name="JD_ALIGN_PARAM_COMMENTS" value="false"/>
-	<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false"/>
-	<option name="JD_KEEP_EMPTY_LINES" value="false"/>
-	<GroovyCodeStyleSettings>
-		<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500"/>
-		<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500"/>
-		<option name="IMPORT_LAYOUT_TABLE">
-			<value>
-				<emptyLine/>
-				<package name="javax" withSubpackages="true" static="false"/>
-				<package name="java" withSubpackages="true" static="false"/>
-				<emptyLine/>
-				<package name="" withSubpackages="true" static="false"/>
-				<emptyLine/>
-				<package name="org.springframework" withSubpackages="true"
-						 static="false"/>
-				<emptyLine/>
-				<package name="" withSubpackages="true" static="true"/>
-			</value>
-		</option>
-	</GroovyCodeStyleSettings>
-	<JavaCodeStyleSettings>
-		<option name="CLASS_NAMES_IN_JAVADOC" value="3"/>
-		<option name="INSERT_INNER_CLASS_IMPORTS" value="true"/>
-		<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50"/>
-		<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="500"/>
-		<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-			<value/>
-		</option>
-		<option name="IMPORT_LAYOUT_TABLE">
-			<value>
-				<package name="java" withSubpackages="true" static="false"/>
-				<emptyLine/>
-				<package name="javax" withSubpackages="true" static="false"/>
-				<emptyLine/>
-				<package name="" withSubpackages="true" static="false"/>
-				<emptyLine/>
-				<package name="org.springframework" withSubpackages="true"
-						 static="false"/>
-				<emptyLine/>
-				<package name="" withSubpackages="true" static="true"/>
-			</value>
-		</option>
-		<option name="ENABLE_JAVADOC_FORMATTING" value="false"/>
-		<option name="JD_ALIGN_PARAM_COMMENTS" value="false"/>
-		<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false"/>
-		<option name="JD_KEEP_INVALID_TAGS" value="false"/>
-		<option name="JD_KEEP_EMPTY_LINES" value="false"/>
-	</JavaCodeStyleSettings>
-	<JetCodeStyleSettings>
-		<option name="PACKAGES_TO_USE_STAR_IMPORTS">
-			<value>
-				<package name="java.util" withSubpackages="false" static="false"/>
-				<package name="kotlinx.android.synthetic" withSubpackages="false"
-						 static="false"/>
-			</value>
-		</option>
-		<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="20"/>
-		<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="20"/>
-	</JetCodeStyleSettings>
-	<XML>
-		<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true"/>
-	</XML>
-	<editorconfig>
-		<option name="ENABLED" value="false"/>
-	</editorconfig>
-	<codeStyleSettings language="Groovy">
-		<indentOptions>
-			<option name="USE_TAB_CHARACTER" value="true"/>
-		</indentOptions>
-	</codeStyleSettings>
-	<codeStyleSettings language="JAVA">
-		<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1"/>
-		<option name="BLANK_LINES_AROUND_FIELD" value="1"/>
-		<option name="BLANK_LINES_AROUND_FIELD_IN_INTERFACE" value="1"/>
-		<option name="ELSE_ON_NEW_LINE" value="true"/>
-		<option name="CATCH_ON_NEW_LINE" value="true"/>
-		<option name="FINALLY_ON_NEW_LINE" value="true"/>
-		<option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
-		<option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true"/>
-		<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true"/>
-		<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
-		<option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true"/>
-		<option name="KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE" value="true"/>
-		<indentOptions>
-			<option name="USE_TAB_CHARACTER" value="true"/>
-		</indentOptions>
-	</codeStyleSettings>
-	<codeStyleSettings language="JSON">
-		<indentOptions>
-			<option name="TAB_SIZE" value="2"/>
-		</indentOptions>
-	</codeStyleSettings>
-	<codeStyleSettings language="XML">
-		<indentOptions>
-			<option name="USE_TAB_CHARACTER" value="true"/>
-		</indentOptions>
-	</codeStyleSettings>
-	<codeStyleSettings language="kotlin">
-		<indentOptions>
-			<option name="USE_TAB_CHARACTER" value="true"/>
-		</indentOptions>
-	</codeStyleSettings>
-</code_scheme>