From f0a1180ce8f68660f18207ddfe3aa0cb3dbb977f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=91=A8=F0=9F=8F=BC=E2=80=8D=F0=9F=92=BB=20Romain=20M?=
 =?UTF-8?q?arcadier-Muller?= <rmuller@amazon.com>
Date: Fri, 3 Aug 2018 14:48:18 +0200
Subject: [PATCH] Correct java examples

---
 examples/cdk-examples-java/pom.xml.t.js             | 13 +------------
 .../amazon/awscdk}/examples/HelloJavaApp.java       |  0
 .../amazon/awscdk}/examples/HelloJavaStack.java     |  0
 .../amazon/awscdk}/examples/SinkQueue.java          |  0
 .../amazon/awscdk}/examples/SinkQueueProps.java     |  0
 .../amazon/awscdk}/examples/SinkQueueTest.java      |  2 +-
 .../examples/testSubscribeTopics.expected.json      |  0
 7 files changed, 2 insertions(+), 13 deletions(-)
 rename examples/cdk-examples-java/project/src/main/java/{com/amazonaws/cdk => software/amazon/awscdk}/examples/HelloJavaApp.java (100%)
 rename examples/cdk-examples-java/project/src/main/java/{com/amazonaws/cdk => software/amazon/awscdk}/examples/HelloJavaStack.java (100%)
 rename examples/cdk-examples-java/project/src/main/java/{com/amazonaws/cdk => software/amazon/awscdk}/examples/SinkQueue.java (100%)
 rename examples/cdk-examples-java/project/src/main/java/{com/amazonaws/cdk => software/amazon/awscdk}/examples/SinkQueueProps.java (100%)
 rename examples/cdk-examples-java/project/src/test/java/{com/amazonaws/cdk => software/amazon/awscdk}/examples/SinkQueueTest.java (99%)
 rename examples/cdk-examples-java/project/src/test/resources/{com/amazonaws/cdk => software/amazon/awscdk}/examples/testSubscribeTopics.expected.json (100%)

diff --git a/examples/cdk-examples-java/pom.xml.t.js b/examples/cdk-examples-java/pom.xml.t.js
index 25a1e0e39887d..7ed7887195fb7 100644
--- a/examples/cdk-examples-java/pom.xml.t.js
+++ b/examples/cdk-examples-java/pom.xml.t.js
@@ -6,7 +6,7 @@ const mavenFromNpm = name => ({
     repo: path.join(path.dirname(require.resolve(name)), 'maven-repo'),
 });
 
-const cdk = mavenFromNpm('aws-cdk-java');
+const cdk = mavenFromNpm('aws-cdk');
 const jsii = mavenFromNpm('jsii-java-runtime');
 
 process.stdout.write(`
@@ -16,17 +16,6 @@ process.stdout.write(`
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
 
-    <repositories>
-        <repository>
-            <id>cdk</id>
-            <url>file://${cdk.repo}</url>
-        </repository>
-        <repository>
-            <id>jsii</id>
-            <url>file://${jsii.repo}</url>
-        </repository>
-    </repositories>
-
     <groupId>com.amazonaws.cdk</groupId>
     <artifactId>cdk-examples-java</artifactId>
     <version>${version}</version>
diff --git a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaApp.java b/examples/cdk-examples-java/project/src/main/java/software/amazon/awscdk/examples/HelloJavaApp.java
similarity index 100%
rename from examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaApp.java
rename to examples/cdk-examples-java/project/src/main/java/software/amazon/awscdk/examples/HelloJavaApp.java
diff --git a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaStack.java b/examples/cdk-examples-java/project/src/main/java/software/amazon/awscdk/examples/HelloJavaStack.java
similarity index 100%
rename from examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/HelloJavaStack.java
rename to examples/cdk-examples-java/project/src/main/java/software/amazon/awscdk/examples/HelloJavaStack.java
diff --git a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueue.java b/examples/cdk-examples-java/project/src/main/java/software/amazon/awscdk/examples/SinkQueue.java
similarity index 100%
rename from examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueue.java
rename to examples/cdk-examples-java/project/src/main/java/software/amazon/awscdk/examples/SinkQueue.java
diff --git a/examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueueProps.java b/examples/cdk-examples-java/project/src/main/java/software/amazon/awscdk/examples/SinkQueueProps.java
similarity index 100%
rename from examples/cdk-examples-java/project/src/main/java/com/amazonaws/cdk/examples/SinkQueueProps.java
rename to examples/cdk-examples-java/project/src/main/java/software/amazon/awscdk/examples/SinkQueueProps.java
diff --git a/examples/cdk-examples-java/project/src/test/java/com/amazonaws/cdk/examples/SinkQueueTest.java b/examples/cdk-examples-java/project/src/test/java/software/amazon/awscdk/examples/SinkQueueTest.java
similarity index 99%
rename from examples/cdk-examples-java/project/src/test/java/com/amazonaws/cdk/examples/SinkQueueTest.java
rename to examples/cdk-examples-java/project/src/test/java/software/amazon/awscdk/examples/SinkQueueTest.java
index aada3ce49da0e..af77ec5f38705 100644
--- a/examples/cdk-examples-java/project/src/test/java/com/amazonaws/cdk/examples/SinkQueueTest.java
+++ b/examples/cdk-examples-java/project/src/test/java/software/amazon/awscdk/examples/SinkQueueTest.java
@@ -6,7 +6,7 @@
 import software.amazon.awscdk.services.sqs.QueueProps;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.jsii.JsiiException;
+import software.amazon.jsii.JsiiException;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/examples/cdk-examples-java/project/src/test/resources/com/amazonaws/cdk/examples/testSubscribeTopics.expected.json b/examples/cdk-examples-java/project/src/test/resources/software/amazon/awscdk/examples/testSubscribeTopics.expected.json
similarity index 100%
rename from examples/cdk-examples-java/project/src/test/resources/com/amazonaws/cdk/examples/testSubscribeTopics.expected.json
rename to examples/cdk-examples-java/project/src/test/resources/software/amazon/awscdk/examples/testSubscribeTopics.expected.json