Merge branch 'main' into dependabot/maven/commons-io-commons-io-2.16.1

databricks · Nov 6, 2024 · ce8dda1 · ce8dda1
2 parents 78cce9c + f04f6cb
commit ce8dda1
Show file tree

Hide file tree

Showing 1,312 changed files with 46,700 additions and 5,754 deletions.
diff --git a/.codegen.json b/.codegen.json
@@ -1,34 +1,17 @@
 {
-  "formatter": "mvn spotless:apply",
-  "template_libraries": [
-    ".codegen/lib.tmpl"
-  ],
-  "types": {
-    ".codegen/model.java.tmpl": "databricks-sdk-java/src/main/java/com/databricks/sdk/service/{{.Package.Name}}/{{.PascalName}}.java"
-  },
-  "services": {
-    ".codegen/interface.java.tmpl": "databricks-sdk-java/src/main/java/com/databricks/sdk/service/{{.Package.Name}}/{{.PascalName}}Service.java",
-    ".codegen/api.java.tmpl": "databricks-sdk-java/src/main/java/com/databricks/sdk/service/{{.Package.Name}}/{{.PascalName}}API.java",
-    ".codegen/impl.java.tmpl": "databricks-sdk-java/src/main/java/com/databricks/sdk/service/{{.Package.Name}}/{{.PascalName}}Impl.java"
-  },
-  "exception_types": {
-    ".codegen/exception.java.tmpl": "databricks-sdk-java/src/main/java/com/databricks/sdk/core/error/platform/{{.PascalName}}.java"
-  },
-  "batch": {
-    ".codegen/workspace.java.tmpl": "databricks-sdk-java/src/main/java/com/databricks/sdk/WorkspaceClient.java",
-    ".codegen/account.java.tmpl": "databricks-sdk-java/src/main/java/com/databricks/sdk/AccountClient.java",
-    ".codegen/error-mapper.java.tmpl": "databricks-sdk-java/src/main/java/com/databricks/sdk/core/error/ErrorMapper.java"
-  },
+  "mode": "java_v0",
+  "changelog_config": ".codegen/changelog_config.yml",
   "version": {
     "pom.xml": "<artifactId>databricks-sdk-parent</artifactId>\n  <version>$VERSION</version>",
     "databricks-sdk-java/pom.xml": "<artifactId>databricks-sdk-parent</artifactId>\n    <version>$VERSION</version>",
     "databricks-sdk-java/src/main/java/com/databricks/sdk/core/UserAgent.java": "private static final String version = \"$VERSION\";",
     "examples/docs/pom.xml": "<artifactId>databricks-sdk-java</artifactId>\n      <version>$VERSION</version>",
-    "examples/spring-boot-oauth-u2m-demo/pom.xml": "<artifactId>databricks-sdk-java</artifactId>\n      <version>$VERSION</version>"
+    "examples/spring-boot-oauth-u2m-demo/pom.xml": "<artifactId>databricks-sdk-java</artifactId>\n      <version>$VERSION</version>",
+    "shaded/pom.xml": "<properties>\n    <sdk.version>$VERSION</sdk.version>"
   },
   "toolchain": {
     "require": ["mvn", "java"],
     "setup": ["rm -rf databricks-sdk-java/src/main/java/com/databricks/sdk/service"],
-    "post_generate": ["mvn --errors clean test"]
+    "post_generate": ["mvn spotless:apply","mvn --errors clean test"]
   }
 }
diff --git a/.codegen/_openapi_sha b/.codegen/_openapi_sha
@@ -1 +1 @@
-d38528c3e47dd81c9bdbd918272a3e49d36e09ce
+cf9c61453990df0f9453670f2fe68e1b128647a2
diff --git a/.codegen/account.java.tmpl b/.codegen/account.java.tmpl
diff --git a/.codegen/api.java.tmpl b/.codegen/api.java.tmpl
diff --git a/.codegen/changelog.md.tmpl b/.codegen/changelog.md.tmpl
@@ -1,13 +1,17 @@
 # Version changelog
 
 ## {{.Version}}
+{{- range .GroupChanges}}
 
-{{range .Changes -}}
+### {{.Type.Message}}
+{{range .Changes}}
  * {{.}}.
-{{end}}{{- if .ApiChanges}}
-API Changes:
-{{range .ApiChanges}}
- * {{.Action}} {{template "what" .}}{{if .Extra}} {{.Extra}}{{with .Other}} {{template "what" .}}{{end}}{{end}}.
+{{- end}}
+{{end}}
+{{if .ApiChanges}}
+### API Changes:
+{{range .ApiChanges.GroupDiff}}
+ * {{.Action}} {{template "group-what" .}}{{if .Extra}} {{.Extra}}{{with .Other}} {{template "other-what" .}}{{end}}{{end}}.
 {{- end}}
 
 OpenAPI SHA: {{.Sha}}, Date: {{.Changed}}
@@ -21,7 +25,35 @@ Dependency updates:
 
 ## {{.PrevVersion}}
 
-{{- define "what" -}}
+{{- define "group-what" -}}
+{{if gt (len .Changes) 1 -}} {{template "single-what" .Changes.First}}{{end -}}
+{{range .Changes.Middle -}}, {{template "single-what" .}}{{end -}}
+{{if gt (len .Changes) 1}} and {{end}}{{template "single-what" .Changes.Last}}{{template "suffix-what" .}}
+{{- end -}}
+
+{{- define "single-what" -}}
+    {{if eq .X "package" -}}
+        `com.databricks.sdk.service.{{.Package.Name}}`
+    {{- else if eq .X "service" -}}
+        {{template "service" .Service}}
+    {{- else if eq .X "method" -}}
+        `{{.Method.CamelName}}()`
+    {{- else if eq .X "entity" -}}
+        {{template "entity" .Entity}}
+    {{- else if eq .X "field" -}}
+        `{{.Field.CamelName}}`
+    {{- end}}
+{{- end -}}
+
+{{- define "suffix-what" -}}
+    {{if eq .Type "package" }} package{{if gt (len .Changes) 1}}s{{end}}
+    {{- else if eq .Type "method" }} method{{if gt (len .Changes) 1}}s{{end}} for {{template "service" .Parent.Service}}
+    {{- else if eq .Type "entity" }} class{{if gt (len .Changes) 1}}es{{end}}
+    {{- else if eq .Type "field" }} field{{if gt (len .Changes) 1}}s{{end}} for {{template "entity" .Parent.Entity}}
+    {{- end}}
+{{- end -}}
+
+{{- define "other-what" -}}
     {{if eq .X "package" -}}
         `com.databricks.sdk.service.{{.Package.Name}}` package
     {{- else if eq .X "service" -}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d38528c3e47dd81c9bdbd918272a3e49d36e09ce
		cf9c61453990df0f9453670f2fe68e1b128647a2