From a824b3a9a85ae54cd0e8d9fea0853232e4e7eaea Mon Sep 17 00:00:00 2001 From: Viktor Kirst Date: Wed, 2 Sep 2026 12:38:27 +0400 Subject: [PATCH 1/3] dbeaver/pro#10296 Add gateway protocol API module --- .../META-INF/MANIFEST.MF | 12 +++++++ .../build.properties | 4 +++ apis/com.dbeaver.datadam.gateway.api/pom.xml | 21 ++++++++++++ .../gateway/model/DDConfiguration.java | 32 +++++++++++++++++++ .../gateway/model/DDConfigurationPart.java | 29 +++++++++++++++++ .../model/DDConfigurationPartKind.java | 22 +++++++++++++ .../gateway/model/DDConfigurationSummary.java | 29 +++++++++++++++++ .../DDCreateConfigurationPartRequest.java | 28 ++++++++++++++++ .../model/DDCreateConfigurationRequest.java | 27 ++++++++++++++++ .../DDUpdateConfigurationPartRequest.java | 26 +++++++++++++++ .../model/DDUpdateConfigurationRequest.java | 27 ++++++++++++++++ .../model/DDUpdateConfigurationResult.java | 27 ++++++++++++++++ apis/pom.xml | 1 + 13 files changed, 285 insertions(+) create mode 100644 apis/com.dbeaver.datadam.gateway.api/META-INF/MANIFEST.MF create mode 100644 apis/com.dbeaver.datadam.gateway.api/build.properties create mode 100644 apis/com.dbeaver.datadam.gateway.api/pom.xml create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfiguration.java create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPart.java create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPartKind.java create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationSummary.java create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationPartRequest.java create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationRequest.java create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationPartRequest.java create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationRequest.java create mode 100644 apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationResult.java diff --git a/apis/com.dbeaver.datadam.gateway.api/META-INF/MANIFEST.MF b/apis/com.dbeaver.datadam.gateway.api/META-INF/MANIFEST.MF new file mode 100644 index 0000000..f627edd --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/META-INF/MANIFEST.MF @@ -0,0 +1,12 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Vendor: DBeaver Corp +Bundle-Name: DataDam Gateway Protocol API +Bundle-SymbolicName: com.dbeaver.datadam.gateway.api +Bundle-Version: 0.0.17.qualifier +Bundle-Release-Date: 20260901 +Bundle-RequiredExecutionEnvironment: JavaSE-21 +Export-Package: com.dbeaver.datadam.gateway.model +Bundle-ActivationPolicy: lazy +Require-Bundle: org.jkiss.utils +Automatic-Module-Name: com.dbeaver.datadam.gateway.api diff --git a/apis/com.dbeaver.datadam.gateway.api/build.properties b/apis/com.dbeaver.datadam.gateway.api/build.properties new file mode 100644 index 0000000..e5d65d5 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/build.properties @@ -0,0 +1,4 @@ +source.. = src/main/java +output.. = target/classes/ +bin.includes = .,\ + META-INF/ diff --git a/apis/com.dbeaver.datadam.gateway.api/pom.xml b/apis/com.dbeaver.datadam.gateway.api/pom.xml new file mode 100644 index 0000000..7d91543 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + com.dbeaver.datadam + dm-api + 0.0.17-SNAPSHOT + ../pom.xml + + + com.dbeaver.datadam.gateway.api + eclipse-plugin + DataDam Gateway Protocol API + + + ${project.basedir}/src/main/java + + + diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfiguration.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfiguration.java new file mode 100644 index 0000000..8d1bcfc --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfiguration.java @@ -0,0 +1,32 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +import org.jkiss.code.NotNull; +import org.jkiss.code.Nullable; + +import java.util.List; + +public record DDConfiguration( + @NotNull String configurationId, + @NotNull String name, + long version, + @NotNull String createdAt, + @Nullable String lastSyncAt, + @NotNull List parts +) { +} diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPart.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPart.java new file mode 100644 index 0000000..3547265 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPart.java @@ -0,0 +1,29 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +import org.jkiss.code.NotNull; +import org.jkiss.code.Nullable; + +public record DDConfigurationPart( + @NotNull String key, + @NotNull DDConfigurationPartKind kind, + @Nullable String projectId, + long version, + @NotNull String encryptedValue +) { +} diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPartKind.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPartKind.java new file mode 100644 index 0000000..eaf1cb7 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPartKind.java @@ -0,0 +1,22 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +public enum DDConfigurationPartKind { + ACCOUNT, + PROJECT +} diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationSummary.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationSummary.java new file mode 100644 index 0000000..26d5593 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationSummary.java @@ -0,0 +1,29 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +import org.jkiss.code.NotNull; +import org.jkiss.code.Nullable; + +public record DDConfigurationSummary( + @NotNull String configurationId, + @NotNull String name, + long version, + @NotNull String createdAt, + @Nullable String lastSyncAt +) { +} diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationPartRequest.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationPartRequest.java new file mode 100644 index 0000000..c83ee15 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationPartRequest.java @@ -0,0 +1,28 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +import org.jkiss.code.NotNull; +import org.jkiss.code.Nullable; + +public record DDCreateConfigurationPartRequest( + @NotNull String key, + @NotNull DDConfigurationPartKind kind, + @Nullable String projectId, + @NotNull String encryptedValue +) { +} diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationRequest.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationRequest.java new file mode 100644 index 0000000..965f873 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationRequest.java @@ -0,0 +1,27 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +import org.jkiss.code.NotNull; + +import java.util.List; + +public record DDCreateConfigurationRequest( + @NotNull String name, + @NotNull List parts +) { +} diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationPartRequest.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationPartRequest.java new file mode 100644 index 0000000..1fed939 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationPartRequest.java @@ -0,0 +1,26 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +import org.jkiss.code.NotNull; + +public record DDUpdateConfigurationPartRequest( + @NotNull String key, + long expectedVersion, + @NotNull String encryptedValue +) { +} diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationRequest.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationRequest.java new file mode 100644 index 0000000..48b6a87 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationRequest.java @@ -0,0 +1,27 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +import org.jkiss.code.NotNull; + +import java.util.List; + +public record DDUpdateConfigurationRequest( + long expectedConfigurationVersion, + @NotNull List parts +) { +} diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationResult.java b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationResult.java new file mode 100644 index 0000000..2c52e49 --- /dev/null +++ b/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationResult.java @@ -0,0 +1,27 @@ +/* + * DBeaver - Universal Database Manager + * Copyright (C) 2010-2026 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.dbeaver.datadam.gateway.model; + +import org.jkiss.code.NotNull; + +import java.util.List; + +public record DDUpdateConfigurationResult( + @NotNull DDConfiguration configuration, + @NotNull List conflictingKeys +) { +} diff --git a/apis/pom.xml b/apis/pom.xml index 9a3962f..7e5b770 100644 --- a/apis/pom.xml +++ b/apis/pom.xml @@ -20,6 +20,7 @@ com.dbeaver.datadam.dm.api + com.dbeaver.datadam.gateway.api From 7b5159b4e64578a1886ec691aa3b331c93b74dd0 Mon Sep 17 00:00:00 2001 From: Viktor Kirst Date: Wed, 9 Sep 2026 12:16:45 +0400 Subject: [PATCH 2/3] dbeaver/pro#10296 Move configuration API into share.api --- .../META-INF/MANIFEST.MF | 12 ----------- .../build.properties | 4 ---- apis/com.dbeaver.datadam.gateway.api/pom.xml | 21 ------------------- .../share/api}/model/DDConfiguration.java | 2 +- .../share/api}/model/DDConfigurationPart.java | 2 +- .../api}/model/DDConfigurationPartKind.java | 2 +- .../api}/model/DDConfigurationSummary.java | 2 +- .../DDCreateConfigurationPartRequest.java | 2 +- .../model/DDCreateConfigurationRequest.java | 2 +- .../DDUpdateConfigurationPartRequest.java | 2 +- .../model/DDUpdateConfigurationRequest.java | 2 +- .../model/DDUpdateConfigurationResult.java | 2 +- 12 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 apis/com.dbeaver.datadam.gateway.api/META-INF/MANIFEST.MF delete mode 100644 apis/com.dbeaver.datadam.gateway.api/build.properties delete mode 100644 apis/com.dbeaver.datadam.gateway.api/pom.xml rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDConfiguration.java (95%) rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDConfigurationPart.java (95%) rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDConfigurationPartKind.java (94%) rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDConfigurationSummary.java (95%) rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDCreateConfigurationPartRequest.java (95%) rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDCreateConfigurationRequest.java (94%) rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDUpdateConfigurationPartRequest.java (94%) rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDUpdateConfigurationRequest.java (95%) rename apis/{com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway => com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api}/model/DDUpdateConfigurationResult.java (94%) diff --git a/apis/com.dbeaver.datadam.gateway.api/META-INF/MANIFEST.MF b/apis/com.dbeaver.datadam.gateway.api/META-INF/MANIFEST.MF deleted file mode 100644 index f627edd..0000000 --- a/apis/com.dbeaver.datadam.gateway.api/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Vendor: DBeaver Corp -Bundle-Name: DataDam Gateway Protocol API -Bundle-SymbolicName: com.dbeaver.datadam.gateway.api -Bundle-Version: 0.0.17.qualifier -Bundle-Release-Date: 20260901 -Bundle-RequiredExecutionEnvironment: JavaSE-21 -Export-Package: com.dbeaver.datadam.gateway.model -Bundle-ActivationPolicy: lazy -Require-Bundle: org.jkiss.utils -Automatic-Module-Name: com.dbeaver.datadam.gateway.api diff --git a/apis/com.dbeaver.datadam.gateway.api/build.properties b/apis/com.dbeaver.datadam.gateway.api/build.properties deleted file mode 100644 index e5d65d5..0000000 --- a/apis/com.dbeaver.datadam.gateway.api/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/main/java -output.. = target/classes/ -bin.includes = .,\ - META-INF/ diff --git a/apis/com.dbeaver.datadam.gateway.api/pom.xml b/apis/com.dbeaver.datadam.gateway.api/pom.xml deleted file mode 100644 index 7d91543..0000000 --- a/apis/com.dbeaver.datadam.gateway.api/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - com.dbeaver.datadam - dm-api - 0.0.17-SNAPSHOT - ../pom.xml - - - com.dbeaver.datadam.gateway.api - eclipse-plugin - DataDam Gateway Protocol API - - - ${project.basedir}/src/main/java - - - diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfiguration.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfiguration.java similarity index 95% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfiguration.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfiguration.java index 8d1bcfc..b30de48 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfiguration.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfiguration.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPart.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPart.java similarity index 95% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPart.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPart.java index 3547265..922be4e 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPart.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPart.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPartKind.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPartKind.java similarity index 94% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPartKind.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPartKind.java index eaf1cb7..20a7e9c 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationPartKind.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPartKind.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; public enum DDConfigurationPartKind { ACCOUNT, diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationSummary.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationSummary.java similarity index 95% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationSummary.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationSummary.java index 26d5593..fb26443 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDConfigurationSummary.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationSummary.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationPartRequest.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationPartRequest.java similarity index 95% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationPartRequest.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationPartRequest.java index c83ee15..846fddf 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationPartRequest.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationPartRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationRequest.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationRequest.java similarity index 94% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationRequest.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationRequest.java index 965f873..2ad0a3b 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDCreateConfigurationRequest.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationPartRequest.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationPartRequest.java similarity index 94% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationPartRequest.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationPartRequest.java index 1fed939..47c660e 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationPartRequest.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationPartRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationRequest.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationRequest.java similarity index 95% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationRequest.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationRequest.java index 48b6a87..21b1a89 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationRequest.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; diff --git a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationResult.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationResult.java similarity index 94% rename from apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationResult.java rename to apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationResult.java index 2c52e49..b9a1139 100644 --- a/apis/com.dbeaver.datadam.gateway.api/src/main/java/com/dbeaver/datadam/gateway/model/DDUpdateConfigurationResult.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dbeaver.datadam.gateway.model; +package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; From 5b63baa37f346995d24cd54de6d5cabce2d8ee16 Mon Sep 17 00:00:00 2001 From: Viktor Kirst Date: Wed, 9 Sep 2026 15:11:30 +0400 Subject: [PATCH 3/3] dbeaver/pro#10296 Use UUID and LocalDateTime in configuration API model --- .../share/api/model/DDConfiguration.java | 30 +++++++++--------- .../share/api/model/DDConfigurationPart.java | 26 +++++++++------- .../api/model/DDConfigurationPartKind.java | 22 ++++++------- .../api/model/DDConfigurationSummary.java | 31 ++++++++++--------- .../DDCreateConfigurationPartRequest.java | 26 +++++++++------- .../model/DDCreateConfigurationRequest.java | 22 ++++++------- .../DDUpdateConfigurationPartRequest.java | 22 ++++++------- .../model/DDUpdateConfigurationRequest.java | 22 ++++++------- .../model/DDUpdateConfigurationResult.java | 22 ++++++------- 9 files changed, 116 insertions(+), 107 deletions(-) diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfiguration.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfiguration.java index b30de48..50ba01e 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfiguration.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfiguration.java @@ -1,32 +1,34 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; +import java.time.LocalDateTime; import java.util.List; +import java.util.UUID; public record DDConfiguration( - @NotNull String configurationId, + @NotNull UUID configurationId, @NotNull String name, long version, - @NotNull String createdAt, - @Nullable String lastSyncAt, + @NotNull LocalDateTime createTime, + @Nullable LocalDateTime lastSyncTime, @NotNull List parts ) { } diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPart.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPart.java index 922be4e..cdd5ac1 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPart.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPart.java @@ -1,28 +1,30 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; +import java.util.UUID; + public record DDConfigurationPart( @NotNull String key, @NotNull DDConfigurationPartKind kind, - @Nullable String projectId, + @Nullable UUID projectId, long version, @NotNull String encryptedValue ) { diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPartKind.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPartKind.java index 20a7e9c..3da7023 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPartKind.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationPartKind.java @@ -1,18 +1,18 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model; diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationSummary.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationSummary.java index fb26443..772551d 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationSummary.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDConfigurationSummary.java @@ -1,29 +1,32 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; +import java.time.LocalDateTime; +import java.util.UUID; + public record DDConfigurationSummary( - @NotNull String configurationId, + @NotNull UUID configurationId, @NotNull String name, long version, - @NotNull String createdAt, - @Nullable String lastSyncAt + @NotNull LocalDateTime createTime, + @Nullable LocalDateTime lastSyncTime ) { } diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationPartRequest.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationPartRequest.java index 846fddf..f4a76dc 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationPartRequest.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationPartRequest.java @@ -1,28 +1,30 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; +import java.util.UUID; + public record DDCreateConfigurationPartRequest( @NotNull String key, @NotNull DDConfigurationPartKind kind, - @Nullable String projectId, + @Nullable UUID projectId, @NotNull String encryptedValue ) { } diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationRequest.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationRequest.java index 2ad0a3b..bd4f89b 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationRequest.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDCreateConfigurationRequest.java @@ -1,18 +1,18 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model; diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationPartRequest.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationPartRequest.java index 47c660e..4048e74 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationPartRequest.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationPartRequest.java @@ -1,18 +1,18 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model; diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationRequest.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationRequest.java index 21b1a89..a3c98d5 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationRequest.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationRequest.java @@ -1,18 +1,18 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model; diff --git a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationResult.java b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationResult.java index b9a1139..25a5d9b 100644 --- a/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationResult.java +++ b/apis/com.dbeaver.datadam.share.api/src/main/java/com/dbeaver/datadam/share/api/model/DDUpdateConfigurationResult.java @@ -1,18 +1,18 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2026 DBeaver Corp and others + * Copyright (C) 2010-2026 DBeaver Corp * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * NOTICE: All information contained herein is, and remains + * the property of DBeaver Corp and its suppliers, if any. + * The intellectual and technical concepts contained + * herein are proprietary to DBeaver Corp and its suppliers + * and may be covered by U.S. and Foreign Patents, + * patents in process, and are protected by trade secret or copyright law. + * Dissemination of this information or reproduction of this material + * is strictly forbidden unless prior written permission is obtained + * from DBeaver Corp. */ package com.dbeaver.datadam.share.api.model;