Skip to content

Commit cee7cea

Browse files
scmacdonscmacdon
committed
fixed a conflict
2 parents 9f40d1b + 2ea56bd commit cee7cea

File tree

83 files changed

+15076
-724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+15076
-724
lines changed

‎.doc_gen/metadata/iot_sitewise_metadata.yaml‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -119,35 +119,6 @@ iotsitewise_CreateGateway:
119119
- iotsitewise.JavaScript.Basics.createGateway
120120
services:
121121
iotsitewise: {CreateGateway}
122-
iotsitewise_DescribePortal:
123-
languages:
124-
Java:
125-
versions:
126-
- sdk_version: 2
127-
github: javav2/example_code/iotsitewise
128-
excerpts:
129-
- description:
130-
snippet_tags:
131-
- sitewise.java2.describe.portal.main
132-
Python:
133-
versions:
134-
- sdk_version: 3
135-
github: python/example_code/iotsitewise
136-
excerpts:
137-
- description:
138-
snippet_tags:
139-
- python.example_code.iotsitewise.IoTSitewiseWrapper.decl
140-
- python.example_code.iotsitewise.CreateGateway
141-
JavaScript:
142-
versions:
143-
- sdk_version: 3
144-
github: javascriptv3/example_code/iotsitewise
145-
excerpts:
146-
- description:
147-
snippet_tags:
148-
- iotsitewise.JavaScript.Basics.describePortal
149-
services:
150-
iotsitewise: {DescribePortal}
151122
iotsitewise_ListAssetModels:
152123
languages:
153124
Java:
@@ -177,64 +148,6 @@ iotsitewise_ListAssetModels:
177148
- iotsitewise.JavaScript.Basics.listAssetModels
178149
services:
179150
iotsitewise: {ListAssetModels}
180-
iotsitewise_DeletePortal:
181-
languages:
182-
Java:
183-
versions:
184-
- sdk_version: 2
185-
github: javav2/example_code/iotsitewise
186-
excerpts:
187-
- description:
188-
snippet_tags:
189-
- sitewise.java2.delete.portal.main
190-
Python:
191-
versions:
192-
- sdk_version: 3
193-
github: python/example_code/iotsitewise
194-
excerpts:
195-
- description:
196-
snippet_tags:
197-
- python.example_code.iotsitewise.IoTSitewiseWrapper.decl
198-
- python.example_code.iotsitewise.DeletePortal
199-
JavaScript:
200-
versions:
201-
- sdk_version: 3
202-
github: javascriptv3/example_code/iotsitewise
203-
excerpts:
204-
- description:
205-
snippet_tags:
206-
- iotsitewise.JavaScript.Basics.deletePortal
207-
services:
208-
iotsitewise: {DeletePortal}
209-
iotsitewise_CreatePortal:
210-
languages:
211-
Java:
212-
versions:
213-
- sdk_version: 2
214-
github: javav2/example_code/iotsitewise
215-
excerpts:
216-
- description:
217-
snippet_tags:
218-
- sitewise.java2.create.portal.main
219-
Python:
220-
versions:
221-
- sdk_version: 3
222-
github: python/example_code/iotsitewise
223-
excerpts:
224-
- description:
225-
snippet_tags:
226-
- python.example_code.iotsitewise.IoTSitewiseWrapper.decl
227-
- python.example_code.iotsitewise.CreatePortal
228-
JavaScript:
229-
versions:
230-
- sdk_version: 3
231-
github: javascriptv3/example_code/iotsitewise
232-
excerpts:
233-
- description:
234-
snippet_tags:
235-
- iotsitewise.JavaScript.Basics.createPortal
236-
services:
237-
iotsitewise: {CreatePortal}
238151
iotsitewise_DeleteAssetModel:
239152
languages:
240153
Java:

