fix: java package names are incorrect for a number of packages (#28121)

In Java, the following services were all generated with an incorrect package name: ``` services.backupgateway services.cleanrooms services.entityresolution services.healthimaging services.mediapackagev2 services.osis services.pcaconnectorad services.proton services.shield services.verifiedpermissions services.workspacesweb ``` Which all should have been: ``` software.amazon.awscdk.services.backupgateway (etc) ``` ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Nov 24, 2023 · b865320 · b865320
1 parent 49839b2
commit b865320
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json b/packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.backupgateway"
+      "package": "software.amazon.awscdk.services.backupgateway"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.BackupGateway"

diff --git a/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json b/packages/aws-cdk-lib/aws-cleanrooms/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.cleanrooms"
+      "package": "software.amazon.awscdk.services.cleanrooms"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.CleanRooms"

diff --git a/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json b/packages/aws-cdk-lib/aws-entityresolution/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.entityresolution"
+      "package": "software.amazon.awscdk.services.entityresolution"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.EntityResolution"

diff --git a/packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json b/packages/aws-cdk-lib/aws-healthimaging/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.healthimaging"
+      "package": "software.amazon.awscdk.services.healthimaging"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.HealthImaging"

diff --git a/packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json b/packages/aws-cdk-lib/aws-mediapackagev2/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.mediapackagev2"
+      "package": "software.amazon.awscdk.services.mediapackagev2"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.MediaPackageV2"

diff --git a/packages/aws-cdk-lib/aws-osis/.jsiirc.json b/packages/aws-cdk-lib/aws-osis/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.osis"
+      "package": "software.amazon.awscdk.services.osis"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.OSIS"

diff --git a/packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json b/packages/aws-cdk-lib/aws-pcaconnectorad/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.pcaconnectorad"
+      "package": "software.amazon.awscdk.services.pcaconnectorad"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.PCAConnectorAD"

diff --git a/packages/aws-cdk-lib/aws-proton/.jsiirc.json b/packages/aws-cdk-lib/aws-proton/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.proton"
+      "package": "software.amazon.awscdk.services.proton"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.Proton"

diff --git a/packages/aws-cdk-lib/aws-shield/.jsiirc.json b/packages/aws-cdk-lib/aws-shield/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.shield"
+      "package": "software.amazon.awscdk.services.shield"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.Shield"

diff --git a/packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json b/packages/aws-cdk-lib/aws-verifiedpermissions/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.verifiedpermissions"
+      "package": "software.amazon.awscdk.services.verifiedpermissions"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.VerifiedPermissions"

diff --git a/packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json b/packages/aws-cdk-lib/aws-workspacesweb/.jsiirc.json
@@ -1,7 +1,7 @@
 {
   "targets": {
     "java": {
-      "package": "services.workspacesweb"
+      "package": "software.amazon.awscdk.services.workspacesweb"
     },
     "dotnet": {
       "package": "Amazon.CDK.AWS.WorkSpacesWeb"

diff --git a/tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts b/tools/@aws-cdk/spec2cdk/lib/cfn2ts/pkglint.ts
@@ -13,7 +13,7 @@ export function createModuleDefinitionFromCfnNamespace(namespace: string) {
   const javaGroupId = 'software.amazon.awscdk';
   const javaPackage =
     moduleFamily === 'AWS'
-      ? `services.${lowcaseModuleName}`
+      ? `software.amazon.awscdk.services.${lowcaseModuleName}`
       : `${moduleFamily.toLocaleLowerCase()}.${lowcaseModuleName}`;
   const javaArtifactId =
     moduleFamily === 'AWS' ? lowcaseModuleName : `${moduleFamily.toLocaleLowerCase()}-${lowcaseModuleName}`;