‎cpp/example_code/medical-imaging/start_dicom_import_job.cpp‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
\param outputBucketName: The name of the S3 bucket for the output.
3030
\param outputDirectory: The directory in the S3 bucket to store the output.
3131
\param roleArn: The ARN of the IAM role with permissions for the import.
32-
\param importConfigJson: The import configuration JSON string (optional).
3332
\param importJobId: A string to receive the import job ID.
3433
\param clientConfig: Aws client configuration.
3534
\return bool: Function succeeded.
@@ -38,7 +37,6 @@ bool AwsDoc::Medical_Imaging::startDICOMImportJob(
3837
const Aws::String &dataStoreID, const Aws::String &inputBucketName,
3938
const Aws::String &inputDirectory, const Aws::String &outputBucketName,
4039
const Aws::String &outputDirectory, const Aws::String &roleArn,
41-
const Aws::String &importConfigJson,
4240
Aws::String &importJobId,
4341
const Aws::Client::ClientConfiguration &clientConfig) {
4442
Aws::MedicalImaging::MedicalImagingClient medicalImagingClient(clientConfig);
@@ -50,20 +48,8 @@ bool AwsDoc::Medical_Imaging::startDICOMImportJob(
5048
startDICOMImportJobRequest.SetInputS3Uri(inputURI);
5149
startDICOMImportJobRequest.SetOutputS3Uri(outputURI);
5250

53-
if (!importConfigJson.empty()) {
54-
Aws::Utils::Json::JsonValue jsonValue(importConfigJson);
55-
if (jsonValue.WasParseSuccessful()) {
56-
startDICOMImportJobRequest.SetImportConfiguration(
57-
Aws::MedicalImaging::Model::ImportConfiguration(jsonValue));
58-
}
59-
else {
60-
std::cerr << "Failed to parse import configuration JSON" << std::endl;
61-
return false;
62-
}
63-
}
64-
65-
Aws::MedicalImaging::Model::StartDICOMImportJobOutcome startDICOMImportJobOutcome =
66-
medicalImagingClient.StartDICOMImportJob(startDICOMImportJobRequest);
51+
Aws::MedicalImaging::Model::StartDICOMImportJobOutcome startDICOMImportJobOutcome = medicalImagingClient.StartDICOMImportJob(
52+
startDICOMImportJobRequest);
6753

6854
if (startDICOMImportJobOutcome.IsSuccess()) {
6955
importJobId = startDICOMImportJobOutcome.GetResult().GetJobId();

‎javascriptv3/example_code/iotsitewise/README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,11 @@ Code excerpts that show you how to call individual service functions.
4949
- [CreateAsset](actions/create-asset.js#L4)
5050
- [CreateAssetModel](actions/create-asset-model.js#L4)
5151
- [CreateGateway](actions/create-gateway.js#L4)
52-
- [CreatePortal](actions/create-portal.js#L4)
5352
- [DeleteAsset](actions/delete-asset.js#L4)
5453
- [DeleteAssetModel](actions/delete-asset-model.js#L4)
5554
- [DeleteGateway](actions/delete-gateway.js#L4)
56-
- [DeletePortal](actions/delete-portal.js#L4)
5755
- [DescribeAssetModel](actions/describe-asset-model.js#L4)
5856
- [DescribeGateway](actions/describe-gateway.js#L4)
59-
- [DescribePortal](actions/describe-portal.js#L4)
6057
- [GetAssetPropertyValue](actions/get-asset-property-value.js#L4)
6158
- [ListAssetModels](actions/list-asset-models.js#L4)
6259

‎javascriptv3/example_code/medical-imaging/actions/start-dicom-import-job.js‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,13 @@ import { medicalImagingClient } from "../libs/medicalImagingClient.js";
1313
* @param {string} dataAccessRoleArn - The Amazon Resource Name (ARN) of the role that grants permission.
1414
* @param {string} inputS3Uri - The URI of the S3 bucket containing the input files.
1515
* @param {string} outputS3Uri - The URI of the S3 bucket where the output files are stored.
16-
* @param {Object} importConfiguration - The configuration for digital pathology import.
1716
*/
1817
export const startDicomImportJob = async (
1918
jobName = "test-1",
2019
datastoreId = "12345678901234567890123456789012",
2120
dataAccessRoleArn = "arn:aws:iam::xxxxxxxxxxxx:role/ImportJobDataAccessRole",
2221
inputS3Uri = "s3://medical-imaging-dicom-input/dicom_input/",
2322
outputS3Uri = "s3://medical-imaging-output/job_output/",
24-
importConfiguration = {
25-
digitalPathologyImportConfiguration: {
26-
qualityFactor: 85,
27-
fileMetadataMappings: [
28-
{
29-
imageFilePath: "image.svs",
30-
metadataFilePath: "metadata.json",
31-
},
32-
],
33-
},
34-
},
3523
) => {
3624
const response = await medicalImagingClient.send(
3725
new StartDICOMImportJobCommand({
@@ -40,7 +28,6 @@ export const startDicomImportJob = async (
4028
dataAccessRoleArn: dataAccessRoleArn,
4129
inputS3Uri: inputS3Uri,
4230
outputS3Uri: outputS3Uri,
43-
importConfiguration: importConfiguration,
4431
}),
4532
);
4633
console.log(response);

‎javav2/example_code/autoscale/pom.xml‎

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<version>1.0-SNAPSHOT</version>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
<java.version>21</java.version>
12-
<maven.compiler.target>21</maven.compiler.target>
13-
<maven.compiler.source>21</maven.compiler.source>
11+
<java.version>17</java.version>
12+
<maven.compiler.target>17</maven.compiler.target>
13+
<maven.compiler.source>17</maven.compiler.source>
1414
</properties>
1515
<build>
1616
<plugins>
@@ -30,13 +30,6 @@
3030
<type>pom</type>
3131
<scope>import</scope>
3232
</dependency>
33-
<dependency>
34-
<groupId>org.apache.logging.log4j</groupId>
35-
<artifactId>log4j-bom</artifactId>
36-
<version>2.23.1</version>
37-
<type>pom</type>
38-
<scope>import</scope>
39-
</dependency>
4033
</dependencies>
4134
</dependencyManagement>
4235
<dependencies>
@@ -50,47 +43,38 @@
5043
<groupId>software.amazon.awssdk</groupId>
5144
<artifactId>secretsmanager</artifactId>
5245
</dependency>
53-
<dependency>
54-
<groupId>com.google.code.gson</groupId>
55-
<artifactId>gson</artifactId>
56-
<version>2.10.1</version>
57-
</dependency>
5846
<dependency>
5947
<groupId>software.amazon.awssdk</groupId>
60-
<artifactId>autoscaling</artifactId>
48+
<artifactId>cloudformation</artifactId>
6149
</dependency>
6250
<dependency>
6351
<groupId>software.amazon.awssdk</groupId>
6452
<artifactId>ec2</artifactId>
6553
</dependency>
6654
<dependency>
6755
<groupId>software.amazon.awssdk</groupId>
68-
<artifactId>auth</artifactId>
56+
<artifactId>netty-nio-client</artifactId>
6957
</dependency>
7058
<dependency>
71-
<groupId>software.amazon.awssdk</groupId>
72-
<artifactId>sso</artifactId>
59+
<groupId>com.google.code.gson</groupId>
60+
<artifactId>gson</artifactId>
61+
<version>2.10.1</version>
7362
</dependency>
7463
<dependency>
7564
<groupId>software.amazon.awssdk</groupId>
76-
<artifactId>ssooidc</artifactId>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.apache.logging.log4j</groupId>
80-
<artifactId>log4j-core</artifactId>
65+
<artifactId>autoscaling</artifactId>
8166
</dependency>
8267
<dependency>
83-
<groupId>org.slf4j</groupId>
84-
<artifactId>slf4j-api</artifactId>
85-
<version>2.0.13</version>
68+
<groupId>software.amazon.awssdk</groupId>
69+
<artifactId>auth</artifactId>
8670
</dependency>
8771
<dependency>
88-
<groupId>org.apache.logging.log4j</groupId>
89-
<artifactId>log4j-slf4j2-impl</artifactId>
72+
<groupId>software.amazon.awssdk</groupId>
73+
<artifactId>sso</artifactId>
9074
</dependency>
9175
<dependency>
92-
<groupId>org.apache.logging.log4j</groupId>
93-
<artifactId>log4j-1.2-api</artifactId>
76+
<groupId>software.amazon.awssdk</groupId>
77+
<artifactId>ssooidc</artifactId>
9478
</dependency>
9579
</dependencies>
9680
</project>

0 commit comments

Comments
 (0)