diff --git a/.gitignore b/.gitignore index e117745e2..68512eca0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ target/ libs/ tmp/ node_modules/ +jaxws/jaxws-client/src/main/ # OS Files # .DS_Store diff --git a/batch/README.md b/batch/README.md new file mode 100644 index 000000000..9f1585d27 --- /dev/null +++ b/batch/README.md @@ -0,0 +1,27 @@ +# Java EE 7 Samples: Batch # + +The [JSR 352](https://jcp.org/en/jsr/detail?id=352) specifies a programming model for batch applications and a runtime for scheduling and executing jobs. + +## Samples ## + + - batchlet-simple + - chunk-checkpoint + - chunk-csv-database + - chunk-exception + - chunk-mapper + - chunk-optional-processor + - chunk-partition + - chunk-simple + - decision + - flow + - batch-listeners + - multiple-steps + - split + - chunk-simple-nobeans + - scheduling + +## How to run + +More information on how to run can be found at: + + diff --git a/batch/batch-listeners/pom.xml b/batch/batch-listeners/pom.xml index 874fc6ee9..c1a82a82e 100644 --- a/batch/batch-listeners/pom.xml +++ b/batch/batch-listeners/pom.xml @@ -1,22 +1,22 @@ - + + 4.0.0 + - org.javaee7.batch - batch-samples + org.javaee7 + batch 1.0-SNAPSHOT ../pom.xml - - batch-listeners + batch-batch-listeners war - Batch Listeners + Java EE 7 Sample: batch - batch-listeners Batch Listeners - Applying Listeners to Job, Chunk, Step, Reader, Processor and Writer org.javaee7 - util-samples + util diff --git a/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyInputRecord.java b/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyInputRecord.java index 72cb2af2b..4f471edc1 100644 --- a/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyInputRecord.java +++ b/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyInputRecord.java @@ -5,9 +5,10 @@ */ public class MyInputRecord { private int id; - - public MyInputRecord() { } - + + public MyInputRecord() { + } + public MyInputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemProcessor.java b/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemProcessor.java index 76c5ae03f..5b9e2683c 100644 --- a/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemProcessor.java +++ b/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemProcessor.java @@ -12,7 +12,7 @@ public class MyItemProcessor implements ItemProcessor { @Override public Object processItem(Object t) { System.out.println("processItem: " + t); - - return (((MyInputRecord)t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord)t).getId() * 2); + + return (((MyInputRecord) t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord) t).getId() * 2); } } diff --git a/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemReader.java b/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemReader.java index 174521fd3..958605815 100644 --- a/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemReader.java +++ b/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyItemReader.java @@ -9,13 +9,13 @@ */ @Named public class MyItemReader extends AbstractItemReader { - + private final StringTokenizer tokens; - + public MyItemReader() { tokens = new StringTokenizer("1,2,3,4,5,6,7,8,9,10", ","); } - + @Override public MyInputRecord readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyOutputRecord.java b/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyOutputRecord.java index 80b35a073..981c9f6eb 100644 --- a/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyOutputRecord.java +++ b/batch/batch-listeners/src/main/java/org/javaee7/batch/batch/listeners/MyOutputRecord.java @@ -5,9 +5,10 @@ */ public class MyOutputRecord { private int id; - - public MyOutputRecord() { } - + + public MyOutputRecord() { + } + public MyOutputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyOutputRecord: " + id; diff --git a/batch/batch-listeners/src/test/java/org/javaee7/batch/batch/listeners/BatchListenersTest.java b/batch/batch-listeners/src/test/java/org/javaee7/batch/batch/listeners/BatchListenersTest.java index ba65dbfaa..1ac23dfe7 100644 --- a/batch/batch-listeners/src/test/java/org/javaee7/batch/batch/listeners/BatchListenersTest.java +++ b/batch/batch-listeners/src/test/java/org/javaee7/batch/batch/listeners/BatchListenersTest.java @@ -93,10 +93,10 @@ public class BatchListenersTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.batch.listeners") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.batch.listeners") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } diff --git a/batch/batchlet-simple/pom.xml b/batch/batchlet-simple/pom.xml index 6c282fc62..d27ea609e 100644 --- a/batch/batchlet-simple/pom.xml +++ b/batch/batchlet-simple/pom.xml @@ -1,24 +1,23 @@ - + + 4.0.0 + - org.javaee7.batch - batch-samples + org.javaee7 + batch 1.0-SNAPSHOT ../pom.xml - - batchlet-simple + batch-batchlet-simple war - Batchlet Simple + Java EE 7 Sample: batch - batchlet-simple Batchlet Simple - Execute a task oriented step org.javaee7 - util-samples + util - diff --git a/batch/batchlet-simple/src/test/java/org/javaee7/batch/batchlet/simple/MyBatchletTest.java b/batch/batchlet-simple/src/test/java/org/javaee7/batch/batchlet/simple/MyBatchletTest.java index 55ef2e269..68abac615 100644 --- a/batch/batchlet-simple/src/test/java/org/javaee7/batch/batchlet/simple/MyBatchletTest.java +++ b/batch/batchlet-simple/src/test/java/org/javaee7/batch/batchlet/simple/MyBatchletTest.java @@ -52,10 +52,10 @@ public class MyBatchletTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addClass(MyBatchlet.class) - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addClass(MyBatchlet.class) + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } diff --git a/batch/chunk-checkpoint/pom.xml b/batch/chunk-checkpoint/pom.xml index 1ebfd87ea..63ac45876 100644 --- a/batch/chunk-checkpoint/pom.xml +++ b/batch/chunk-checkpoint/pom.xml @@ -1,23 +1,23 @@ - + + 4.0.0 + - org.javaee7.batch - batch-samples + org.javaee7 + batch 1.0-SNAPSHOT ../pom.xml - - chunk-checkpoint + batch-chunk-checkpoint war - Batch Chunk Checkpoint + Java EE 7 Sample: batch - chunk-checkpoint Chunk Checkpoint - Custom Checkpoint Policy org.javaee7 - util-samples + util diff --git a/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyInputRecord.java b/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyInputRecord.java index 616f5d857..b545d06d6 100644 --- a/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyInputRecord.java +++ b/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyInputRecord.java @@ -5,9 +5,10 @@ */ public class MyInputRecord { private int id; - - public MyInputRecord() { } - + + public MyInputRecord() { + } + public MyInputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyItemProcessor.java b/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyItemProcessor.java index c55a40710..e2139fbea 100644 --- a/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyItemProcessor.java +++ b/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyItemProcessor.java @@ -12,7 +12,7 @@ public class MyItemProcessor implements ItemProcessor { @Override public MyOutputRecord processItem(Object t) { System.out.println("processItem: " + t); - - return (((MyInputRecord)t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord)t).getId() * 2); + + return (((MyInputRecord) t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord) t).getId() * 2); } } diff --git a/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyItemReader.java b/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyItemReader.java index 144cf9ce3..c95389625 100644 --- a/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyItemReader.java +++ b/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyItemReader.java @@ -10,7 +10,7 @@ */ @Named public class MyItemReader extends AbstractItemReader { - + private StringTokenizer tokens; static int COUNT = 0; @@ -18,7 +18,7 @@ public class MyItemReader extends AbstractItemReader { public void open(Serializable checkpoint) throws Exception { tokens = new StringTokenizer("1,2,3,4,5,6,7,8,9,10", ","); } - + @Override public MyInputRecord readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyOutputRecord.java b/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyOutputRecord.java index aa83de287..e02a804a2 100644 --- a/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyOutputRecord.java +++ b/batch/chunk-checkpoint/src/main/java/org/javaee7/batch/chunk/checkpoint/MyOutputRecord.java @@ -5,9 +5,10 @@ */ public class MyOutputRecord { private int id; - - public MyOutputRecord() { } - + + public MyOutputRecord() { + } + public MyOutputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyOutputRecord: " + id; diff --git a/batch/chunk-checkpoint/src/main/resources/META-INF/batch-jobs/myJob.xml b/batch/chunk-checkpoint/src/main/resources/META-INF/batch-jobs/myJob.xml index c693c01de..99fbd9f87 100644 --- a/batch/chunk-checkpoint/src/main/resources/META-INF/batch-jobs/myJob.xml +++ b/batch/chunk-checkpoint/src/main/resources/META-INF/batch-jobs/myJob.xml @@ -6,7 +6,7 @@ - + diff --git a/batch/chunk-checkpoint/src/test/java/org/javaee7/batch/chunk/checkpoint/BatchChunkCheckpointTest.java b/batch/chunk-checkpoint/src/test/java/org/javaee7/batch/chunk/checkpoint/BatchChunkCheckpointTest.java index 4b8660693..909da3b60 100644 --- a/batch/chunk-checkpoint/src/test/java/org/javaee7/batch/chunk/checkpoint/BatchChunkCheckpointTest.java +++ b/batch/chunk-checkpoint/src/test/java/org/javaee7/batch/chunk/checkpoint/BatchChunkCheckpointTest.java @@ -60,10 +60,10 @@ public class BatchChunkCheckpointTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.chunk.checkpoint") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.chunk.checkpoint") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } diff --git a/batch/chunk-csv-database/pom.xml b/batch/chunk-csv-database/pom.xml index ec57b7c27..36eafb41a 100644 --- a/batch/chunk-csv-database/pom.xml +++ b/batch/chunk-csv-database/pom.xml @@ -1,23 +1,23 @@ - + + 4.0.0 + - org.javaee7.batch - batch-samples + org.javaee7 + batch 1.0-SNAPSHOT ../pom.xml - - chunk-csv-database + batch-chunk-csv-database war - Batch Chunk CSV Database + Java EE 7 Sample: batch - chunk-csv-database Chunk Processing - Read, Process, Write to a Database org.javaee7 - util-samples + util diff --git a/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemProcessor.java b/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemProcessor.java index cbe8da3cc..0169bc459 100644 --- a/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemProcessor.java +++ b/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemProcessor.java @@ -17,12 +17,12 @@ public class MyItemProcessor implements ItemProcessor { @Override public Person processItem(Object t) { System.out.println("processItem: " + t); - - StringTokenizer tokens = new StringTokenizer((String)t, ","); + + StringTokenizer tokens = new StringTokenizer((String) t, ","); String name = tokens.nextToken(); String date; - + try { date = tokens.nextToken(); format.setLenient(false); @@ -30,7 +30,7 @@ public Person processItem(Object t) { } catch (ParseException e) { return null; } - + return new Person(id++, name, date); } } diff --git a/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemReader.java b/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemReader.java index 3709ecad7..005959618 100644 --- a/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemReader.java +++ b/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemReader.java @@ -20,8 +20,8 @@ public class MyItemReader extends AbstractItemReader { @Override public void open(Serializable checkpoint) throws Exception { reader = new BufferedReader( - new InputStreamReader( - Thread.currentThread().getContextClassLoader().getResourceAsStream("/META-INF/mydata.csv"))); + new InputStreamReader( + Thread.currentThread().getContextClassLoader().getResourceAsStream("/META-INF/mydata.csv"))); } @Override diff --git a/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemWriter.java b/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemWriter.java index e525a9820..2ac1aba33 100644 --- a/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemWriter.java +++ b/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/MyItemWriter.java @@ -11,7 +11,7 @@ */ @Named public class MyItemWriter extends AbstractItemWriter { - + @PersistenceContext EntityManager em; diff --git a/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/Person.java b/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/Person.java index 91838a4bf..a3dc477c2 100644 --- a/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/Person.java +++ b/batch/chunk-csv-database/src/main/java/org/javaee7/batch/chunk/csv/database/Person.java @@ -15,7 +15,7 @@ @NamedQueries({ @NamedQuery(name = "Person.findAll", query = "SELECT c FROM Person c"), @NamedQuery(name = "Person.findByName", query = "SELECT c FROM Person c WHERE c.name = :name"), - @NamedQuery(name = "Person.findByHiredate", query = "SELECT c FROM Person c WHERE c.hiredate = :hiredate")}) + @NamedQuery(name = "Person.findByHiredate", query = "SELECT c FROM Person c WHERE c.hiredate = :hiredate") }) public class Person implements Serializable { @Id diff --git a/batch/chunk-csv-database/src/main/resources/META-INF/batch-jobs/myJob.xml b/batch/chunk-csv-database/src/main/resources/META-INF/batch-jobs/myJob.xml index 09e01274e..32bb5cce3 100644 --- a/batch/chunk-csv-database/src/main/resources/META-INF/batch-jobs/myJob.xml +++ b/batch/chunk-csv-database/src/main/resources/META-INF/batch-jobs/myJob.xml @@ -5,7 +5,7 @@ - + diff --git a/batch/chunk-csv-database/src/test/java/org/javaee7/batch/chunk/csv/database/BatchCSVDatabaseTest.java b/batch/chunk-csv-database/src/test/java/org/javaee7/batch/chunk/csv/database/BatchCSVDatabaseTest.java index 0dfbbf7de..ce3ae06b0 100644 --- a/batch/chunk-csv-database/src/test/java/org/javaee7/batch/chunk/csv/database/BatchCSVDatabaseTest.java +++ b/batch/chunk-csv-database/src/test/java/org/javaee7/batch/chunk/csv/database/BatchCSVDatabaseTest.java @@ -69,14 +69,14 @@ public class BatchCSVDatabaseTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.chunk.csv.database") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/mydata.csv"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.chunk.csv.database") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/mydata.csv"); System.out.println(war.toString(true)); return war; } diff --git a/batch/chunk-exception/pom.xml b/batch/chunk-exception/pom.xml index 271eb9a10..fa22a1530 100644 --- a/batch/chunk-exception/pom.xml +++ b/batch/chunk-exception/pom.xml @@ -1,22 +1,22 @@ - + + 4.0.0 + - org.javaee7.batch - batch-samples + org.javaee7 + batch 1.0-SNAPSHOT ../pom.xml - - chunk-exception + batch-chunk-exception war - Batch Chunk Exception + Java EE 7 Sample: batch - chunk-exception Chunk Exception Handling - Retrying and Skipping org.javaee7 - util-samples + util diff --git a/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyInputRecord.java b/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyInputRecord.java index 3cff00dd7..23e9d1b04 100644 --- a/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyInputRecord.java +++ b/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyInputRecord.java @@ -22,8 +22,10 @@ public void setId(int id) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; MyInputRecord that = (MyInputRecord) o; diff --git a/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyItemWriter.java b/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyItemWriter.java index fc685b4a3..69fe47d90 100644 --- a/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyItemWriter.java +++ b/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyItemWriter.java @@ -14,7 +14,7 @@ public class MyItemWriter extends AbstractItemWriter { @Override public void writeItems(List list) { if (retries <= 3 && list.contains(new MyOutputRecord(8))) { - retries ++; + retries++; System.out.println("Throw UnsupportedOperationException in MyItemWriter"); throw new UnsupportedOperationException(); } diff --git a/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyOutputRecord.java b/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyOutputRecord.java index 4d12c36b8..ed519f9e6 100644 --- a/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyOutputRecord.java +++ b/batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyOutputRecord.java @@ -22,8 +22,10 @@ public void setId(int id) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; MyOutputRecord that = (MyOutputRecord) o; diff --git a/batch/chunk-exception/src/test/java/org/javaee7/batch/chunk/exception/BatchChunkExceptionTest.java b/batch/chunk-exception/src/test/java/org/javaee7/batch/chunk/exception/BatchChunkExceptionTest.java index 025f3b217..52028ffb8 100644 --- a/batch/chunk-exception/src/test/java/org/javaee7/batch/chunk/exception/BatchChunkExceptionTest.java +++ b/batch/chunk-exception/src/test/java/org/javaee7/batch/chunk/exception/BatchChunkExceptionTest.java @@ -92,10 +92,10 @@ public class BatchChunkExceptionTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.chunk.exception") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.chunk.exception") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } diff --git a/batch/chunk-mapper/pom.xml b/batch/chunk-mapper/pom.xml index 19821ce36..6e53e2040 100644 --- a/batch/chunk-mapper/pom.xml +++ b/batch/chunk-mapper/pom.xml @@ -1,23 +1,22 @@ - - - 4.0.0 - - org.javaee7.batch - batch-samples - 1.0-SNAPSHOT - ../pom.xml - - - chunk-mapper - war - Batch Chunk Partition Mapper - Chunk Processing - Read, Process, Write in multiple Threads - - - - org.javaee7 - util-samples - - - + + + 4.0.0 + + + org.javaee7 + batch + 1.0-SNAPSHOT + ../pom.xml + + batch-chunk-mapper + war + Java EE 7 Sample: batch - chunk-mapper + Chunk Processing - Read, Process, Write in multiple Threads + + + + org.javaee7 + util + + + diff --git a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyAnalyzer.java b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyAnalyzer.java index 6bfe3bf55..a9e5fcbb7 100644 --- a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyAnalyzer.java +++ b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyAnalyzer.java @@ -18,5 +18,5 @@ public void analyzeCollectorData(Serializable srlzbl) throws Exception { public void analyzeStatus(BatchStatus bs, String string) throws Exception { System.out.println("analyzeStatus"); } - + } diff --git a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyCollector.java b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyCollector.java index 56c097413..36c85a02b 100644 --- a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyCollector.java +++ b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyCollector.java @@ -11,10 +11,10 @@ public class MyCollector implements PartitionCollector { @Override public Serializable collectPartitionData() throws Exception { System.out.println("collectPartitionData"); - + return new Serializable() { - + }; } - + } diff --git a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyInputRecord.java b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyInputRecord.java index 35017a4a7..3dff0e504 100644 --- a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyInputRecord.java +++ b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyInputRecord.java @@ -5,9 +5,10 @@ */ public class MyInputRecord { private int id; - - public MyInputRecord() { } - + + public MyInputRecord() { + } + public MyInputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyItemProcessor.java b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyItemProcessor.java index e8cbf60e6..3e786edbf 100644 --- a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyItemProcessor.java +++ b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyItemProcessor.java @@ -12,7 +12,7 @@ public class MyItemProcessor implements ItemProcessor { @Override public MyOutputRecord processItem(Object t) { System.out.println("processItem: " + t); - - return (((MyInputRecord)t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord)t).getId() * 2); + + return (((MyInputRecord) t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord) t).getId() * 2); } } diff --git a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyItemReader.java b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyItemReader.java index 5e2ccd6c6..f4fb9ea90 100644 --- a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyItemReader.java +++ b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyItemReader.java @@ -15,26 +15,26 @@ public class MyItemReader extends AbstractItemReader { public static int totalReaders = 0; private int readerId; - + private StringTokenizer tokens; - + @Inject @BatchProperty(name = "start") private String startProp; - + @Inject @BatchProperty(name = "end") private String endProp; - + @Inject private JobContext context; - + @Override public void open(Serializable e) { int start = new Integer(startProp); int end = new Integer(endProp); StringBuilder builder = new StringBuilder(); - for (int i=start; i<=end; i++) { + for (int i = start; i <= end; i++) { builder.append(i); if (i < end) builder.append(","); @@ -43,7 +43,7 @@ public void open(Serializable e) { readerId = ++totalReaders; tokens = new StringTokenizer(builder.toString(), ","); } - + @Override public MyInputRecord readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyMapper.java b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyMapper.java index 5172bd4ce..d65a016e9 100644 --- a/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyMapper.java +++ b/batch/chunk-mapper/src/main/java/org/javaee7/batch/sample/chunk/mapper/MyMapper.java @@ -29,11 +29,11 @@ public int getThreads() { @Override public Properties[] getPartitionProperties() { Properties[] props = new Properties[getPartitions()]; - - for (int i=0; i + + 4.0.0 + - org.javaee7.batch - batch-samples + org.javaee7 + batch 1.0-SNAPSHOT ../pom.xml - - chunk-optional-processor + batch-chunk-optional-processor war - Batch Chunk Optional Processor + Java EE 7 Sample: batch - chunk-optional-processor Chunk Processing - Read and Write org.javaee7 - util-samples + util diff --git a/batch/chunk-optional-processor/src/main/java/org/javaee7/batch/chunk/optional/processor/MyItemReader.java b/batch/chunk-optional-processor/src/main/java/org/javaee7/batch/chunk/optional/processor/MyItemReader.java index 639009ad9..f5880eb55 100644 --- a/batch/chunk-optional-processor/src/main/java/org/javaee7/batch/chunk/optional/processor/MyItemReader.java +++ b/batch/chunk-optional-processor/src/main/java/org/javaee7/batch/chunk/optional/processor/MyItemReader.java @@ -12,14 +12,14 @@ */ @Named public class MyItemReader extends AbstractItemReader { - + private StringTokenizer tokens; - + @Override public void open(Serializable c) { tokens = new StringTokenizer("1,2,3,4,5,6,7,8,9,10", ","); } - + @Override public Object readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/chunk-optional-processor/src/main/java/org/javaee7/batch/chunk/optional/processor/MyRecord.java b/batch/chunk-optional-processor/src/main/java/org/javaee7/batch/chunk/optional/processor/MyRecord.java index 75d609d46..d7e0f9bb4 100644 --- a/batch/chunk-optional-processor/src/main/java/org/javaee7/batch/chunk/optional/processor/MyRecord.java +++ b/batch/chunk-optional-processor/src/main/java/org/javaee7/batch/chunk/optional/processor/MyRecord.java @@ -5,9 +5,10 @@ */ public class MyRecord { private int id; - - public MyRecord() { } - + + public MyRecord() { + } + public MyRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/chunk-optional-processor/src/main/resources/META-INF/batch-jobs/myJob.xml b/batch/chunk-optional-processor/src/main/resources/META-INF/batch-jobs/myJob.xml index d22d8d3db..1cfcd215e 100644 --- a/batch/chunk-optional-processor/src/main/resources/META-INF/batch-jobs/myJob.xml +++ b/batch/chunk-optional-processor/src/main/resources/META-INF/batch-jobs/myJob.xml @@ -4,7 +4,7 @@ - + diff --git a/batch/chunk-optional-processor/src/test/java/org/javaee7/batch/chunk/optional/processor/BatchChunkOptionalProcessorTest.java b/batch/chunk-optional-processor/src/test/java/org/javaee7/batch/chunk/optional/processor/BatchChunkOptionalProcessorTest.java index 58a2c84cd..d0525b15d 100644 --- a/batch/chunk-optional-processor/src/test/java/org/javaee7/batch/chunk/optional/processor/BatchChunkOptionalProcessorTest.java +++ b/batch/chunk-optional-processor/src/test/java/org/javaee7/batch/chunk/optional/processor/BatchChunkOptionalProcessorTest.java @@ -46,10 +46,10 @@ public class BatchChunkOptionalProcessorTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.chunk.optional.processor") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.chunk.optional.processor") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } @@ -82,7 +82,7 @@ public void testBatchChunkOptionalProcessor() throws Exception { assertEquals(10L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue()); // <3> The commit count should be 4. Checkpoint is on every 3rd read, 4 commits for read elements. assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), - metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue()); + metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue()); } } diff --git a/batch/chunk-partition/pom.xml b/batch/chunk-partition/pom.xml index 582ea97ea..4901d51db 100644 --- a/batch/chunk-partition/pom.xml +++ b/batch/chunk-partition/pom.xml @@ -1,23 +1,22 @@ - - - 4.0.0 - - org.javaee7.batch - batch-samples - 1.0-SNAPSHOT - ../pom.xml - - - chunk-partition - war - Batch Chunk Partition - Chunk Processing - Read, Process, Write in multiple Threads - - - - org.javaee7 - util-samples - - - + + + 4.0.0 + + + org.javaee7 + batch + 1.0-SNAPSHOT + ../pom.xml + + batch-chunk-partition + war + Java EE 7 Sample: batch - chunk-partition + Chunk Processing - Read, Process, Write in multiple Threads + + + + org.javaee7 + util + + + diff --git a/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyInputRecord.java b/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyInputRecord.java index e7af0d54d..3e8538071 100644 --- a/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyInputRecord.java +++ b/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyInputRecord.java @@ -5,9 +5,10 @@ */ public class MyInputRecord { private int id; - - public MyInputRecord() { } - + + public MyInputRecord() { + } + public MyInputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyItemReader.java b/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyItemReader.java index b19855e50..00e3922bc 100644 --- a/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyItemReader.java +++ b/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyItemReader.java @@ -14,13 +14,13 @@ public class MyItemReader extends AbstractItemReader { public static int totalReaders = 0; private int readerId; - + private StringTokenizer tokens; - + @Inject @BatchProperty(name = "start") private String startProp; - + @Inject @BatchProperty(name = "end") private String endProp; @@ -30,16 +30,16 @@ public void open(Serializable e) { int start = new Integer(startProp); int end = new Integer(endProp); StringBuilder builder = new StringBuilder(); - for (int i=start; i<=end; i++) { + for (int i = start; i <= end; i++) { builder.append(i); if (i < end) builder.append(","); } readerId = ++totalReaders; - tokens = new StringTokenizer(builder.toString(), ","); + tokens = new StringTokenizer(builder.toString(), ","); } - + @Override public MyInputRecord readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyOutputRecord.java b/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyOutputRecord.java index da698f8af..77f121224 100644 --- a/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyOutputRecord.java +++ b/batch/chunk-partition/src/main/java/org/javaee7/batch/sample/chunk/partition/MyOutputRecord.java @@ -5,9 +5,10 @@ */ public class MyOutputRecord { private int id; - - public MyOutputRecord() { } - + + public MyOutputRecord() { + } + public MyOutputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyOutputRecord: " + id; diff --git a/batch/chunk-partition/src/test/java/org/javaee7/batch/sample/chunk/partition/BatchChunkPartitionTest.java b/batch/chunk-partition/src/test/java/org/javaee7/batch/sample/chunk/partition/BatchChunkPartitionTest.java index b45858f59..5e8e78b14 100644 --- a/batch/chunk-partition/src/test/java/org/javaee7/batch/sample/chunk/partition/BatchChunkPartitionTest.java +++ b/batch/chunk-partition/src/test/java/org/javaee7/batch/sample/chunk/partition/BatchChunkPartitionTest.java @@ -62,10 +62,10 @@ public class BatchChunkPartitionTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.sample.chunk.partition") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.sample.chunk.partition") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } diff --git a/batch/chunk-simple-nobeans/pom.xml b/batch/chunk-simple-nobeans/pom.xml index 5b8a0ea5d..14fa1c00e 100644 --- a/batch/chunk-simple-nobeans/pom.xml +++ b/batch/chunk-simple-nobeans/pom.xml @@ -1,22 +1,21 @@ - - - 4.0.0 - - org.javaee7.batch - batch-samples - 1.0-SNAPSHOT - - - chunk-simple-nobeans - war - Batch Chunk Simple No Beans - Chunk Processing - Read, Process, Write - - - - org.javaee7 - util-samples - - - + + + 4.0.0 + + + org.javaee7 + batch + 1.0-SNAPSHOT + + batch-chunk-simple-nobeans + war + Java EE 7 Sample: batch - chunk-simple-nobeans + Chunk Processing - Read, Process, Write + + + + org.javaee7 + util + + + diff --git a/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyInputRecord.java b/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyInputRecord.java index c31def031..9dfe7db4f 100644 --- a/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyInputRecord.java +++ b/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyInputRecord.java @@ -5,9 +5,10 @@ */ public class MyInputRecord { private int id; - - public MyInputRecord() { } - + + public MyInputRecord() { + } + public MyInputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyItemProcessor.java b/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyItemProcessor.java index 0118679cd..83c691712 100644 --- a/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyItemProcessor.java +++ b/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyItemProcessor.java @@ -14,7 +14,7 @@ public class MyItemProcessor implements ItemProcessor { @Override public MyOutputRecord processItem(Object t) { System.out.println("processItem: " + t); - - return (((MyInputRecord)t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord)t).getId() * 2); + + return (((MyInputRecord) t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord) t).getId() * 2); } } diff --git a/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyItemReader.java b/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyItemReader.java index 1d945622a..77d649b3c 100644 --- a/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyItemReader.java +++ b/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyItemReader.java @@ -12,15 +12,14 @@ @Dependent @Named public class MyItemReader extends AbstractItemReader { - + private StringTokenizer tokens; - - + @Override public void open(Serializable checkpoint) throws Exception { tokens = new StringTokenizer("1,2,3,4,5,6,7,8,9,10", ","); } - + @Override public MyInputRecord readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyOutputRecord.java b/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyOutputRecord.java index 0465af328..c9379fb05 100644 --- a/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyOutputRecord.java +++ b/batch/chunk-simple-nobeans/src/main/java/org/javaee7/batch/samples/chunk/simple/nobeans/MyOutputRecord.java @@ -5,9 +5,10 @@ */ public class MyOutputRecord { private int id; - - public MyOutputRecord() { } - + + public MyOutputRecord() { + } + public MyOutputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyOutputRecord: " + id; diff --git a/batch/chunk-simple-nobeans/src/main/resources/META-INF/batch-jobs/myJob.xml b/batch/chunk-simple-nobeans/src/main/resources/META-INF/batch-jobs/myJob.xml index 09e01274e..32bb5cce3 100644 --- a/batch/chunk-simple-nobeans/src/main/resources/META-INF/batch-jobs/myJob.xml +++ b/batch/chunk-simple-nobeans/src/main/resources/META-INF/batch-jobs/myJob.xml @@ -5,7 +5,7 @@ - + diff --git a/batch/chunk-simple-nobeans/src/test/java/org/javaee7/batch/samples/chunk/simple/nobeans/BatchChunkSimpleNoBeansTest.java b/batch/chunk-simple-nobeans/src/test/java/org/javaee7/batch/samples/chunk/simple/nobeans/BatchChunkSimpleNoBeansTest.java index a7b6a75ad..38916a721 100644 --- a/batch/chunk-simple-nobeans/src/test/java/org/javaee7/batch/samples/chunk/simple/nobeans/BatchChunkSimpleNoBeansTest.java +++ b/batch/chunk-simple-nobeans/src/test/java/org/javaee7/batch/samples/chunk/simple/nobeans/BatchChunkSimpleNoBeansTest.java @@ -45,9 +45,9 @@ public class BatchChunkSimpleNoBeansTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.samples.chunk.simple.nobeans") - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.samples.chunk.simple.nobeans") + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } @@ -80,7 +80,7 @@ public void testBatchChunkSimpleNoBeans() throws Exception { assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue()); // <3> The commit count should be 4. Checkpoint is on every 3rd read, 4 commits for read elements. assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), - metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue()); + metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue()); } } diff --git a/batch/chunk-simple/pom.xml b/batch/chunk-simple/pom.xml index 9bd82c25e..26d264088 100644 --- a/batch/chunk-simple/pom.xml +++ b/batch/chunk-simple/pom.xml @@ -1,23 +1,23 @@ - + + 4.0.0 + - org.javaee7.batch - batch-samples + org.javaee7 + batch 1.0-SNAPSHOT ../pom.xml - - chunk-simple + batch-chunk-simple war - Batch Chunk Simple + Java EE 7 Sample: batch - chunk-simple Chunk Processing - Read, Process, Write org.javaee7 - util-samples + util diff --git a/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyInputRecord.java b/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyInputRecord.java index 3fe42ed21..2c482e96b 100644 --- a/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyInputRecord.java +++ b/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyInputRecord.java @@ -5,9 +5,10 @@ */ public class MyInputRecord { private int id; - - public MyInputRecord() { } - + + public MyInputRecord() { + } + public MyInputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyItemProcessor.java b/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyItemProcessor.java index 0ba398948..249d9e8cc 100644 --- a/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyItemProcessor.java +++ b/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyItemProcessor.java @@ -12,7 +12,7 @@ public class MyItemProcessor implements ItemProcessor { @Override public MyOutputRecord processItem(Object t) { System.out.println("processItem: " + t); - - return (((MyInputRecord)t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord)t).getId() * 2); + + return (((MyInputRecord) t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord) t).getId() * 2); } } diff --git a/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyItemReader.java b/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyItemReader.java index 123a7e806..297e07da9 100644 --- a/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyItemReader.java +++ b/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyItemReader.java @@ -10,15 +10,14 @@ */ @Named public class MyItemReader extends AbstractItemReader { - + private StringTokenizer tokens; - - + @Override public void open(Serializable checkpoint) throws Exception { tokens = new StringTokenizer("1,2,3,4,5,6,7,8,9,10", ","); } - + @Override public MyInputRecord readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyOutputRecord.java b/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyOutputRecord.java index 2d7cc1b72..1907d89dc 100644 --- a/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyOutputRecord.java +++ b/batch/chunk-simple/src/main/java/org/javaee7/batch/chunk/simple/MyOutputRecord.java @@ -5,9 +5,10 @@ */ public class MyOutputRecord { private int id; - - public MyOutputRecord() { } - + + public MyOutputRecord() { + } + public MyOutputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyOutputRecord: " + id; diff --git a/batch/chunk-simple/src/main/resources/META-INF/batch-jobs/myJob.xml b/batch/chunk-simple/src/main/resources/META-INF/batch-jobs/myJob.xml index 09e01274e..32bb5cce3 100644 --- a/batch/chunk-simple/src/main/resources/META-INF/batch-jobs/myJob.xml +++ b/batch/chunk-simple/src/main/resources/META-INF/batch-jobs/myJob.xml @@ -5,7 +5,7 @@ - + diff --git a/batch/chunk-simple/src/test/java/org/javaee7/batch/chunk/simple/ChunkSimpleTest.java b/batch/chunk-simple/src/test/java/org/javaee7/batch/chunk/simple/ChunkSimpleTest.java index a7013a0b1..9df4affa8 100644 --- a/batch/chunk-simple/src/test/java/org/javaee7/batch/chunk/simple/ChunkSimpleTest.java +++ b/batch/chunk-simple/src/test/java/org/javaee7/batch/chunk/simple/ChunkSimpleTest.java @@ -45,10 +45,10 @@ public class ChunkSimpleTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.chunk.simple") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.chunk.simple") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } @@ -81,7 +81,7 @@ public void testChunkSimple() throws Exception { assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue()); // <3> The commit count should be 4. Checkpoint is on every 3rd read, 4 commits for read elements. assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), - metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue()); + metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue()); } } diff --git a/batch/decision/pom.xml b/batch/decision/pom.xml index e3c159e79..13133b66d 100644 --- a/batch/decision/pom.xml +++ b/batch/decision/pom.xml @@ -1,23 +1,22 @@ - - - 4.0.0 - - org.javaee7.batch - batch-samples - 1.0-SNAPSHOT - ../pom.xml - - - decision - war - Batch Decision - Batch DSL - Decision - - - - - org.javaee7 - util-samples - - - + + + 4.0.0 + + + org.javaee7 + batch + 1.0-SNAPSHOT + ../pom.xml + + batch-decision + war + Java EE 7 Sample: batch - decision + Batch DSL - Decision + + + + org.javaee7 + util + + + diff --git a/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet1.java b/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet1.java index 8aa1e18d9..24c872cb6 100644 --- a/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet1.java +++ b/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet1.java @@ -12,7 +12,7 @@ public class MyBatchlet1 extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet 1"); - + return "COMPLETED"; } diff --git a/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet2.java b/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet2.java index d4ec18ff4..2a629e987 100644 --- a/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet2.java +++ b/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet2.java @@ -12,7 +12,7 @@ public class MyBatchlet2 extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet 2"); - + return "COMPLETED"; } diff --git a/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet3.java b/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet3.java index 9fc34b90f..4a7bad38d 100644 --- a/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet3.java +++ b/batch/decision/src/main/java/org/javaee7/batch/decision/MyBatchlet3.java @@ -12,7 +12,7 @@ public class MyBatchlet3 extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet 3"); - + return "COMPLETED"; } diff --git a/batch/decision/src/main/java/org/javaee7/batch/decision/MyDecider.java b/batch/decision/src/main/java/org/javaee7/batch/decision/MyDecider.java index 520249026..6865ceb7f 100644 --- a/batch/decision/src/main/java/org/javaee7/batch/decision/MyDecider.java +++ b/batch/decision/src/main/java/org/javaee7/batch/decision/MyDecider.java @@ -17,5 +17,5 @@ public String decide(StepExecution[] ses) throws Exception { } return "foobar"; } - + } diff --git a/batch/decision/src/test/java/org/javaee7/batch/decision/BatchDecisionTest.java b/batch/decision/src/test/java/org/javaee7/batch/decision/BatchDecisionTest.java index f04211381..3ee804a3d 100644 --- a/batch/decision/src/test/java/org/javaee7/batch/decision/BatchDecisionTest.java +++ b/batch/decision/src/test/java/org/javaee7/batch/decision/BatchDecisionTest.java @@ -52,10 +52,10 @@ public class BatchDecisionTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.decision") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.decision") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } @@ -84,7 +84,7 @@ public void testBatchDecision() throws Exception { // <1> Make sure that only two steps were executed. assertEquals(2, stepExecutions.size()); // <2> Make sure that only the expected steps were executed an in order. - assertArrayEquals(new String[] {"step1", "step3"}, executedSteps.toArray()); + assertArrayEquals(new String[] { "step1", "step3" }, executedSteps.toArray()); // <3> Make sure that this step was never executed. assertFalse(executedSteps.contains("step2")); // <4> Job should be completed. diff --git a/batch/flow/pom.xml b/batch/flow/pom.xml index 144882aa1..026703b74 100644 --- a/batch/flow/pom.xml +++ b/batch/flow/pom.xml @@ -1,23 +1,22 @@ - - - 4.0.0 - - org.javaee7.batch - batch-samples - 1.0-SNAPSHOT - ../pom.xml - - - flow - war - Batch Flow - Batch DSL - Flow - - - - org.javaee7 - util-samples - - - + + + 4.0.0 + + + org.javaee7 + batch + 1.0-SNAPSHOT + ../pom.xml + + batch-flow + war + Java EE 7 Sample: batch - flow + Batch DSL - Flow + + + + org.javaee7 + util + + + diff --git a/batch/flow/src/main/java/org/javaee7/batch/flow/MyBatchlet1.java b/batch/flow/src/main/java/org/javaee7/batch/flow/MyBatchlet1.java index 529b6dac0..9a7fcbdb8 100644 --- a/batch/flow/src/main/java/org/javaee7/batch/flow/MyBatchlet1.java +++ b/batch/flow/src/main/java/org/javaee7/batch/flow/MyBatchlet1.java @@ -12,7 +12,7 @@ public class MyBatchlet1 extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet 1"); - + return "COMPLETED"; } diff --git a/batch/flow/src/main/java/org/javaee7/batch/flow/MyBatchlet2.java b/batch/flow/src/main/java/org/javaee7/batch/flow/MyBatchlet2.java index c1f852706..e8ac078b1 100644 --- a/batch/flow/src/main/java/org/javaee7/batch/flow/MyBatchlet2.java +++ b/batch/flow/src/main/java/org/javaee7/batch/flow/MyBatchlet2.java @@ -12,7 +12,7 @@ public class MyBatchlet2 extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet 2"); - + return "COMPLETED"; } diff --git a/batch/flow/src/main/java/org/javaee7/batch/flow/MyInputRecord.java b/batch/flow/src/main/java/org/javaee7/batch/flow/MyInputRecord.java index 76704d844..558f5761a 100644 --- a/batch/flow/src/main/java/org/javaee7/batch/flow/MyInputRecord.java +++ b/batch/flow/src/main/java/org/javaee7/batch/flow/MyInputRecord.java @@ -5,9 +5,10 @@ */ public class MyInputRecord { private int id; - - public MyInputRecord() { } - + + public MyInputRecord() { + } + public MyInputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/flow/src/main/java/org/javaee7/batch/flow/MyItemReader.java b/batch/flow/src/main/java/org/javaee7/batch/flow/MyItemReader.java index 20adc5ca7..849faf0e3 100644 --- a/batch/flow/src/main/java/org/javaee7/batch/flow/MyItemReader.java +++ b/batch/flow/src/main/java/org/javaee7/batch/flow/MyItemReader.java @@ -9,13 +9,13 @@ */ @Named public class MyItemReader extends AbstractItemReader { - + private final StringTokenizer tokens; - + public MyItemReader() { tokens = new StringTokenizer("1,2,3,4,5", ","); } - + @Override public MyInputRecord readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/flow/src/main/java/org/javaee7/batch/flow/MyOutputRecord.java b/batch/flow/src/main/java/org/javaee7/batch/flow/MyOutputRecord.java index 01491755d..8b11eb024 100644 --- a/batch/flow/src/main/java/org/javaee7/batch/flow/MyOutputRecord.java +++ b/batch/flow/src/main/java/org/javaee7/batch/flow/MyOutputRecord.java @@ -5,9 +5,10 @@ */ public class MyOutputRecord { private int id; - - public MyOutputRecord() { } - + + public MyOutputRecord() { + } + public MyOutputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyOutputRecord: " + id; diff --git a/batch/flow/src/main/resources/META-INF/batch-jobs/myJob.xml b/batch/flow/src/main/resources/META-INF/batch-jobs/myJob.xml index 864af690f..9c0e356e3 100644 --- a/batch/flow/src/main/resources/META-INF/batch-jobs/myJob.xml +++ b/batch/flow/src/main/resources/META-INF/batch-jobs/myJob.xml @@ -8,7 +8,7 @@ - + diff --git a/batch/flow/src/test/java/org/javaee7/batch/flow/BatchFlowTest.java b/batch/flow/src/test/java/org/javaee7/batch/flow/BatchFlowTest.java index 17e53d4f7..43f45521d 100644 --- a/batch/flow/src/test/java/org/javaee7/batch/flow/BatchFlowTest.java +++ b/batch/flow/src/test/java/org/javaee7/batch/flow/BatchFlowTest.java @@ -48,10 +48,10 @@ public class BatchFlowTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.flow") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.flow") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } @@ -88,7 +88,7 @@ public void testBatchFlow() throws Exception { // <1> Make sure all the steps were executed. assertEquals(3, stepExecutions.size()); // <2> Make sure all the steps were executed in order of declaration. - assertArrayEquals(new String[]{"step1", "step2", "step3"}, executedSteps.toArray()); + assertArrayEquals(new String[] { "step1", "step2", "step3" }, executedSteps.toArray()); // <3> Job should be completed. assertEquals(BatchStatus.COMPLETED, jobExecution.getBatchStatus()); } diff --git a/batch/multiple-steps/pom.xml b/batch/multiple-steps/pom.xml index 1bc5694bf..0503728cb 100644 --- a/batch/multiple-steps/pom.xml +++ b/batch/multiple-steps/pom.xml @@ -1,23 +1,22 @@ - - - 4.0.0 - - org.javaee7.batch - batch-samples - 1.0-SNAPSHOT - ../pom.xml - - - multiple-steps - war - Batch Multiple Steps - Batch JSL - Executing Multiple Steps - - - - org.javaee7 - util-samples - - - + + + 4.0.0 + + + org.javaee7 + batch + 1.0-SNAPSHOT + ../pom.xml + + batch-multiple-steps + war + Java EE 7 Sample: batch - multiple-steps + Batch JSL - Executing Multiple Steps + + + + org.javaee7 + util + + + diff --git a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyBatchlet.java b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyBatchlet.java index b312f5f61..227eefe0e 100644 --- a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyBatchlet.java +++ b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyBatchlet.java @@ -12,7 +12,7 @@ public class MyBatchlet extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet"); - + return "COMPLETED"; } diff --git a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyInputRecord.java b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyInputRecord.java index e279a126f..0621f283e 100644 --- a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyInputRecord.java +++ b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyInputRecord.java @@ -5,9 +5,10 @@ */ public class MyInputRecord { private int id; - - public MyInputRecord() { } - + + public MyInputRecord() { + } + public MyInputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyInputRecord: " + id; diff --git a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyItemProcessor.java b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyItemProcessor.java index 912b2837e..fc14d8167 100644 --- a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyItemProcessor.java +++ b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyItemProcessor.java @@ -12,7 +12,7 @@ public class MyItemProcessor implements ItemProcessor { @Override public MyOutputRecord processItem(Object t) { System.out.println("processItem: " + t); - - return (((MyInputRecord)t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord)t).getId() * 2); + + return (((MyInputRecord) t).getId() % 2 == 0) ? null : new MyOutputRecord(((MyInputRecord) t).getId() * 2); } } diff --git a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyItemReader.java b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyItemReader.java index 0ca324373..b16712973 100644 --- a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyItemReader.java +++ b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyItemReader.java @@ -9,13 +9,13 @@ */ @Named public class MyItemReader extends AbstractItemReader { - + private final StringTokenizer tokens; - + public MyItemReader() { tokens = new StringTokenizer("1,2,3,4,5,6,7,8,9,10", ","); } - + @Override public MyInputRecord readItem() { if (tokens.hasMoreTokens()) { diff --git a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyOutputRecord.java b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyOutputRecord.java index 6fc98b1ef..d2d1d6f56 100644 --- a/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyOutputRecord.java +++ b/batch/multiple-steps/src/main/java/org/javaee7/batch/multiple/steps/MyOutputRecord.java @@ -5,9 +5,10 @@ */ public class MyOutputRecord { private int id; - - public MyOutputRecord() { } - + + public MyOutputRecord() { + } + public MyOutputRecord(int id) { this.id = id; } @@ -19,7 +20,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public String toString() { return "MyOutputRecord: " + id; diff --git a/batch/multiple-steps/src/main/resources/META-INF/batch-jobs/myJob.xml b/batch/multiple-steps/src/main/resources/META-INF/batch-jobs/myJob.xml index 3fdae2201..1ca6a67d6 100644 --- a/batch/multiple-steps/src/main/resources/META-INF/batch-jobs/myJob.xml +++ b/batch/multiple-steps/src/main/resources/META-INF/batch-jobs/myJob.xml @@ -5,7 +5,7 @@ - + diff --git a/batch/multiple-steps/src/test/java/org/javaee7/batch/multiple/steps/BatchMultipleStepsTest.java b/batch/multiple-steps/src/test/java/org/javaee7/batch/multiple/steps/BatchMultipleStepsTest.java index 9668a6f07..f4f03fbd9 100644 --- a/batch/multiple-steps/src/test/java/org/javaee7/batch/multiple/steps/BatchMultipleStepsTest.java +++ b/batch/multiple-steps/src/test/java/org/javaee7/batch/multiple/steps/BatchMultipleStepsTest.java @@ -46,10 +46,10 @@ public class BatchMultipleStepsTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.multiple.steps") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.multiple.steps") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } @@ -85,7 +85,7 @@ public void testBatchMultipleSteps() throws Exception { // <1> Make sure all the steps were executed. assertEquals(2, stepExecutions.size()); // <2> Make sure all the steps were executed in order of declaration. - assertArrayEquals(new String[]{"step1", "step2"}, executedSteps.toArray()); + assertArrayEquals(new String[] { "step1", "step2" }, executedSteps.toArray()); // <3> Job should be completed. assertEquals(BatchStatus.COMPLETED, jobExecution.getBatchStatus()); } diff --git a/batch/pom.xml b/batch/pom.xml index d8442991f..4268c6fec 100644 --- a/batch/pom.xml +++ b/batch/pom.xml @@ -1,18 +1,17 @@ - + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.batch - batch-samples + org.javaee7 + batch pom - Java EE 7 Batch Samples + Java EE 7 Sample: batch batchlet-simple @@ -31,6 +30,7 @@ chunk-simple-nobeans scheduling + org.javaee7 diff --git a/batch/scheduling/pom.xml b/batch/scheduling/pom.xml index bdd977c2c..502107061 100644 --- a/batch/scheduling/pom.xml +++ b/batch/scheduling/pom.xml @@ -1,23 +1,23 @@ - - - 4.0.0 - - org.javaee7.batch - batch-samples - 1.0-SNAPSHOT - ../pom.xml - - - scheduling - war - Batch Schedule - Scheduling a Batch Job - - - + + + + 4.0.0 + + + org.javaee7 + batch + 1.0-SNAPSHOT + ../pom.xml + + batch-scheduling + war + Java EE 7 Sample: batch - scheduling + Scheduling a Batch Job + + + org.jboss.shrinkwrap.descriptors shrinkwrap-descriptors-impl-javaee - - - + + + diff --git a/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/AbstractTimerBatch.java b/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/AbstractTimerBatch.java index d91127dc5..aca5e3126 100644 --- a/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/AbstractTimerBatch.java +++ b/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/AbstractTimerBatch.java @@ -18,5 +18,6 @@ public void myJob() { afterRun(); } - protected void afterRun() {} + protected void afterRun() { + } } diff --git a/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyJob.java b/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyJob.java index 16cdb05e7..926fc12a2 100644 --- a/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyJob.java +++ b/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyJob.java @@ -16,5 +16,6 @@ public void run() { afterRun(); } - protected void afterRun() {} + protected void afterRun() { + } } diff --git a/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyManagedScheduledBatchBean.java b/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyManagedScheduledBatchBean.java index ae0aa6671..c628b15ff 100644 --- a/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyManagedScheduledBatchBean.java +++ b/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyManagedScheduledBatchBean.java @@ -50,7 +50,7 @@ public boolean skipRun(LastExecution lastExecutionInfo, Date scheduledRunTime) { for (Long executedBatch : executedBatchs) { if (!BatchRuntime.getJobOperator().getJobExecution(executedBatch).getBatchStatus().equals( - BatchStatus.COMPLETED)) { + BatchStatus.COMPLETED)) { return true; } } diff --git a/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyTimerScheduleBean.java b/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyTimerScheduleBean.java index 7405b0097..ed52cbcfa 100644 --- a/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyTimerScheduleBean.java +++ b/batch/scheduling/src/main/java/org/javaee7/batch/samples/scheduling/MyTimerScheduleBean.java @@ -8,4 +8,5 @@ */ @Startup @Singleton -public class MyTimerScheduleBean extends AbstractTimerBatch {} +public class MyTimerScheduleBean extends AbstractTimerBatch { +} diff --git a/batch/scheduling/src/test/java/org/javaee7/batch/samples/scheduling/ManagedScheduledBatchTest.java b/batch/scheduling/src/test/java/org/javaee7/batch/samples/scheduling/ManagedScheduledBatchTest.java index 1c8e7ef99..275b05734 100644 --- a/batch/scheduling/src/test/java/org/javaee7/batch/samples/scheduling/ManagedScheduledBatchTest.java +++ b/batch/scheduling/src/test/java/org/javaee7/batch/samples/scheduling/ManagedScheduledBatchTest.java @@ -53,18 +53,18 @@ public static WebArchive createDeployment() { BeansDescriptor beansXml = Descriptors.create(BeansDescriptor.class); WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClasses( - MyBatchlet.class, - MyJob.class, - MyJobAlternative.class, - MyManagedScheduledBatch.class, - MyManagedScheduledBatchBean.class, - MyManagedScheduledBatchAlternative.class) - .addAsWebInfResource( - new StringAsset(beansXml.createAlternatives().clazz( - MyManagedScheduledBatchAlternative.class.getName()).up().exportAsString()), - beansXml.getDescriptorName()) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClasses( + MyBatchlet.class, + MyJob.class, + MyJobAlternative.class, + MyManagedScheduledBatch.class, + MyManagedScheduledBatchBean.class, + MyManagedScheduledBatchAlternative.class) + .addAsWebInfResource( + new StringAsset(beansXml.createAlternatives().clazz( + MyManagedScheduledBatchAlternative.class.getName()).up().exportAsString()), + beansXml.getDescriptorName()) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } @@ -88,7 +88,7 @@ public void testTimeScheduleBatch() throws Exception { for (Long executedBatch : MyJob.executedBatchs) { assertEquals(BatchStatus.COMPLETED, - BatchRuntime.getJobOperator().getJobExecution(executedBatch).getBatchStatus()); + BatchRuntime.getJobOperator().getJobExecution(executedBatch).getBatchStatus()); } } } diff --git a/batch/scheduling/src/test/java/org/javaee7/batch/samples/scheduling/TimerScheduleBatchTest.java b/batch/scheduling/src/test/java/org/javaee7/batch/samples/scheduling/TimerScheduleBatchTest.java index 488b03a54..e125d2430 100644 --- a/batch/scheduling/src/test/java/org/javaee7/batch/samples/scheduling/TimerScheduleBatchTest.java +++ b/batch/scheduling/src/test/java/org/javaee7/batch/samples/scheduling/TimerScheduleBatchTest.java @@ -46,13 +46,13 @@ public class TimerScheduleBatchTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClasses( - MyBatchlet.class, - MyJob.class, - AbstractTimerBatch.class, - MyTimerScheduleAlternative.class) - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClasses( + MyBatchlet.class, + MyJob.class, + AbstractTimerBatch.class, + MyTimerScheduleAlternative.class) + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; @@ -75,7 +75,7 @@ public void testTimeScheduleBatch() throws Exception { for (Long executedBatch : MyTimerScheduleAlternative.executedBatchs) { assertEquals(BatchStatus.COMPLETED, - BatchRuntime.getJobOperator().getJobExecution(executedBatch).getBatchStatus()); + BatchRuntime.getJobOperator().getJobExecution(executedBatch).getBatchStatus()); } } } diff --git a/batch/split/pom.xml b/batch/split/pom.xml index 778b07c3e..ba2e680c5 100644 --- a/batch/split/pom.xml +++ b/batch/split/pom.xml @@ -1,23 +1,22 @@ - - - 4.0.0 - - org.javaee7.batch - batch-samples - 1.0-SNAPSHOT - ../pom.xml - - - split - war - Batch Split - Batch JSL - Splitting Steps - - - - org.javaee7 - util-samples - - - + + + 4.0.0 + + + org.javaee7 + batch + 1.0-SNAPSHOT + ../pom.xml + + batch-split + war + Java EE 7 Sample: batch - split + Batch JSL - Splitting Steps + + + + org.javaee7 + util + + + diff --git a/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet1.java b/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet1.java index cba2b1212..18266b8e6 100644 --- a/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet1.java +++ b/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet1.java @@ -12,7 +12,7 @@ public class MyBatchlet1 extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet 1"); - + return "COMPLETED"; } diff --git a/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet2.java b/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet2.java index 985ebf2ea..607b82575 100644 --- a/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet2.java +++ b/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet2.java @@ -12,7 +12,7 @@ public class MyBatchlet2 extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet 2"); - + return "COMPLETED"; } diff --git a/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet3.java b/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet3.java index e5919f2d3..dad22a5ba 100644 --- a/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet3.java +++ b/batch/split/src/main/java/org/javaee7/batch/split/MyBatchlet3.java @@ -12,7 +12,7 @@ public class MyBatchlet3 extends AbstractBatchlet { @Override public String process() { System.out.println("Running inside a batchlet 3"); - + return "COMPLETED"; } diff --git a/batch/split/src/test/java/org/javaee7/batch/split/BatchSplitTest.java b/batch/split/src/test/java/org/javaee7/batch/split/BatchSplitTest.java index a94810779..ef95949b5 100644 --- a/batch/split/src/test/java/org/javaee7/batch/split/BatchSplitTest.java +++ b/batch/split/src/test/java/org/javaee7/batch/split/BatchSplitTest.java @@ -51,10 +51,10 @@ public class BatchSplitTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(BatchTestHelper.class) - .addPackage("org.javaee7.batch.split") - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addAsResource("META-INF/batch-jobs/myJob.xml"); + .addClass(BatchTestHelper.class) + .addPackage("org.javaee7.batch.split") + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addAsResource("META-INF/batch-jobs/myJob.xml"); System.out.println(war.toString(true)); return war; } diff --git a/cdi/README.md b/cdi/README.md new file mode 100644 index 000000000..24f431b75 --- /dev/null +++ b/cdi/README.md @@ -0,0 +1,32 @@ +# Java EE 7 Samples: CDI 1.1 # + +The [JSR 346](https://jcp.org/en/jsr/detail?id=346) updates and clarifications to CDI 1.0 along much requested features. + +## Samples ## + + - vetoed + - pkg-level + - decorators + - bean-discovery-all + - bean-discovery-annotated + - bean-discovery-none + - exclude-filter + - built-in + - interceptors + - interceptors-priority + - nobeans-xml + - beansxml-noversion + - beanmanager + - extension + - scopes + - alternatives + - alternatives-priority + - nobeans-el-injection + - nobeans-el-injection-flowscoped + - events + +## How to run + +More information on how to run can be found at: + + diff --git a/cdi/alternatives-priority/pom.xml b/cdi/alternatives-priority/pom.xml index 429e631eb..8e72f8a52 100644 --- a/cdi/alternatives-priority/pom.xml +++ b/cdi/alternatives-priority/pom.xml @@ -1,12 +1,13 @@ 4.0.0 + - org.javaee7.cdi - cdi-samples + org.javaee7 + cdi 1.0-SNAPSHOT ../pom.xml - - alternatives-priority + cdi-alternatives-priority + Java EE 7 Sample: cdi - alternatives-priority diff --git a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/FancyGreeting.java b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/FancyGreeting.java index d89a8e809..f9f62b5e1 100644 --- a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/FancyGreeting.java +++ b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/FancyGreeting.java @@ -10,8 +10,8 @@ @Priority(1000) @Alternative public class FancyGreeting implements Greeting { - @Override - public String greet(String name) { - return "Nice to meet you, hello" + name; - } + @Override + public String greet(String name) { + return "Nice to meet you, hello" + name; + } } diff --git a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/Greeting.java b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/Greeting.java index 9d52eb564..dc5e3d3ca 100644 --- a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/Greeting.java +++ b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/Greeting.java @@ -5,5 +5,5 @@ * @author Radim Hanus */ public interface Greeting { - public String greet(String name); + public String greet(String name); } diff --git a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/PriorityGreeting.java b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/PriorityGreeting.java index 5e0371268..239b5e206 100644 --- a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/PriorityGreeting.java +++ b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/PriorityGreeting.java @@ -9,8 +9,8 @@ @Priority(2000) @Alternative public class PriorityGreeting implements Greeting { - @Override - public String greet(String name) { - return "Hey " + name + " I should be selected since I've got the highest priority !"; - } + @Override + public String greet(String name) { + return "Hey " + name + " I should be selected since I've got the highest priority !"; + } } diff --git a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/ProducerMethodGreeting.java b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/ProducerMethodGreeting.java index 1f9978ade..953ce2509 100644 --- a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/ProducerMethodGreeting.java +++ b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/ProducerMethodGreeting.java @@ -10,9 +10,9 @@ @Priority(3000) public class ProducerMethodGreeting { - @Produces - @Alternative - public Greeting getGreeting() { - return new SimpleGreeting(); - } + @Produces + @Alternative + public Greeting getGreeting() { + return new SimpleGreeting(); + } } diff --git a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/SimpleGreeting.java b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/SimpleGreeting.java index 93c6b2f8c..c7a76cae9 100644 --- a/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/SimpleGreeting.java +++ b/cdi/alternatives-priority/src/main/java/org/javaee7/cdi/alternatives/priority/SimpleGreeting.java @@ -8,8 +8,8 @@ */ @Alternative public class SimpleGreeting implements Greeting { - @Override - public String greet(String name) { - return "Hello " + name; - } + @Override + public String greet(String name) { + return "Hello " + name; + } } diff --git a/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/GreetingTest.java b/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/GreetingTest.java index ee4156046..f7e516300 100644 --- a/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/GreetingTest.java +++ b/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/GreetingTest.java @@ -19,24 +19,24 @@ */ @RunWith(Arquillian.class) public class GreetingTest { - @Deployment - public static Archive deploy() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class, PriorityGreeting.class) - .addAsManifestResource("beans-empty.xml", "beans.xml"); - } + @Deployment + public static Archive deploy() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class, PriorityGreeting.class) + .addAsManifestResource("beans-empty.xml", "beans.xml"); + } - @Inject - Greeting bean; + @Inject + Greeting bean; - @Test - public void should_bean_be_injected() throws Exception { - assertThat(bean, is(notNullValue())); - } + @Test + public void should_bean_be_injected() throws Exception { + assertThat(bean, is(notNullValue())); + } - @Test - public void should_bean_be_priority() throws Exception { - // because it has the highest priority from Priority annotated alternatives - assertThat(bean, instanceOf(PriorityGreeting.class)); - } + @Test + public void should_bean_be_priority() throws Exception { + // because it has the highest priority from Priority annotated alternatives + assertThat(bean, instanceOf(PriorityGreeting.class)); + } } diff --git a/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/MixedGreetingTest.java b/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/MixedGreetingTest.java index 21437c780..0a02c33d4 100644 --- a/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/MixedGreetingTest.java +++ b/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/MixedGreetingTest.java @@ -20,19 +20,19 @@ */ @RunWith(Arquillian.class) public class MixedGreetingTest { - @Deployment - public static Archive deploy() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class) - .addAsManifestResource("beans-alternatives.xml", "beans.xml"); - } + @Deployment + public static Archive deploy() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class) + .addAsManifestResource("beans-alternatives.xml", "beans.xml"); + } - @Inject - BeanManager beanManager; + @Inject + BeanManager beanManager; - @Test - public void should_be_ambiguous() throws Exception { - Set> beans = beanManager.getBeans(Greeting.class); - assertTrue(beans.size() == 2); - } + @Test + public void should_be_ambiguous() throws Exception { + Set> beans = beanManager.getBeans(Greeting.class); + assertTrue(beans.size() == 2); + } } diff --git a/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/ProducerMethodGreetingTest.java b/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/ProducerMethodGreetingTest.java index 8aa1c65b2..7d18965e7 100644 --- a/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/ProducerMethodGreetingTest.java +++ b/cdi/alternatives-priority/src/test/java/org/javaee7/cdi/alternatives/priority/ProducerMethodGreetingTest.java @@ -18,24 +18,24 @@ */ @RunWith(Arquillian.class) public class ProducerMethodGreetingTest { - @Deployment - public static Archive deploy() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class, PriorityGreeting.class, ProducerMethodGreeting.class) - .addAsManifestResource("beans-empty.xml", "beans.xml"); - } + @Deployment + public static Archive deploy() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class, PriorityGreeting.class, ProducerMethodGreeting.class) + .addAsManifestResource("beans-empty.xml", "beans.xml"); + } - @Inject - Greeting bean; + @Inject + Greeting bean; - @Test - public void should_bean_be_injected() throws Exception { - assertThat(bean, is(notNullValue())); - } + @Test + public void should_bean_be_injected() throws Exception { + assertThat(bean, is(notNullValue())); + } - @Test - public void should_bean_be_simple() throws Exception { - // because it has the highest priority from Priority annotated alternatives - assertThat(bean, instanceOf(SimpleGreeting.class)); - } + @Test + public void should_bean_be_simple() throws Exception { + // because it has the highest priority from Priority annotated alternatives + assertThat(bean, instanceOf(SimpleGreeting.class)); + } } diff --git a/cdi/alternatives-priority/src/test/resources/beans-alternatives.xml b/cdi/alternatives-priority/src/test/resources/beans-alternatives.xml index 0e3a259ec..bbf11eb5d 100644 --- a/cdi/alternatives-priority/src/test/resources/beans-alternatives.xml +++ b/cdi/alternatives-priority/src/test/resources/beans-alternatives.xml @@ -1,11 +1,11 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee%20http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" + bean-discovery-mode="all"> - - org.javaee7.cdi.alternatives.priority.SimpleGreeting - + + org.javaee7.cdi.alternatives.priority.SimpleGreeting + diff --git a/cdi/alternatives-priority/src/test/resources/beans-empty.xml b/cdi/alternatives-priority/src/test/resources/beans-empty.xml index 34f9b5c66..c02d76e98 100644 --- a/cdi/alternatives-priority/src/test/resources/beans-empty.xml +++ b/cdi/alternatives-priority/src/test/resources/beans-empty.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee%20http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" + bean-discovery-mode="all"> diff --git a/cdi/alternatives/pom.xml b/cdi/alternatives/pom.xml index 51825e842..84db69baa 100644 --- a/cdi/alternatives/pom.xml +++ b/cdi/alternatives/pom.xml @@ -1,12 +1,13 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - alternatives - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + cdi-alternatives + Java EE 7 Sample: cdi - alternatives + diff --git a/cdi/alternatives/src/main/java/org/javaee7/cdi/alternatives/FancyGreeting.java b/cdi/alternatives/src/main/java/org/javaee7/cdi/alternatives/FancyGreeting.java index 44836f0d4..0e2cd2824 100644 --- a/cdi/alternatives/src/main/java/org/javaee7/cdi/alternatives/FancyGreeting.java +++ b/cdi/alternatives/src/main/java/org/javaee7/cdi/alternatives/FancyGreeting.java @@ -12,5 +12,5 @@ public class FancyGreeting implements Greeting { public String greet(String name) { return "Nice to meet you, hello" + name; } - + } diff --git a/cdi/alternatives/src/main/java/org/javaee7/cdi/alternatives/SimpleGreeting.java b/cdi/alternatives/src/main/java/org/javaee7/cdi/alternatives/SimpleGreeting.java index d6b64ae07..cf09b544b 100644 --- a/cdi/alternatives/src/main/java/org/javaee7/cdi/alternatives/SimpleGreeting.java +++ b/cdi/alternatives/src/main/java/org/javaee7/cdi/alternatives/SimpleGreeting.java @@ -12,5 +12,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/alternatives/src/test/java/org/javaee7/cdi/alternatives/GreetingTest.java b/cdi/alternatives/src/test/java/org/javaee7/cdi/alternatives/GreetingTest.java index 23db97f08..21632028e 100644 --- a/cdi/alternatives/src/test/java/org/javaee7/cdi/alternatives/GreetingTest.java +++ b/cdi/alternatives/src/test/java/org/javaee7/cdi/alternatives/GreetingTest.java @@ -23,11 +23,12 @@ public class GreetingTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class) - .addAsManifestResource("beans.xml"); + .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class) + .addAsManifestResource("beans.xml"); } - @Inject Greeting bean; + @Inject + Greeting bean; @Test public void should_bean_be_injected() throws Exception { diff --git a/cdi/bean-discovery-all/pom.xml b/cdi/bean-discovery-all/pom.xml index 76d487c68..0252e5d78 100644 --- a/cdi/bean-discovery-all/pom.xml +++ b/cdi/bean-discovery-all/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - bean-discovery-all - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-bean-discovery-all + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - bean-discovery-all + diff --git a/cdi/bean-discovery-all/src/main/java/org/javaee7/cdi/bean/discovery/SimpleGreeting.java b/cdi/bean-discovery-all/src/main/java/org/javaee7/cdi/bean/discovery/SimpleGreeting.java index 86d00d733..4a035c859 100644 --- a/cdi/bean-discovery-all/src/main/java/org/javaee7/cdi/bean/discovery/SimpleGreeting.java +++ b/cdi/bean-discovery-all/src/main/java/org/javaee7/cdi/bean/discovery/SimpleGreeting.java @@ -9,5 +9,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/bean-discovery-all/src/test/java/org/javaee7/cdi/nobeans/xml/GreetingTest.java b/cdi/bean-discovery-all/src/test/java/org/javaee7/cdi/nobeans/xml/GreetingTest.java index 673889a5b..8fe1bcec7 100644 --- a/cdi/bean-discovery-all/src/test/java/org/javaee7/cdi/nobeans/xml/GreetingTest.java +++ b/cdi/bean-discovery-all/src/test/java/org/javaee7/cdi/nobeans/xml/GreetingTest.java @@ -25,11 +25,12 @@ public class GreetingTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, SimpleGreeting.class) - .addAsManifestResource("beans.xml"); + .addClasses(Greeting.class, SimpleGreeting.class) + .addAsManifestResource("beans.xml"); } - @Inject Greeting bean; + @Inject + Greeting bean; @Test public void should_bean_be_injected() throws Exception { diff --git a/cdi/bean-discovery-annotated/pom.xml b/cdi/bean-discovery-annotated/pom.xml index f393874ea..ccba6f839 100644 --- a/cdi/bean-discovery-annotated/pom.xml +++ b/cdi/bean-discovery-annotated/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - bean-discovery-annotated - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-bean-discovery-annotated + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - bean-discovery-annotated + diff --git a/cdi/bean-discovery-annotated/src/main/java/org/javaee7/cdi/bean/discovery/annotated/FancyGreeting.java b/cdi/bean-discovery-annotated/src/main/java/org/javaee7/cdi/bean/discovery/annotated/FancyGreeting.java index 761115179..c60a0186a 100644 --- a/cdi/bean-discovery-annotated/src/main/java/org/javaee7/cdi/bean/discovery/annotated/FancyGreeting.java +++ b/cdi/bean-discovery-annotated/src/main/java/org/javaee7/cdi/bean/discovery/annotated/FancyGreeting.java @@ -9,5 +9,5 @@ public class FancyGreeting implements Greeting { public String greet(String name) { return "Hello " + name + ":)"; } - + } diff --git a/cdi/bean-discovery-annotated/src/main/java/org/javaee7/cdi/bean/discovery/annotated/SimpleGreeting.java b/cdi/bean-discovery-annotated/src/main/java/org/javaee7/cdi/bean/discovery/annotated/SimpleGreeting.java index 90ad4762b..7661e7bcb 100644 --- a/cdi/bean-discovery-annotated/src/main/java/org/javaee7/cdi/bean/discovery/annotated/SimpleGreeting.java +++ b/cdi/bean-discovery-annotated/src/main/java/org/javaee7/cdi/bean/discovery/annotated/SimpleGreeting.java @@ -12,5 +12,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/bean-discovery-annotated/src/test/java/org/javaee7/cdi/bean/discovery/annotated/GreetingTest.java b/cdi/bean-discovery-annotated/src/test/java/org/javaee7/cdi/bean/discovery/annotated/GreetingTest.java index 3ea665575..7e0600585 100644 --- a/cdi/bean-discovery-annotated/src/test/java/org/javaee7/cdi/bean/discovery/annotated/GreetingTest.java +++ b/cdi/bean-discovery-annotated/src/test/java/org/javaee7/cdi/bean/discovery/annotated/GreetingTest.java @@ -23,16 +23,18 @@ public class GreetingTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class) - .addAsManifestResource("beans.xml"); + .addClasses(Greeting.class, SimpleGreeting.class, FancyGreeting.class) + .addAsManifestResource("beans.xml"); } - @Inject Greeting bean; + @Inject + Greeting bean; @Test public void should_bean_be_injected() throws Exception { assertThat(bean, is(CoreMatchers.notNullValue())); } + @Test public void should_bean_be_simple() throws Exception { // because SimpleGreeting is annotated (scope) diff --git a/cdi/bean-discovery-none/pom.xml b/cdi/bean-discovery-none/pom.xml index 56264b52b..f4ab5808b 100644 --- a/cdi/bean-discovery-none/pom.xml +++ b/cdi/bean-discovery-none/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - bean-discovery-none - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-bean-discovery-none + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - bean-discovery-none + diff --git a/cdi/bean-discovery-none/src/main/java/org/javaee7/cdi/bean/discovery/none/FancyGreeting.java b/cdi/bean-discovery-none/src/main/java/org/javaee7/cdi/bean/discovery/none/FancyGreeting.java index 3c7fa95c7..19befb81d 100644 --- a/cdi/bean-discovery-none/src/main/java/org/javaee7/cdi/bean/discovery/none/FancyGreeting.java +++ b/cdi/bean-discovery-none/src/main/java/org/javaee7/cdi/bean/discovery/none/FancyGreeting.java @@ -9,5 +9,5 @@ public class FancyGreeting implements Greeting { public String greet(String name) { return "Hello " + name + ":)"; } - + } diff --git a/cdi/bean-discovery-none/src/test/java/org/javaee7/cdi/bean/discovery/none/GreetingTest.java b/cdi/bean-discovery-none/src/test/java/org/javaee7/cdi/bean/discovery/none/GreetingTest.java index 8c8cc6d55..ed0d226db 100644 --- a/cdi/bean-discovery-none/src/test/java/org/javaee7/cdi/bean/discovery/none/GreetingTest.java +++ b/cdi/bean-discovery-none/src/test/java/org/javaee7/cdi/bean/discovery/none/GreetingTest.java @@ -22,11 +22,12 @@ public class GreetingTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, FancyGreeting.class) - .addAsManifestResource("beans.xml"); + .addClasses(Greeting.class, FancyGreeting.class) + .addAsManifestResource("beans.xml"); } - @Inject BeanManager beanManager; + @Inject + BeanManager beanManager; @Test public void should_bean_be_injected() throws Exception { diff --git a/cdi/beanmanager/pom.xml b/cdi/beanmanager/pom.xml index 5c676935d..227646024 100644 --- a/cdi/beanmanager/pom.xml +++ b/cdi/beanmanager/pom.xml @@ -1,18 +1,20 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi-samples - beanmanager - 1.0-SNAPSHOT - war - - gfv3ee6 - - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-beanmanager + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - beanmanager + + + gfv3ee6 + + diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SimpleGreeting.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SimpleGreeting.java index f68193cab..1eea9fba6 100644 --- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SimpleGreeting.java +++ b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SimpleGreeting.java @@ -9,5 +9,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SmileyGreeting.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SmileyGreeting.java index 383e9a468..d0de2d9c1 100644 --- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SmileyGreeting.java +++ b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SmileyGreeting.java @@ -9,5 +9,5 @@ public class SmileyGreeting extends SimpleGreeting { public String greet(String name) { return super.greet(name) + " :-)"; } - + } diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java index 20e389a7e..ca7343964 100644 --- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java +++ b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java @@ -15,9 +15,9 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServletCurrent"}) +@WebServlet(urlPatterns = { "/TestServletCurrent" }) public class TestServletCurrent extends HttpServlet { - + /** * Processes requests for both HTTP * GET and @@ -29,19 +29,19 @@ public class TestServletCurrent extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("BeanManager using CDI.current"); + out.println("BeanManager using CDI.current"); out.println(""); out.println(""); out.println("

BeanManager using CDI.current

"); // Second way to get BeanManager BeanManager bm = CDI.current().getBeanManager(); - + Set> beans = bm.getBeans(Greeting.class); for (Bean b : beans) { out.println(b.getBeanClass().getName() + "
"); @@ -50,7 +50,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println(""); } } - + // /** * Handles the HTTP @@ -63,7 +63,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -78,7 +78,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java index 7eee13239..6c11b4c1d 100644 --- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java +++ b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java @@ -15,12 +15,13 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServletInject"}) +@WebServlet(urlPatterns = { "/TestServletInject" }) public class TestServletInject extends HttpServlet { - + // First way to get BeanManager - @Inject BeanManager bm; - + @Inject + BeanManager bm; + /** * Processes requests for both HTTP * GET and @@ -32,13 +33,13 @@ public class TestServletInject extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("BeanManager using Injection"); + out.println("BeanManager using Injection"); out.println(""); out.println(""); out.println("

BeanManager using Injection

"); @@ -50,7 +51,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println(""); } } - + // /** * Handles the HTTP @@ -63,7 +64,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -78,7 +79,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java index e6520ad84..99d5bedc8 100644 --- a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java +++ b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java @@ -18,9 +18,9 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServletJNDI"}) +@WebServlet(urlPatterns = { "/TestServletJNDI" }) public class TestServletJNDI extends HttpServlet { - + /** * Processes requests for both HTTP * GET and @@ -32,13 +32,13 @@ public class TestServletJNDI extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("BeanManager using JNDI"); + out.println("BeanManager using JNDI"); out.println(""); out.println(""); out.println("

BeanManager using JNDI

"); @@ -46,7 +46,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re BeanManager bm = null; try { InitialContext context = new InitialContext(); - bm = (BeanManager)context.lookup("java:comp/BeanManager"); + bm = (BeanManager) context.lookup("java:comp/BeanManager"); } catch (NamingException | NullPointerException ex) { ex.printStackTrace(out); } @@ -58,7 +58,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println(""); } } - + // /** * Handles the HTTP @@ -71,7 +71,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -86,7 +86,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/beansxml-noversion/pom.xml b/cdi/beansxml-noversion/pom.xml index 893c36954..110e70f35 100644 --- a/cdi/beansxml-noversion/pom.xml +++ b/cdi/beansxml-noversion/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - beansxml-noversion - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-beansxml-noversion + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - beansxml-noversion + diff --git a/cdi/beansxml-noversion/src/test/java/org/javaee7/cdi/beansxml/noversion/GreetingTest.java b/cdi/beansxml-noversion/src/test/java/org/javaee7/cdi/beansxml/noversion/GreetingTest.java index 424496be6..99a245943 100644 --- a/cdi/beansxml-noversion/src/test/java/org/javaee7/cdi/beansxml/noversion/GreetingTest.java +++ b/cdi/beansxml-noversion/src/test/java/org/javaee7/cdi/beansxml/noversion/GreetingTest.java @@ -22,12 +22,14 @@ public class GreetingTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(AnnotatedBean.class, NotAnnotatedBean.class) - .addAsManifestResource("beans.xml"); + .addClasses(AnnotatedBean.class, NotAnnotatedBean.class) + .addAsManifestResource("beans.xml"); } - @Inject AnnotatedBean annotatedBean; - @Inject NotAnnotatedBean notAnnotatedBean; + @Inject + AnnotatedBean annotatedBean; + @Inject + NotAnnotatedBean notAnnotatedBean; @Test public void should_bean_be_injected() throws Exception { diff --git a/cdi/built-in/pom.xml b/cdi/built-in/pom.xml index db3b2759d..4b1a5413c 100644 --- a/cdi/built-in/pom.xml +++ b/cdi/built-in/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - built-in - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-built-in + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - built-in + diff --git a/cdi/built-in/src/main/java/org/javaee7/cdi/built/in/SimpleGreeting.java b/cdi/built-in/src/main/java/org/javaee7/cdi/built/in/SimpleGreeting.java index f8d95fd3a..6b2b653f7 100644 --- a/cdi/built-in/src/main/java/org/javaee7/cdi/built/in/SimpleGreeting.java +++ b/cdi/built-in/src/main/java/org/javaee7/cdi/built/in/SimpleGreeting.java @@ -19,17 +19,22 @@ @Stateless @TransactionManagement(TransactionManagementType.BEAN) public class SimpleGreeting implements Greeting { - - @Inject HttpServletRequest httpServletRequest; - - @Inject HttpSession httpSession; - - @Inject ServletContext servletContext; - - @Inject UserTransaction ut; - - @Inject Principal principal; - + + @Inject + HttpServletRequest httpServletRequest; + + @Inject + HttpSession httpSession; + + @Inject + ServletContext servletContext; + + @Inject + UserTransaction ut; + + @Inject + Principal principal; + @Override public String greet(String name) { try { @@ -43,5 +48,5 @@ public String greet(String name) { } return "Hello " + name; } - + } diff --git a/cdi/built-in/src/main/java/org/javaee7/cdi/built/in/TestServlet.java b/cdi/built-in/src/main/java/org/javaee7/cdi/built/in/TestServlet.java index d3480e2c6..0ea5d188b 100644 --- a/cdi/built-in/src/main/java/org/javaee7/cdi/built/in/TestServlet.java +++ b/cdi/built-in/src/main/java/org/javaee7/cdi/built/in/TestServlet.java @@ -13,11 +13,12 @@ * * @author arungup */ -@WebServlet(name = "TestServlet", urlPatterns = {"/TestServlet"}) +@WebServlet(name = "TestServlet", urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { - @Inject Greeting greeting; - + @Inject + Greeting greeting; + /** * Processes requests for both HTTP * GET and @@ -29,13 +30,13 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); @@ -58,7 +59,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -73,7 +74,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/decorators/pom.xml b/cdi/decorators/pom.xml index 963cd51dd..cffd056dc 100644 --- a/cdi/decorators/pom.xml +++ b/cdi/decorators/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - decorators - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-decorators + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - decorators + diff --git a/cdi/decorators/src/main/java/org/javaee7/cdi/decorators/MyDecorator.java b/cdi/decorators/src/main/java/org/javaee7/cdi/decorators/MyDecorator.java index 3554828ee..910e2ab8c 100644 --- a/cdi/decorators/src/main/java/org/javaee7/cdi/decorators/MyDecorator.java +++ b/cdi/decorators/src/main/java/org/javaee7/cdi/decorators/MyDecorator.java @@ -11,11 +11,14 @@ @Decorator public class MyDecorator implements Greeting { - @Inject @Delegate @Any Greeting greeting; - + @Inject + @Delegate + @Any + Greeting greeting; + @Override public String greet(String name) { return greeting.greet(name + " very much!"); } - + } diff --git a/cdi/decorators/src/main/java/org/javaee7/cdi/decorators/SimpleGreeting.java b/cdi/decorators/src/main/java/org/javaee7/cdi/decorators/SimpleGreeting.java index cc99bc416..c5160a584 100644 --- a/cdi/decorators/src/main/java/org/javaee7/cdi/decorators/SimpleGreeting.java +++ b/cdi/decorators/src/main/java/org/javaee7/cdi/decorators/SimpleGreeting.java @@ -9,5 +9,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/decorators/src/test/java/org/javaee7/cdi/decorators/DecoratorTest.java b/cdi/decorators/src/test/java/org/javaee7/cdi/decorators/DecoratorTest.java index a6b2ec166..8993377fd 100644 --- a/cdi/decorators/src/test/java/org/javaee7/cdi/decorators/DecoratorTest.java +++ b/cdi/decorators/src/test/java/org/javaee7/cdi/decorators/DecoratorTest.java @@ -27,8 +27,8 @@ public class DecoratorTest { @Deployment public static Archive deploy() throws URISyntaxException { return ShrinkWrap.create(JavaArchive.class) - .addAsManifestResource(new File("src/main/webapp/WEB-INF/beans.xml"), "beans.xml") - .addPackage(SimpleGreeting.class.getPackage()); + .addAsManifestResource(new File("src/main/webapp/WEB-INF/beans.xml"), "beans.xml") + .addPackage(SimpleGreeting.class.getPackage()); } @Test diff --git a/cdi/events/pom.xml b/cdi/events/pom.xml index 050b5a491..6ce3a0207 100644 --- a/cdi/events/pom.xml +++ b/cdi/events/pom.xml @@ -1,12 +1,13 @@ 4.0.0 + - org.javaee7.cdi - cdi-samples + org.javaee7 + cdi 1.0-SNAPSHOT ../pom.xml - - events + cdi-events + Java EE 7 Sample: cdi - events diff --git a/cdi/events/src/main/java/org/javaee7/cdi/events/EventReceiver.java b/cdi/events/src/main/java/org/javaee7/cdi/events/EventReceiver.java index 8a28a1b43..cefb35458 100644 --- a/cdi/events/src/main/java/org/javaee7/cdi/events/EventReceiver.java +++ b/cdi/events/src/main/java/org/javaee7/cdi/events/EventReceiver.java @@ -4,5 +4,5 @@ * @author Radim Hanus */ public interface EventReceiver { - String getGreet(); + String getGreet(); } diff --git a/cdi/events/src/main/java/org/javaee7/cdi/events/EventSender.java b/cdi/events/src/main/java/org/javaee7/cdi/events/EventSender.java index ecf31716d..dc73d4991 100644 --- a/cdi/events/src/main/java/org/javaee7/cdi/events/EventSender.java +++ b/cdi/events/src/main/java/org/javaee7/cdi/events/EventSender.java @@ -4,5 +4,5 @@ * @author Radim Hanus */ public interface EventSender { - void send(String message); + void send(String message); } diff --git a/cdi/events/src/main/java/org/javaee7/cdi/events/GreetingReceiver.java b/cdi/events/src/main/java/org/javaee7/cdi/events/GreetingReceiver.java index f7ff59d20..05bbcbeb6 100644 --- a/cdi/events/src/main/java/org/javaee7/cdi/events/GreetingReceiver.java +++ b/cdi/events/src/main/java/org/javaee7/cdi/events/GreetingReceiver.java @@ -9,14 +9,14 @@ */ @SessionScoped public class GreetingReceiver implements EventReceiver, Serializable { - private String greet = "Willkommen"; + private String greet = "Willkommen"; - void receive(@Observes String greet) { - this.greet = greet; - } + void receive(@Observes String greet) { + this.greet = greet; + } - @Override - public String getGreet() { - return greet; - } + @Override + public String getGreet() { + return greet; + } } diff --git a/cdi/events/src/main/java/org/javaee7/cdi/events/GreetingSender.java b/cdi/events/src/main/java/org/javaee7/cdi/events/GreetingSender.java index 15b43692c..33f3cdeef 100644 --- a/cdi/events/src/main/java/org/javaee7/cdi/events/GreetingSender.java +++ b/cdi/events/src/main/java/org/javaee7/cdi/events/GreetingSender.java @@ -7,11 +7,11 @@ * @author Radim Hanus */ public class GreetingSender implements EventSender { - @Inject - private Event event; + @Inject + private Event event; - @Override - public void send(String message) { - event.fire(message); - } + @Override + public void send(String message) { + event.fire(message); + } } diff --git a/cdi/events/src/test/java/org/javaee7/cdi/events/GreetingTest.java b/cdi/events/src/test/java/org/javaee7/cdi/events/GreetingTest.java index 2c065c436..96508300f 100644 --- a/cdi/events/src/test/java/org/javaee7/cdi/events/GreetingTest.java +++ b/cdi/events/src/test/java/org/javaee7/cdi/events/GreetingTest.java @@ -21,32 +21,32 @@ */ @RunWith(Arquillian.class) public class GreetingTest { - @Deployment - public static Archive deploy() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(EventReceiver.class, EventSender.class, GreetingReceiver.class, GreetingSender.class) - .addAsManifestResource("beans.xml"); - } - - @Inject - private EventSender sender; - - @Inject - private EventReceiver receiver; - - @Test - public void test() throws Exception { - assertThat(sender, is(notNullValue())); - assertThat(sender, instanceOf(GreetingSender.class)); - - assertThat(receiver, is(notNullValue())); - assertThat(receiver, instanceOf(GreetingReceiver.class)); - - // default greet - assertEquals("Willkommen", receiver.getGreet()); - // send a new greet - sender.send("Welcome"); - // receiver must not belongs to the dependent pseudo-scope since we are checking the result - assertEquals("Welcome", receiver.getGreet()); - } + @Deployment + public static Archive deploy() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(EventReceiver.class, EventSender.class, GreetingReceiver.class, GreetingSender.class) + .addAsManifestResource("beans.xml"); + } + + @Inject + private EventSender sender; + + @Inject + private EventReceiver receiver; + + @Test + public void test() throws Exception { + assertThat(sender, is(notNullValue())); + assertThat(sender, instanceOf(GreetingSender.class)); + + assertThat(receiver, is(notNullValue())); + assertThat(receiver, instanceOf(GreetingReceiver.class)); + + // default greet + assertEquals("Willkommen", receiver.getGreet()); + // send a new greet + sender.send("Welcome"); + // receiver must not belongs to the dependent pseudo-scope since we are checking the result + assertEquals("Welcome", receiver.getGreet()); + } } diff --git a/cdi/events/src/test/resources/beans.xml b/cdi/events/src/test/resources/beans.xml index aa8e57744..be95b1d6e 100644 --- a/cdi/events/src/test/resources/beans.xml +++ b/cdi/events/src/test/resources/beans.xml @@ -1,8 +1,8 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee%20http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" + bean-discovery-mode="all"> diff --git a/cdi/exclude-filter/pom.xml b/cdi/exclude-filter/pom.xml index e0ec26c39..c2f67130e 100644 --- a/cdi/exclude-filter/pom.xml +++ b/cdi/exclude-filter/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - exclude-filter - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-exclude-filter + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - exclude-filter + diff --git a/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/FancyGreeting.java b/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/FancyGreeting.java index f996e56fc..a979062ad 100644 --- a/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/FancyGreeting.java +++ b/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/FancyGreeting.java @@ -9,5 +9,5 @@ public class FancyGreeting implements Greeting { public String greet(String name) { return "Hello " + name + ":)"; } - + } diff --git a/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/TestServlet.java b/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/TestServlet.java index 4e7bdaff4..f77ed11ae 100644 --- a/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/TestServlet.java +++ b/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/TestServlet.java @@ -13,11 +13,12 @@ * * @author arungup */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { - @Inject Greeting greeting; - + @Inject + Greeting greeting; + /** * Processes requests for both HTTP * GET and @@ -29,13 +30,13 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Excluded bean implementation using <exclude> in beans.xml"); + out.println("Excluded bean implementation using <exclude> in beans.xml"); out.println(""); out.println(""); out.println("

Excluded bean implementation using in beans.xml

"); @@ -57,7 +58,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -72,7 +73,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/beans/SimpleGreeting.java b/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/beans/SimpleGreeting.java index 6f76ad233..ec2e75fb1 100644 --- a/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/beans/SimpleGreeting.java +++ b/cdi/exclude-filter/src/main/java/org/javaee7/cdi/exclude/filter/beans/SimpleGreeting.java @@ -11,5 +11,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/extension-impl/pom.xml b/cdi/extension-impl/pom.xml index 3d3dfb87a..90a958ba1 100644 --- a/cdi/extension-impl/pom.xml +++ b/cdi/extension-impl/pom.xml @@ -5,7 +5,7 @@ org.javaee7.cdi cdi-samples 1.0-SNAPSHOT - ../pom.xml + ../pom.xml org.javaee7.cdi diff --git a/cdi/extension-impl/src/main/java/org/javaee7/cdi/extension/impl/MyExtension.java b/cdi/extension-impl/src/main/java/org/javaee7/cdi/extension/impl/MyExtension.java index 156a8d0e4..89c98b4dc 100644 --- a/cdi/extension-impl/src/main/java/org/javaee7/cdi/extension/impl/MyExtension.java +++ b/cdi/extension-impl/src/main/java/org/javaee7/cdi/extension/impl/MyExtension.java @@ -10,11 +10,11 @@ * @author Arun Gupta */ public class MyExtension implements Extension { - + void processAnnotatedType(@Observes ProcessAnnotatedType pat) { Logger.getAnonymousLogger().log(Level.INFO, - "CDI Extension Processing Annotation -> {0}", - pat. + "CDI Extension Processing Annotation -> {0}", + pat. getAnnotatedType(). getJavaClass(). getName()); diff --git a/cdi/extension/pom.xml b/cdi/extension/pom.xml index 78caa04b1..623c81aac 100644 --- a/cdi/extension/pom.xml +++ b/cdi/extension/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - extension - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-extension + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - extension + diff --git a/cdi/extension/src/main/java/org/javaee7/cdi/bean/discovery/SimpleGreeting.java b/cdi/extension/src/main/java/org/javaee7/cdi/bean/discovery/SimpleGreeting.java index 86d00d733..4a035c859 100644 --- a/cdi/extension/src/main/java/org/javaee7/cdi/bean/discovery/SimpleGreeting.java +++ b/cdi/extension/src/main/java/org/javaee7/cdi/bean/discovery/SimpleGreeting.java @@ -9,5 +9,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/extension/src/main/java/org/javaee7/cdi/bean/discovery/TestServlet.java b/cdi/extension/src/main/java/org/javaee7/cdi/bean/discovery/TestServlet.java index e4719a59e..c92a63955 100644 --- a/cdi/extension/src/main/java/org/javaee7/cdi/bean/discovery/TestServlet.java +++ b/cdi/extension/src/main/java/org/javaee7/cdi/bean/discovery/TestServlet.java @@ -13,7 +13,7 @@ * * @author arungup */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { @Inject @@ -30,7 +30,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -58,7 +58,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -73,7 +73,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/interceptors-priority/pom.xml b/cdi/interceptors-priority/pom.xml index 9d1d4d948..7156ddb91 100644 --- a/cdi/interceptors-priority/pom.xml +++ b/cdi/interceptors-priority/pom.xml @@ -1,12 +1,13 @@ 4.0.0 + - org.javaee7.cdi - cdi-samples + org.javaee7 + cdi 1.0-SNAPSHOT ../pom.xml - - interceptors-priority + cdi-interceptors-priority + Java EE 7 Sample: cdi - interceptors-priority diff --git a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/Greeting.java b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/Greeting.java index 1a57922c0..acf42d4a2 100644 --- a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/Greeting.java +++ b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/Greeting.java @@ -5,5 +5,6 @@ */ public interface Greeting { public String getGreet(); + public void setGreet(String name); } diff --git a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/HighPriorityInterceptor.java b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/HighPriorityInterceptor.java index 16cfa5e6a..3a0beec9f 100644 --- a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/HighPriorityInterceptor.java +++ b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/HighPriorityInterceptor.java @@ -14,14 +14,14 @@ @MyInterceptorBinding @Priority(Interceptor.Priority.APPLICATION + 100) public class HighPriorityInterceptor { - @AroundInvoke - public Object log(InvocationContext context) throws Exception { - Object[] parameters = context.getParameters(); - if (parameters.length > 0 && parameters[0] instanceof String) { - String param = (String) parameters[0]; - parameters[0] = "Hi " + param + " !"; - context.setParameters(parameters); - } - return context.proceed(); - } + @AroundInvoke + public Object log(InvocationContext context) throws Exception { + Object[] parameters = context.getParameters(); + if (parameters.length > 0 && parameters[0] instanceof String) { + String param = (String) parameters[0]; + parameters[0] = "Hi " + param + " !"; + context.setParameters(parameters); + } + return context.proceed(); + } } diff --git a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/LowPriorityInterceptor.java b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/LowPriorityInterceptor.java index 14545cce7..8ec732495 100644 --- a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/LowPriorityInterceptor.java +++ b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/LowPriorityInterceptor.java @@ -14,14 +14,14 @@ @MyInterceptorBinding @Priority(Interceptor.Priority.APPLICATION + 200) public class LowPriorityInterceptor { - @AroundInvoke - public Object log(InvocationContext context) throws Exception { - Object[] parameters = context.getParameters(); - if (parameters.length > 0 && parameters[0] instanceof String) { - String param = (String) parameters[0]; - parameters[0] = param + " Nice to meet you."; - context.setParameters(parameters); - } - return context.proceed(); - } + @AroundInvoke + public Object log(InvocationContext context) throws Exception { + Object[] parameters = context.getParameters(); + if (parameters.length > 0 && parameters[0] instanceof String) { + String param = (String) parameters[0]; + parameters[0] = param + " Nice to meet you."; + context.setParameters(parameters); + } + return context.proceed(); + } } diff --git a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/MyInterceptorBinding.java b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/MyInterceptorBinding.java index c6acd9534..66869e93d 100644 --- a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/MyInterceptorBinding.java +++ b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/MyInterceptorBinding.java @@ -15,6 +15,6 @@ @Inherited @InterceptorBinding @Retention(RUNTIME) -@Target({METHOD, TYPE}) +@Target({ METHOD, TYPE }) public @interface MyInterceptorBinding { } diff --git a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/SimpleGreeting.java b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/SimpleGreeting.java index 2baca438b..1f7c487f4 100644 --- a/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/SimpleGreeting.java +++ b/cdi/interceptors-priority/src/main/java/org/javaee7/cdi/interceptors/priority/SimpleGreeting.java @@ -5,13 +5,13 @@ */ @MyInterceptorBinding public class SimpleGreeting implements Greeting { - private String greet; + private String greet; - public String getGreet() { - return greet; - } + public String getGreet() { + return greet; + } - public void setGreet(String greet) { - this.greet = greet; - } + public void setGreet(String greet) { + this.greet = greet; + } } diff --git a/cdi/interceptors-priority/src/test/java/org/javaee7/cdi/interceptors/priority/GreetingTest.java b/cdi/interceptors-priority/src/test/java/org/javaee7/cdi/interceptors/priority/GreetingTest.java index 7a6b590c1..ade356b8c 100644 --- a/cdi/interceptors-priority/src/test/java/org/javaee7/cdi/interceptors/priority/GreetingTest.java +++ b/cdi/interceptors-priority/src/test/java/org/javaee7/cdi/interceptors/priority/GreetingTest.java @@ -22,22 +22,22 @@ */ @RunWith(Arquillian.class) public class GreetingTest { - @Deployment - public static Archive deploy() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, SimpleGreeting.class, MyInterceptorBinding.class, LowPriorityInterceptor.class, HighPriorityInterceptor.class) - .addAsManifestResource("beans.xml"); - } + @Deployment + public static Archive deploy() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(Greeting.class, SimpleGreeting.class, MyInterceptorBinding.class, LowPriorityInterceptor.class, HighPriorityInterceptor.class) + .addAsManifestResource("beans.xml"); + } - @Inject - Greeting bean; + @Inject + Greeting bean; - @Test - public void test() throws Exception { - assertThat(bean, is(notNullValue())); - assertThat(bean, instanceOf(SimpleGreeting.class)); + @Test + public void test() throws Exception { + assertThat(bean, is(notNullValue())); + assertThat(bean, instanceOf(SimpleGreeting.class)); - bean.setGreet("Arun"); - assertEquals(bean.getGreet(), "Hi Arun ! Nice to meet you."); - } + bean.setGreet("Arun"); + assertEquals(bean.getGreet(), "Hi Arun ! Nice to meet you."); + } } diff --git a/cdi/interceptors-priority/src/test/resources/beans.xml b/cdi/interceptors-priority/src/test/resources/beans.xml index 34f9b5c66..c02d76e98 100644 --- a/cdi/interceptors-priority/src/test/resources/beans.xml +++ b/cdi/interceptors-priority/src/test/resources/beans.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee%20http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" + bean-discovery-mode="all"> diff --git a/cdi/interceptors/pom.xml b/cdi/interceptors/pom.xml index fa7391d15..300bdfa02 100644 --- a/cdi/interceptors/pom.xml +++ b/cdi/interceptors/pom.xml @@ -1,12 +1,13 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - interceptors - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + cdi-interceptors + Java EE 7 Sample: cdi - interceptors + diff --git a/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/Greeting.java b/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/Greeting.java index 027cbdf49..ca341e6ce 100644 --- a/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/Greeting.java +++ b/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/Greeting.java @@ -6,5 +6,6 @@ */ public interface Greeting { public String getGreet(); + public void setGreet(String name); } diff --git a/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/MyInterceptor.java b/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/MyInterceptor.java index f44279d37..1e8c6ec9b 100644 --- a/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/MyInterceptor.java +++ b/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/MyInterceptor.java @@ -12,14 +12,14 @@ @Interceptor @MyInterceptorBinding public class MyInterceptor { - @AroundInvoke - public Object log(InvocationContext context) throws Exception { - Object[] parameters = context.getParameters(); - if (parameters.length > 0 && parameters[0] instanceof String) { - String param = (String) parameters[0]; - parameters[0] = "Hi " + param + " !"; - context.setParameters(parameters); - } - return context.proceed(); - } + @AroundInvoke + public Object log(InvocationContext context) throws Exception { + Object[] parameters = context.getParameters(); + if (parameters.length > 0 && parameters[0] instanceof String) { + String param = (String) parameters[0]; + parameters[0] = "Hi " + param + " !"; + context.setParameters(parameters); + } + return context.proceed(); + } } diff --git a/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/MyInterceptorBinding.java b/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/MyInterceptorBinding.java index 49ff67305..8e7b53e0a 100644 --- a/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/MyInterceptorBinding.java +++ b/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/MyInterceptorBinding.java @@ -14,6 +14,6 @@ @Inherited @InterceptorBinding @Retention(RUNTIME) -@Target({METHOD, TYPE}) +@Target({ METHOD, TYPE }) public @interface MyInterceptorBinding { } diff --git a/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/SimpleGreeting.java b/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/SimpleGreeting.java index d1448b1df..2f8a6897c 100644 --- a/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/SimpleGreeting.java +++ b/cdi/interceptors/src/main/java/org/javaee7/cdi/interceptors/SimpleGreeting.java @@ -6,13 +6,13 @@ */ @MyInterceptorBinding public class SimpleGreeting implements Greeting { - private String greet; + private String greet; - public String getGreet() { - return greet; - } + public String getGreet() { + return greet; + } - public void setGreet(String greet) { - this.greet = greet; - } + public void setGreet(String greet) { + this.greet = greet; + } } diff --git a/cdi/interceptors/src/test/java/org/javaee7/cdi/interceptors/GreetingTest.java b/cdi/interceptors/src/test/java/org/javaee7/cdi/interceptors/GreetingTest.java index 850cd0b91..b22f57bcb 100644 --- a/cdi/interceptors/src/test/java/org/javaee7/cdi/interceptors/GreetingTest.java +++ b/cdi/interceptors/src/test/java/org/javaee7/cdi/interceptors/GreetingTest.java @@ -19,22 +19,22 @@ */ @RunWith(Arquillian.class) public class GreetingTest { - @Deployment - public static Archive deploy() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, SimpleGreeting.class, MyInterceptorBinding.class, MyInterceptor.class) - .addAsManifestResource("beans.xml"); - } + @Deployment + public static Archive deploy() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(Greeting.class, SimpleGreeting.class, MyInterceptorBinding.class, MyInterceptor.class) + .addAsManifestResource("beans.xml"); + } - @Inject - Greeting bean; + @Inject + Greeting bean; - @Test - public void test() throws Exception { - assertThat(bean, is(notNullValue())); - assertThat(bean, instanceOf(SimpleGreeting.class)); + @Test + public void test() throws Exception { + assertThat(bean, is(notNullValue())); + assertThat(bean, instanceOf(SimpleGreeting.class)); - bean.setGreet("Arun"); - assertEquals(bean.getGreet(), "Hi Arun !"); - } + bean.setGreet("Arun"); + assertEquals(bean.getGreet(), "Hi Arun !"); + } } diff --git a/cdi/interceptors/src/test/resources/beans.xml b/cdi/interceptors/src/test/resources/beans.xml index 485cd6e44..c525cd263 100644 --- a/cdi/interceptors/src/test/resources/beans.xml +++ b/cdi/interceptors/src/test/resources/beans.xml @@ -1,11 +1,11 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee%20http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" + bean-discovery-mode="all"> - - org.javaee7.cdi.interceptors.MyInterceptor - + + org.javaee7.cdi.interceptors.MyInterceptor + diff --git a/cdi/nobeans-el-injection-flowscoped/pom.xml b/cdi/nobeans-el-injection-flowscoped/pom.xml index 15daf55d1..0b8e14543 100644 --- a/cdi/nobeans-el-injection-flowscoped/pom.xml +++ b/cdi/nobeans-el-injection-flowscoped/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - nobeans-el-injection-flowscoped - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + cdi-nobeans-el-injection-flowscoped + war + Java EE 7 Sample: cdi - nobeans-el-injection-flowscoped + diff --git a/cdi/nobeans-el-injection-flowscoped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java b/cdi/nobeans-el-injection-flowscoped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java index 820b572aa..e3171457e 100644 --- a/cdi/nobeans-el-injection-flowscoped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java +++ b/cdi/nobeans-el-injection-flowscoped/src/test/java/org/javaee7/cdi/nobeans/el/injection/flowscoped/FlowScopedBeanTest.java @@ -19,19 +19,19 @@ */ @RunWith(Arquillian.class) public class FlowScopedBeanTest { - + private static final String WEBAPP_SRC = "src/main/webapp"; @ArquillianResource private URL base; - - @Deployment(testable=false) + + @Deployment(testable = false) public static WebArchive deploy() { return ShrinkWrap.create(WebArchive.class) - .addClass(FlowScopedBean.class) - .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) - .addAsWebResource((new File(WEBAPP_SRC, "myflow/myflow-flow.xml")), "myflow/myflow-flow.xml") - .addAsWebResource((new File(WEBAPP_SRC, "myflow/index.xhtml")), "myflow/index.xhtml"); + .addClass(FlowScopedBean.class) + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) + .addAsWebResource((new File(WEBAPP_SRC, "myflow/myflow-flow.xml")), "myflow/myflow-flow.xml") + .addAsWebResource((new File(WEBAPP_SRC, "myflow/index.xhtml")), "myflow/index.xhtml"); } @Test @@ -39,6 +39,6 @@ public void checkRenderedPage() throws Exception { WebClient webClient = new WebClient(); HtmlPage page = webClient.getPage(base + "/faces/myflow/index.xhtml"); assertNotNull(page); - assert(page.asText().contains("Hello there!")); + assert (page.asText().contains("Hello there!")); } } diff --git a/cdi/nobeans-el-injection/pom.xml b/cdi/nobeans-el-injection/pom.xml index 866b72159..7b78501c0 100644 --- a/cdi/nobeans-el-injection/pom.xml +++ b/cdi/nobeans-el-injection/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - nobeans-el-injection - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + cdi-nobeans-el-injection + war + Java EE 7 Sample: cdi - nobeans-el-injection + diff --git a/cdi/nobeans-el-injection/src/test/java/org/javaee7/cdi/nobeans/el/injection/ScopedBeanTest.java b/cdi/nobeans-el-injection/src/test/java/org/javaee7/cdi/nobeans/el/injection/ScopedBeanTest.java index 72b820af6..277c2bf80 100644 --- a/cdi/nobeans-el-injection/src/test/java/org/javaee7/cdi/nobeans/el/injection/ScopedBeanTest.java +++ b/cdi/nobeans-el-injection/src/test/java/org/javaee7/cdi/nobeans/el/injection/ScopedBeanTest.java @@ -18,18 +18,18 @@ */ @RunWith(Arquillian.class) public class ScopedBeanTest { - + private static final String WEBAPP_SRC = "src/main/webapp"; @ArquillianResource private URL base; - - @Deployment(testable=false) + + @Deployment(testable = false) public static WebArchive deploy() { return ShrinkWrap.create(WebArchive.class) - .addClass(ScopedBean.class) - .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) - .addAsWebResource((new File(WEBAPP_SRC, "index.xhtml"))); + .addClass(ScopedBean.class) + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) + .addAsWebResource((new File(WEBAPP_SRC, "index.xhtml"))); } @Test @@ -37,6 +37,6 @@ public void checkRenderedPage() throws Exception { WebConversation conv = new WebConversation(); GetMethodWebRequest getRequest = new GetMethodWebRequest(base + "/faces/index.xhtml"); String responseText = conv.getResponse(getRequest).getText(); - assert(responseText.contains("Hello there!")); + assert (responseText.contains("Hello there!")); } } diff --git a/cdi/nobeans-xml/pom.xml b/cdi/nobeans-xml/pom.xml index 4e02c019b..63aad4f9f 100644 --- a/cdi/nobeans-xml/pom.xml +++ b/cdi/nobeans-xml/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - nobeans-xml - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-nobeans-xml + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - nobeans-xml + diff --git a/cdi/nobeans-xml/src/test/java/org/javaee7/cdi/nobeans/xml/ScopedBeanTest.java b/cdi/nobeans-xml/src/test/java/org/javaee7/cdi/nobeans/xml/ScopedBeanTest.java index d98ea1510..c12e9d661 100644 --- a/cdi/nobeans-xml/src/test/java/org/javaee7/cdi/nobeans/xml/ScopedBeanTest.java +++ b/cdi/nobeans-xml/src/test/java/org/javaee7/cdi/nobeans/xml/ScopedBeanTest.java @@ -22,10 +22,11 @@ public class ScopedBeanTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClass(ScopedBean.class); + .addClass(ScopedBean.class); } - @Inject ScopedBean bean; + @Inject + ScopedBean bean; @Test public void should_scope_bean_be_injected() throws Exception { diff --git a/cdi/pkg-level/pom.xml b/cdi/pkg-level/pom.xml index 45366acef..9fe09dcf1 100644 --- a/cdi/pkg-level/pom.xml +++ b/cdi/pkg-level/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - pkg-level - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-pkg-level + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - pkg-level + diff --git a/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/FancyGreeting.java b/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/FancyGreeting.java index 1e8e87639..528ebb020 100644 --- a/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/FancyGreeting.java +++ b/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/FancyGreeting.java @@ -9,5 +9,5 @@ public class FancyGreeting implements Greeting { public String greet(String name) { return "Hello " + name + ":)"; } - + } diff --git a/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/TestServlet.java b/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/TestServlet.java index 1d654e3cc..e6ea03e16 100644 --- a/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/TestServlet.java +++ b/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/TestServlet.java @@ -13,11 +13,12 @@ * * @author arungup */ -@WebServlet(name = "TestServlet", urlPatterns = {"/TestServlet"}) +@WebServlet(name = "TestServlet", urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { - @Inject Greeting greeting; - + @Inject + Greeting greeting; + /** * Processes requests for both HTTP * GET and @@ -29,13 +30,13 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Two implementations, one @Vetoed at package-level"); + out.println("Two implementations, one @Vetoed at package-level"); out.println(""); out.println(""); out.println("

Two implementations, one @Vetoed at package-level

"); @@ -57,7 +58,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -72,7 +73,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/beans/SimpleGreeting.java b/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/beans/SimpleGreeting.java index 88b60f175..b3391a236 100644 --- a/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/beans/SimpleGreeting.java +++ b/cdi/pkg-level/src/main/java/org/javaee7/cdi/pkg/level/beans/SimpleGreeting.java @@ -11,5 +11,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/pom.xml b/cdi/pom.xml index 6246be0d6..32d1976f3 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -1,18 +1,18 @@ 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.cdi - cdi-samples + org.javaee7 + cdi 1.0-SNAPSHOT pom - Java EE 7 CDI Samples + Java EE 7 Sample: cdi vetoed @@ -36,6 +36,7 @@ nobeans-el-injection-flowscoped events + org.javaee7 diff --git a/cdi/scopes/pom.xml b/cdi/scopes/pom.xml index bf36f6a14..68cbe8dea 100644 --- a/cdi/scopes/pom.xml +++ b/cdi/scopes/pom.xml @@ -1,16 +1,16 @@ - - - 4.0.0 - - org.javaee7.cdi - cdi-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.cdi - scopes - 1.0-SNAPSHOT - war - scopes - + + + 4.0.0 + + + org.javaee7 + cdi + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + cdi-scopes + 1.0-SNAPSHOT + war + Java EE 7 Sample: cdi - scopes + diff --git a/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/ClientServlet.java b/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/ClientServlet.java index cdc5c37e2..f9bd5669f 100644 --- a/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/ClientServlet.java +++ b/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/ClientServlet.java @@ -13,7 +13,7 @@ * * @author arungup */ -@WebServlet(urlPatterns = {"/ClientServlet"}) +@WebServlet(urlPatterns = { "/ClientServlet" }) public class ClientServlet extends HttpServlet { /** @@ -26,7 +26,7 @@ public class ClientServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -57,7 +57,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -71,7 +71,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/MySessionScopedBean.java b/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/MySessionScopedBean.java index e02bbd0b4..bc2f04536 100644 --- a/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/MySessionScopedBean.java +++ b/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/MySessionScopedBean.java @@ -10,7 +10,7 @@ * the HTTP session expires. A new instance would be created with start of a fresh HTTP session */ @SessionScoped -public class MySessionScopedBean implements Serializable{ +public class MySessionScopedBean implements Serializable { public String getID() { return this + ""; } diff --git a/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/ServerServlet.java b/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/ServerServlet.java index 3353002f6..d8fd24269 100644 --- a/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/ServerServlet.java +++ b/cdi/scopes/src/main/java/org/javaee7/cdi/bean/scopes/ServerServlet.java @@ -13,18 +13,23 @@ * * @author arungup */ -@WebServlet(urlPatterns = {"/ServerServlet"}) +@WebServlet(urlPatterns = { "/ServerServlet" }) public class ServerServlet extends HttpServlet { - @Inject MyRequestScopedBean requestBean; - @Inject MyRequestScopedBean requestBean2; - - @Inject MySessionScopedBean sessionBean; - @Inject MySessionScopedBean sessionBean2; - - @Inject MyApplicationScopedBean applicationBean; - @Inject MySingletonScopedBean singletonBean; - + @Inject + MyRequestScopedBean requestBean; + @Inject + MyRequestScopedBean requestBean2; + + @Inject + MySessionScopedBean sessionBean; + @Inject + MySessionScopedBean sessionBean2; + + @Inject + MyApplicationScopedBean applicationBean; + @Inject + MySingletonScopedBean singletonBean; /** * Processes requests for both HTTP @@ -37,7 +42,7 @@ public class ServerServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { try (PrintWriter out = response.getWriter()) { out.println("Request-scoped bean"); out.println("

(1): " + requestBean.getID()); @@ -62,7 +67,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -77,7 +82,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/cdi/vetoed/pom.xml b/cdi/vetoed/pom.xml index ce9cd4a8c..98409db74 100644 --- a/cdi/vetoed/pom.xml +++ b/cdi/vetoed/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.cdi - cdi-samples + org.javaee7 + cdi 1.0-SNAPSHOT ../pom.xml - - org.javaee7.cdi - vetoed + org.javaee7 + cdi-vetoed 1.0-SNAPSHOT war + Java EE 7 Sample: cdi - vetoed diff --git a/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/FancyGreeting.java b/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/FancyGreeting.java index b98b6538d..799083639 100644 --- a/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/FancyGreeting.java +++ b/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/FancyGreeting.java @@ -9,5 +9,5 @@ public class FancyGreeting implements Greeting { public String greet(String name) { return "Hello " + name + " :)"; } - + } diff --git a/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/SimpleGreeting.java b/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/SimpleGreeting.java index 498926324..5e33dcf58 100644 --- a/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/SimpleGreeting.java +++ b/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/SimpleGreeting.java @@ -12,5 +12,5 @@ public class SimpleGreeting implements Greeting { public String greet(String name) { return "Hello " + name; } - + } diff --git a/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/TestServlet.java b/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/TestServlet.java index a3d0c83b9..c428baf87 100644 --- a/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/TestServlet.java +++ b/cdi/vetoed/src/main/java/org/javaee7/cdi/vetoed/TestServlet.java @@ -12,10 +12,11 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { - - @Inject Greeting greeting; + + @Inject + Greeting greeting; /** * Processes requests for both HTTP @@ -28,13 +29,13 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Two implementations, one @Vetoed, other injected"); + out.println("Two implementations, one @Vetoed, other injected"); out.println(""); out.println(""); out.println("

Two implementations, one @Vetoed, other injected

"); @@ -56,7 +57,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -71,7 +72,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/README.md b/concurrency/README.md new file mode 100644 index 000000000..c14d44f62 --- /dev/null +++ b/concurrency/README.md @@ -0,0 +1,16 @@ +# Java EE 7 Samples: Concurrency Utilities # + +The [JSR 236](https://jcp.org/en/jsr/detail?id=236) provides a simple, standardized API for using concurrency from application components without compromising container integrity while still preserving the Java EE platform's fundamental benefits. + +## Samples ## + + - dynamicproxy + - managedexecutor + - managedscheduledexecutor + - managedthreadfactory + +## How to run + +More information on how to run can be found at: + + diff --git a/concurrency/dynamicproxy/pom.xml b/concurrency/dynamicproxy/pom.xml index 1a42b0c5a..eb4d70887 100644 --- a/concurrency/dynamicproxy/pom.xml +++ b/concurrency/dynamicproxy/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.concurrency - concurrency-samples + org.javaee7 + concurrency 1.0-SNAPSHOT ../pom.xml - - org.javaee7.concurrency - dynamicproxy + org.javaee7 + concurrency-dynamicproxy 1.0-SNAPSHOT war + Java EE 7 Sample: concurrency - dynamicproxy diff --git a/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/MyRunnableWork.java b/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/MyRunnableWork.java index e2085aded..f10d2514c 100644 --- a/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/MyRunnableWork.java +++ b/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/MyRunnableWork.java @@ -3,7 +3,7 @@ /** * @author Arun Gupta */ -public class MyRunnableWork implements Runnable , MyWork { +public class MyRunnableWork implements Runnable, MyWork { @Override public void run() { diff --git a/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/TestMultipleInterfaceServlet.java b/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/TestMultipleInterfaceServlet.java index b53ddfeee..e9a429019 100644 --- a/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/TestMultipleInterfaceServlet.java +++ b/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/TestMultipleInterfaceServlet.java @@ -17,17 +17,16 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestMultipleInterfaceServlet"}) +@WebServlet(urlPatterns = { "/TestMultipleInterfaceServlet" }) public class TestMultipleInterfaceServlet extends HttpServlet { -// @Resource(name = "java:comp/DefaultManagedThreadFactory") + // @Resource(name = "java:comp/DefaultManagedThreadFactory") @Resource ManagedThreadFactory factory; - -// @Resource(name = "java:comp/DefaultContextService") + + // @Resource(name = "java:comp/DefaultContextService") @Resource ContextService service; - /** * Processes requests for both HTTP @@ -40,7 +39,7 @@ public class TestMultipleInterfaceServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -52,11 +51,11 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re Object proxy = service.createContextualProxy(new MyRunnableWork(), Runnable.class, MyWork.class); out.println("Calling MyWork interface
"); - ((MyWork)proxy).myWork(); + ((MyWork) proxy).myWork(); out.println("Creating Java SE style ExecutorService
"); ExecutorService executor = Executors.newFixedThreadPool(10, factory); out.println("Submitting the task
"); - Future f = executor.submit((Runnable)proxy); + Future f = executor.submit((Runnable) proxy); out.println("done

"); out.println("Check server.log for output from the task."); out.println(""); @@ -76,7 +75,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -91,7 +90,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/TestServlet.java b/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/TestServlet.java index c4510166a..6da54c3d3 100644 --- a/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/TestServlet.java +++ b/concurrency/dynamicproxy/src/main/java/org/javaee7/concurrency/dynamicproxy/TestServlet.java @@ -17,17 +17,16 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { -// @Resource(name = "DefaultManagedThreadFactory") + // @Resource(name = "DefaultManagedThreadFactory") @Resource ManagedThreadFactory factory; - -// @Resource(name = "DefaultContextService") + + // @Resource(name = "DefaultContextService") @Resource ContextService service; - /** * Processes requests for both HTTP @@ -40,7 +39,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -74,7 +73,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -89,7 +88,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/managedexecutor/pom.xml b/concurrency/managedexecutor/pom.xml index f292ec0bc..2760798c6 100644 --- a/concurrency/managedexecutor/pom.xml +++ b/concurrency/managedexecutor/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.concurrency - concurrency-samples + org.javaee7 + concurrency 1.0-SNAPSHOT ../pom.xml - - managedexecutor + concurrency-managedexecutor war + Java EE 7 Sample: concurrency - managedexecutor diff --git a/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyCallableTask.java b/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyCallableTask.java index 5636224a2..302c1f57a 100644 --- a/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyCallableTask.java +++ b/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyCallableTask.java @@ -8,11 +8,11 @@ public class MyCallableTask implements Callable { private int id; - + public MyCallableTask(int id) { this.id = id; } - + @Override public Product call() { TestStatus.latch.countDown(); diff --git a/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTaskWithTransaction.java b/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTaskWithTransaction.java index 18f733a38..a6c13d23c 100644 --- a/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTaskWithTransaction.java +++ b/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTaskWithTransaction.java @@ -10,7 +10,8 @@ public class MyTaskWithTransaction implements Runnable { private int id; - @Inject MyTransactionScopedBean bean; + @Inject + MyTransactionScopedBean bean; public MyTaskWithTransaction() { } @@ -32,10 +33,9 @@ public void setId(int id) { public void run() { // a Call to a TX Scoped bean should fail if outside a tx try { - TestStatus.foundTransactionScopedBean = bean.isInTx(); - } - catch(Exception e) { - e.printStackTrace(); + TestStatus.foundTransactionScopedBean = bean.isInTx(); + } catch (Exception e) { + e.printStackTrace(); } TestStatus.latch.countDown(); } diff --git a/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTransactionScopedBean.java b/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTransactionScopedBean.java index 9bebc8a16..be2150cb0 100644 --- a/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTransactionScopedBean.java +++ b/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTransactionScopedBean.java @@ -11,6 +11,6 @@ public class MyTransactionScopedBean implements Serializable { private static final long serialVersionUID = 1L; public boolean isInTx() { - return true; + return true; } } diff --git a/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyWaitingTask.java b/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyWaitingTask.java index 8f0d8ee45..ee8c2ad4c 100644 --- a/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyWaitingTask.java +++ b/concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyWaitingTask.java @@ -9,5 +9,5 @@ public class MyWaitingTask implements Runnable { public void run() { System.out.println("MyWaitingTask.run"); } - + } diff --git a/concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorInjectTest.java b/concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorInjectTest.java index e61d6abc4..d35c033d3 100644 --- a/concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorInjectTest.java +++ b/concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorInjectTest.java @@ -50,7 +50,8 @@ public class ExecutorInjectTest { Callable callableTask; Runnable runnableTask; MyTaskWithListener taskWithListener; - @Inject // Inject so we have a managed bean to handle the TX + @Inject + // Inject so we have a managed bean to handle the TX MyTaskWithTransaction taskWithTransaction; Collection> callableTasks = new ArrayList<>(); @@ -59,16 +60,16 @@ public class ExecutorInjectTest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class). - addClasses(MyRunnableTask.class, - MyCallableTask.class, - Product.class, - TestStatus.class, - MyTaskWithListener.class, - MyTaskWithTransaction.class, - MyTransactionScopedBean.class, - TestBean.class). - setWebXML(new FileAsset(new File("src/main/webapp/WEB-INF/web.xml"))). - addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); // Adding beans.xml shouldn't be required? WildFly Beta1 + addClasses(MyRunnableTask.class, + MyCallableTask.class, + Product.class, + TestStatus.class, + MyTaskWithListener.class, + MyTaskWithTransaction.class, + MyTransactionScopedBean.class, + TestBean.class). + setWebXML(new FileAsset(new File("src/main/webapp/WEB-INF/web.xml"))). + addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); // Adding beans.xml shouldn't be required? WildFly Beta1 } @Before diff --git a/concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorJNDITest.java b/concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorJNDITest.java index 51d45dfc6..5d156dec0 100644 --- a/concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorJNDITest.java +++ b/concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorJNDITest.java @@ -38,17 +38,17 @@ public class ExecutorJNDITest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class). - addClasses(MyRunnableTask.class, - MyCallableTask.class, - Product.class, - TestStatus.class); + addClasses(MyRunnableTask.class, + MyCallableTask.class, + Product.class, + TestStatus.class); } @Before public void setup() throws NamingException { InitialContext ctx = new InitialContext(); defaultExecutor = (ManagedExecutorService) ctx.lookup("java:comp/DefaultManagedExecutorService"); -// executorFromWebXml = (ManagedExecutorService) ctx.lookup("java:comp/env/concurrent/myExecutor"); + // executorFromWebXml = (ManagedExecutorService) ctx.lookup("java:comp/env/concurrent/myExecutor"); runnableTask = new MyRunnableTask(); callableTask = new MyCallableTask(1); @@ -88,32 +88,32 @@ public void testInvokeAnyWithCallableDefault() throws Exception { assertTrue(results.getId() <= 5); } -// @Test -// public void testSubmitWithRunnableFromWebXML() throws Exception { -// executorFromWebXml.submit(new MyRunnableTask(1)); -// Thread.sleep(2000); -// assertTrue(TestStatus.invokedRunnable); -// } -// -// @Test -// public void testSubmitWithCallableFromWebXML() throws Exception { -// Future future = executorFromWebXml.submit(callableTask); -// assertEquals(1, future.get().getId()); -// } -// -// @Test -// public void testInvokeAllWithCallableFromWebXML() throws Exception { -// List> results = executorFromWebXml.invokeAll(callableTasks); -// int count = 0; -// for (Future f : results) { -// assertEquals(count++, f.get().getId()); -// } -// } -// -// @Test -// public void testInvokeAnyWithCallableFromWebXML() throws Exception { -// Product results = executorFromWebXml.invokeAny(callableTasks); -// assertTrue(results.getId() >= 0); -// assertTrue(results.getId() <= 5); -// } + // @Test + // public void testSubmitWithRunnableFromWebXML() throws Exception { + // executorFromWebXml.submit(new MyRunnableTask(1)); + // Thread.sleep(2000); + // assertTrue(TestStatus.invokedRunnable); + // } + // + // @Test + // public void testSubmitWithCallableFromWebXML() throws Exception { + // Future future = executorFromWebXml.submit(callableTask); + // assertEquals(1, future.get().getId()); + // } + // + // @Test + // public void testInvokeAllWithCallableFromWebXML() throws Exception { + // List> results = executorFromWebXml.invokeAll(callableTasks); + // int count = 0; + // for (Future f : results) { + // assertEquals(count++, f.get().getId()); + // } + // } + // + // @Test + // public void testInvokeAnyWithCallableFromWebXML() throws Exception { + // Product results = executorFromWebXml.invokeAny(callableTasks); + // assertTrue(results.getId() >= 0); + // assertTrue(results.getId() <= 5); + // } } diff --git a/concurrency/managedscheduledexecutor/pom.xml b/concurrency/managedscheduledexecutor/pom.xml index 8ef884bf0..91d67c6ef 100644 --- a/concurrency/managedscheduledexecutor/pom.xml +++ b/concurrency/managedscheduledexecutor/pom.xml @@ -1,16 +1,16 @@ - + + 4.0.0 + - org.javaee7.concurrency - concurrency-samples + org.javaee7 + concurrency 1.0-SNAPSHOT ../pom.xml - - org.javaee7.concurrency - managedscheduledexecutor + org.javaee7 + concurrency-managedscheduledexecutor 1.0-SNAPSHOT war - managedscheduledexecutor + Java EE 7 Sample: concurrency - managedscheduledexecutor diff --git a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyCallableTask.java b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyCallableTask.java index ed9c212fd..1ff3ba0b2 100644 --- a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyCallableTask.java +++ b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyCallableTask.java @@ -6,7 +6,7 @@ * @author Arun Gupta */ public class MyCallableTask implements Callable { - + private int id; public MyCallableTask() { @@ -23,7 +23,7 @@ public int getId() { public void setId(int id) { this.id = id; } - + @Override public Product call() { System.out.println("Running Callable Task: " + id); diff --git a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyTrigger.java b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyTrigger.java index ab85950ef..f4d254d86 100644 --- a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyTrigger.java +++ b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyTrigger.java @@ -27,5 +27,5 @@ public Date getNextRunTime(LastExecution le, Date taskScheduledTime) { public boolean skipRun(LastExecution le, Date scheduledRunTime) { return firetime.before(scheduledRunTime); } - + } diff --git a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleFixedRateServlet.java b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleFixedRateServlet.java index fe01a1b15..edc725f53 100644 --- a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleFixedRateServlet.java +++ b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleFixedRateServlet.java @@ -15,13 +15,13 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/ScheduleFixedRateServlet"}) +@WebServlet(urlPatterns = { "/ScheduleFixedRateServlet" }) public class ScheduleFixedRateServlet extends HttpServlet { -// @Resource(name = "concurrent/myScheduledExecutor2") + // @Resource(name = "concurrent/myScheduledExecutor2") @Resource(name = "DefaultManagedScheduledExecutorService") ManagedScheduledExecutorService executor; - + /** * Processes requests for both HTTP * GET and @@ -33,25 +33,25 @@ public class ScheduleFixedRateServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Schedule at fixed rate"); + out.println("Schedule at fixed rate"); out.println(""); out.println(""); out.println("

Schedule at fixed rate

"); ScheduledFuture f = executor.scheduleAtFixedRate(new MyRunnableTask(5), 2, 3, TimeUnit.SECONDS); -//// try { -//// Thread.sleep(1000); -//// } catch (InterruptedException ex) { -//// Logger.getLogger(TestScheduleFixedRateServlet.class.getName()).log(Level.SEVERE, null, ex); -//// } -//// f.cancel(true); -// -// executor.scheduleWithFixedDelay(new MyRunnableTask(5), 2, 3, TimeUnit.SECONDS); + //// try { + //// Thread.sleep(1000); + //// } catch (InterruptedException ex) { + //// Logger.getLogger(TestScheduleFixedRateServlet.class.getName()).log(Level.SEVERE, null, ex); + //// } + //// f.cancel(true); + // + // executor.scheduleWithFixedDelay(new MyRunnableTask(5), 2, 3, TimeUnit.SECONDS); System.out.println("Runnable Task completed"); out.println("

Check server.log for output"); out.println(""); @@ -71,7 +71,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -86,7 +86,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleServlet.java b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleServlet.java index 70b337a12..a25c78155 100644 --- a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleServlet.java +++ b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleServlet.java @@ -19,10 +19,10 @@ * * @author arungup */ -@WebServlet(urlPatterns = {"/ScheduleServlet"}) +@WebServlet(urlPatterns = { "/ScheduleServlet" }) public class ScheduleServlet extends HttpServlet { -// @Resource(name = "concurrent/myScheduledExecutor2") + // @Resource(name = "concurrent/myScheduledExecutor2") @Resource(name = "DefaultManagedScheduledExecutorService") ManagedScheduledExecutorService executor; @@ -37,7 +37,7 @@ public class ScheduleServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -58,7 +58,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re } } out.println("Callable Task completed: " + future.get().getId()); - + out.println("

Scheduling tasks using Runnable

"); ScheduledFuture f = executor.schedule(new MyRunnableTask(10), 5, TimeUnit.SECONDS); while (true) { @@ -90,7 +90,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -105,7 +105,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleWithFixedDelayServlet.java b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleWithFixedDelayServlet.java index 8cc7b3cf9..9ced0cb32 100644 --- a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleWithFixedDelayServlet.java +++ b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/ScheduleWithFixedDelayServlet.java @@ -14,14 +14,14 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/ScheduleWithFixedDelayServlet"}) +@WebServlet(urlPatterns = { "/ScheduleWithFixedDelayServlet" }) public class ScheduleWithFixedDelayServlet extends HttpServlet { -// @Resource(name = "concurrent/myScheduledExecutor2") -// @Resource(name = "DefaultManagedScheduledExecutorService") + // @Resource(name = "concurrent/myScheduledExecutor2") + // @Resource(name = "DefaultManagedScheduledExecutorService") @Resource ManagedScheduledExecutorService executor; - + /** * Processes requests for both HTTP * GET and @@ -33,21 +33,21 @@ public class ScheduleWithFixedDelayServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Schedule with fixed delay"); + out.println("Schedule with fixed delay"); out.println(""); out.println(""); out.println("

Schedule tasks with fixed delay

"); - + executor.scheduleWithFixedDelay(new MyRunnableTask(5), 2, 3, TimeUnit.SECONDS); out.println("

Check server.log for output"); System.out.println("Runnable Task submitted"); - + out.println(""); out.println(""); } @@ -65,7 +65,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -80,7 +80,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/TestTriggerServlet.java b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/TestTriggerServlet.java index 530de8ddf..e352382c6 100644 --- a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/TestTriggerServlet.java +++ b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/TestTriggerServlet.java @@ -14,13 +14,13 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestTriggerServlet"}) +@WebServlet(urlPatterns = { "/TestTriggerServlet" }) public class TestTriggerServlet extends HttpServlet { -// @Resource(name = "concurrent/myScheduledExecutor2") + // @Resource(name = "concurrent/myScheduledExecutor2") @Resource(name = "DefaultManagedScheduledExecutorService") ManagedScheduledExecutorService executor; - + /** * Processes requests for both HTTP * GET and @@ -32,21 +32,21 @@ public class TestTriggerServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Schedule tasks with a trigger

"); - for (int i=0; i<5; i++) { + for (int i = 0; i < 5; i++) { executor.schedule(new MyRunnableTask(i), new MyTrigger(new Date(System.currentTimeMillis() + 30000))); } out.println("

Check server.log for output"); - + out.println(""); out.println(""); } @@ -64,7 +64,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -79,7 +79,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/managedthreadfactory/pom.xml b/concurrency/managedthreadfactory/pom.xml index 43c02e14e..d0eab1a79 100644 --- a/concurrency/managedthreadfactory/pom.xml +++ b/concurrency/managedthreadfactory/pom.xml @@ -1,16 +1,16 @@ - + + 4.0.0 + - org.javaee7.concurrency - concurrency-samples + org.javaee7 + concurrency 1.0-SNAPSHOT ../pom.xml - - org.javaee7.concurrency - managedthreadfactory + org.javaee7 + concurrency-managedthreadfactory 1.0-SNAPSHOT war - managedthreadfactory + Java EE 7 Sample: concurrency - managedthreadfactory diff --git a/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestJNDIServlet.java b/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestJNDIServlet.java index 404f397fa..ff18ee101 100644 --- a/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestJNDIServlet.java +++ b/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestJNDIServlet.java @@ -16,7 +16,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestJNDIServlet"}) +@WebServlet(urlPatterns = { "/TestJNDIServlet" }) public class TestJNDIServlet extends HttpServlet { /** @@ -30,7 +30,7 @@ public class TestJNDIServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -42,9 +42,9 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println("

Getting ManagedThreadFactory using JNDI lookup

"); try { InitialContext ctx = new InitialContext(); - + ManagedThreadFactory factory = (ManagedThreadFactory) ctx.lookup("java:comp/DefaultManagedThreadFactory"); -// ManagedExecutorService executor = (ManagedExecutorService) ctx.lookup("concurrent/myExecutor"); + // ManagedExecutorService executor = (ManagedExecutorService) ctx.lookup("concurrent/myExecutor"); out.println("Getting ManageableThread
"); Thread thread = factory.newThread(new MyTask(2)); out.println("Starting thread
"); @@ -72,7 +72,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -87,7 +87,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestResourceNoNameServlet.java b/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestResourceNoNameServlet.java index 19b76a9e4..b0afe1935 100644 --- a/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestResourceNoNameServlet.java +++ b/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestResourceNoNameServlet.java @@ -13,12 +13,11 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestResourceNoNameServlet"}) +@WebServlet(urlPatterns = { "/TestResourceNoNameServlet" }) public class TestResourceNoNameServlet extends HttpServlet { @Resource ManagedThreadFactory factory; - /** * Processes requests for both HTTP @@ -31,7 +30,7 @@ public class TestResourceNoNameServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -64,7 +63,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -79,7 +78,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestResourceServlet.java b/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestResourceServlet.java index e22d44f04..f939b55df 100644 --- a/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestResourceServlet.java +++ b/concurrency/managedthreadfactory/src/main/java/org/javaee7/concurrency/managedthreadfactory/TestResourceServlet.java @@ -13,13 +13,12 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestResourceServlet"}) +@WebServlet(urlPatterns = { "/TestResourceServlet" }) public class TestResourceServlet extends HttpServlet { -// @Resource(name = "concurrent/myFactory") + // @Resource(name = "concurrent/myFactory") @Resource(name = "DefaultManagedThreadFactory") ManagedThreadFactory factory; - /** * Processes requests for both HTTP @@ -32,7 +31,7 @@ public class TestResourceServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -65,7 +64,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -80,7 +79,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/concurrency/managedthreadfactory/src/test/java/org/javaee7/concurrency/managedthreadfactory/MyTaskTest.java b/concurrency/managedthreadfactory/src/test/java/org/javaee7/concurrency/managedthreadfactory/MyTaskTest.java index bc2389ed3..acb35d6d0 100644 --- a/concurrency/managedthreadfactory/src/test/java/org/javaee7/concurrency/managedthreadfactory/MyTaskTest.java +++ b/concurrency/managedthreadfactory/src/test/java/org/javaee7/concurrency/managedthreadfactory/MyTaskTest.java @@ -16,21 +16,21 @@ public class MyTaskTest { @Resource ManagedThreadFactory factory; - + @Resource(name = "DefaultManagedThreadFactory") ManagedThreadFactory factory2; - + /** * Test of run method, of class MyTask. * * using JNDI lookup */ -// @Test + // @Test public void testJNDILookup() { try { InitialContext ctx = new InitialContext(); -// ManagedExecutorService executor = (ManagedExecutorService) ctx.lookup("concurrent/myExecutor"); + // ManagedExecutorService executor = (ManagedExecutorService) ctx.lookup("concurrent/myExecutor"); ManagedThreadFactory myFactory = (ManagedThreadFactory) ctx.lookup("java:comp/DefaultManagedThreadFactory"); assertNotNull(myFactory); Thread thread = myFactory.newThread(new MyTask(1)); @@ -46,19 +46,19 @@ public void testJNDILookup() { * * using @Resource, with no name */ -// @Test + // @Test public void testResourceNoName() { Thread thread = factory.newThread(new MyTask(1)); assertNotNull(thread); thread.start(); } - + /** * Test of run method, of class MyTask. * * using @Resource, with no name */ -// @Test + // @Test public void testResourceWithName() { Thread thread = factory2.newThread(new MyTask(1)); assertNotNull(thread); diff --git a/concurrency/pom.xml b/concurrency/pom.xml index 10a9802cd..2cbbd8120 100644 --- a/concurrency/pom.xml +++ b/concurrency/pom.xml @@ -1,19 +1,18 @@ - + + + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - 4.0.0 - - org.javaee7.concurrency - concurrency-samples + org.javaee7 + concurrency 1.0-SNAPSHOT pom - Java EE 7 Concurrency Samples + Java EE 7 Sample: concurrency managedexecutor @@ -21,6 +20,7 @@ managedthreadfactory dynamicproxy + org.javaee7 diff --git a/ejb/README.md b/ejb/README.md new file mode 100644 index 000000000..013ec8a23 --- /dev/null +++ b/ejb/README.md @@ -0,0 +1,20 @@ +# Java EE 7 Samples: EJB 3.2 # + +The [JSR 345](https://jcp.org/en/jsr/detail?id=345) is an architecture for the development and deployment of component-based business applications. + +## Samples ## + + - embeddable + - lifecycle + - singleton + - stateful + - stateless + - timer + - async-ejb + + +## How to run + +More information on how to run can be found at: + + diff --git a/ejb/async-ejb/pom.xml b/ejb/async-ejb/pom.xml index 9c09939e2..b22d2dcc1 100644 --- a/ejb/async-ejb/pom.xml +++ b/ejb/async-ejb/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.ejb - ejb-samples + org.javaee7 + ejb 1.0-SNAPSHOT ../pom.xml - - async-ejb + ejb-async-ejb war + Java EE 7 Sample: ejb - async-ejb diff --git a/ejb/async-ejb/src/test/java/org/javaee7/ejb/async/AsyncClassBeanTest.java b/ejb/async-ejb/src/test/java/org/javaee7/ejb/async/AsyncClassBeanTest.java index 4a11e1271..9322840ec 100644 --- a/ejb/async-ejb/src/test/java/org/javaee7/ejb/async/AsyncClassBeanTest.java +++ b/ejb/async-ejb/src/test/java/org/javaee7/ejb/async/AsyncClassBeanTest.java @@ -31,13 +31,13 @@ public class AsyncClassBeanTest { @Deployment public static WebArchive createDeployment() { File[] jars = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("com.jayway.awaitility:awaitility") - .withTransitivity().asFile(); + .resolve("com.jayway.awaitility:awaitility") + .withTransitivity().asFile(); return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(jars) - .addClasses(MyAsyncBeanClassLevel.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + .addAsLibraries(jars) + .addClasses(MyAsyncBeanClassLevel.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); } @Test @@ -45,7 +45,6 @@ public void should_return_async_sum() throws ExecutionException, InterruptedExce final Integer numberOne = 5; final Integer numberTwo = 10; - long start = System.currentTimeMillis(); final Future resultFuture = bean.addNumbers(numberOne, numberTwo); diff --git a/ejb/async-ejb/src/test/java/org/javaee7/ejb/async/AsyncMethodBeanTest.java b/ejb/async-ejb/src/test/java/org/javaee7/ejb/async/AsyncMethodBeanTest.java index 3aebfd100..d5de37be9 100644 --- a/ejb/async-ejb/src/test/java/org/javaee7/ejb/async/AsyncMethodBeanTest.java +++ b/ejb/async-ejb/src/test/java/org/javaee7/ejb/async/AsyncMethodBeanTest.java @@ -31,13 +31,13 @@ public class AsyncMethodBeanTest { @Deployment public static WebArchive createDeployment() { File[] jars = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("com.jayway.awaitility:awaitility") - .withTransitivity().asFile(); + .resolve("com.jayway.awaitility:awaitility") + .withTransitivity().asFile(); return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(jars) - .addClasses(MyAsyncBeanMethodLevel.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + .addAsLibraries(jars) + .addClasses(MyAsyncBeanMethodLevel.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); } @Test @@ -45,7 +45,6 @@ public void should_return_async_sum() throws ExecutionException, InterruptedExce final Integer numberOne = 5; final Integer numberTwo = 10; - long start = System.currentTimeMillis(); final Future resultFuture = bean.addNumbers(numberOne, numberTwo); diff --git a/ejb/embeddable/pom.xml b/ejb/embeddable/pom.xml index 826eaa77b..17032dd7d 100644 --- a/ejb/embeddable/pom.xml +++ b/ejb/embeddable/pom.xml @@ -1,17 +1,18 @@ - + + 4.0.0 + - org.javaee7.ejb - ejb-samples + org.javaee7 + ejb 1.0-SNAPSHOT ../pom.xml - - org.javaee7.ejb - embeddable + org.javaee7 + ejb-embeddable 1.0-SNAPSHOT war + Java EE 7 Sample: ejb - embeddable @@ -22,5 +23,4 @@ jar - diff --git a/ejb/embeddable/src/test/java/org/javaee7/ejb/embeddable/MyBeanTest.java b/ejb/embeddable/src/test/java/org/javaee7/ejb/embeddable/MyBeanTest.java index d49d8482a..602503c89 100644 --- a/ejb/embeddable/src/test/java/org/javaee7/ejb/embeddable/MyBeanTest.java +++ b/ejb/embeddable/src/test/java/org/javaee7/ejb/embeddable/MyBeanTest.java @@ -8,18 +8,18 @@ * @author Arun Gupta */ public class MyBeanTest { - + /** * Test of sayHello method, of class MyBean. * * Commented for now as support for this API is optional */ -// @Test + // @Test public void testSayHello() throws Exception { System.out.println("sayHello"); String name = "Duke"; try (EJBContainer container = javax.ejb.embeddable.EJBContainer.createEJBContainer()) { - MyBean instance = (MyBean)container.getContext().lookup("java:global/classes/MyBean"); + MyBean instance = (MyBean) container.getContext().lookup("java:global/classes/MyBean"); String expResult = "Hello " + name; String result = instance.sayHello(name); assertEquals(expResult, result); diff --git a/ejb/lifecycle/pom.xml b/ejb/lifecycle/pom.xml index be47d39c9..0d6baea01 100644 --- a/ejb/lifecycle/pom.xml +++ b/ejb/lifecycle/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.ejb - ejb-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.ejb - lifecycle - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + ejb + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + ejb-lifecycle + 1.0-SNAPSHOT + war + Java EE 7 Sample: ejb - lifecycle + diff --git a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyAroundConstructInterceptor.java b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyAroundConstructInterceptor.java index a3968756f..c35804eca 100644 --- a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyAroundConstructInterceptor.java +++ b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyAroundConstructInterceptor.java @@ -8,11 +8,11 @@ /** * @author Arun Gupta */ -@Priority(Interceptor.Priority.APPLICATION+10) +@Priority(Interceptor.Priority.APPLICATION + 10) @Interceptor @MyAroundConstructInterceptorBinding public class MyAroundConstructInterceptor { - + @AroundConstruct public void validateConstructor(InvocationContext context) { System.out.println("MyAroundConstructInterceptor.validateConstructor"); diff --git a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyAroundConstructInterceptorBinding.java b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyAroundConstructInterceptorBinding.java index 739c5335a..388254082 100644 --- a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyAroundConstructInterceptorBinding.java +++ b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyAroundConstructInterceptorBinding.java @@ -15,6 +15,6 @@ @Inherited @InterceptorBinding @Retention(RUNTIME) -@Target({CONSTRUCTOR, METHOD, TYPE}) +@Target({ CONSTRUCTOR, METHOD, TYPE }) public @interface MyAroundConstructInterceptorBinding { } diff --git a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyStatefulBean.java b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyStatefulBean.java index 176fe4658..c176f4691 100644 --- a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyStatefulBean.java +++ b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyStatefulBean.java @@ -18,17 +18,17 @@ @Stateful public class MyStatefulBean { private List list; - + public MyStatefulBean() { System.out.println("MyStatefulBean.ctor"); } - + @PostConstruct private void postConstruct() { list = new ArrayList<>(); System.out.println("MyStatefulBean.postConstruct"); } - + @PreDestroy private void preDestroy() { System.out.println("MyStatefulBean.preDestroy"); @@ -38,22 +38,22 @@ private void preDestroy() { private void prePassivate() { System.out.println("MyStatefulBean.prePassivate"); } - + @PostActivate private void postActivate() { System.out.println("MyStatefulBean.postActivate"); } - + public void addItem(String item) { list.add(item); System.out.println("MyBean.addItem"); } - + public void removeItem(String item) { list.remove(item); System.out.println("MyBean.removeItem"); } - + public List items() { return list; } diff --git a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyStatelessBean.java b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyStatelessBean.java index c8bc1526b..4256775b7 100644 --- a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyStatelessBean.java +++ b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/MyStatelessBean.java @@ -13,17 +13,17 @@ public class MyStatelessBean { public MyStatelessBean() { System.out.println("MyStatelessBean.ctor"); } - + @PostConstruct private void postConstruct() { System.out.println("MyStatelessBean.postConstruct"); } - + @PreDestroy private void preDestroy() { System.out.println("MyStatelessBean.preDestroy"); } - + public void method1() { System.out.println("MyBean.method1"); } diff --git a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/TestServlet.java b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/TestServlet.java index 17480c7e1..bac497f8e 100644 --- a/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/TestServlet.java +++ b/ejb/lifecycle/src/main/java/org/javaee7/ejb/lifecycle/TestServlet.java @@ -12,11 +12,13 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { - - @Inject MyStatefulBean stateful; - @Inject MyStatelessBean stateless; + + @Inject + MyStatefulBean stateful; + @Inject + MyStatelessBean stateless; /** * Processes requests for both HTTP @@ -29,13 +31,13 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Stateful bean: adding 3 items, removing 1, adding a new one

"); @@ -67,7 +69,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -82,7 +84,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/ejb/pom.xml b/ejb/pom.xml index 7000ccbbf..48a1624e5 100644 --- a/ejb/pom.xml +++ b/ejb/pom.xml @@ -1,18 +1,18 @@ - + + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.ejb - ejb-samples + org.javaee7 + ejb 1.0-SNAPSHOT pom - Java EE 7 EJB Samples + Java EE 7 Sample: ejb embeddable @@ -23,6 +23,7 @@ timer async-ejb + org.javaee7 diff --git a/ejb/singleton/pom.xml b/ejb/singleton/pom.xml index 0205fd8f6..d864de0a2 100644 --- a/ejb/singleton/pom.xml +++ b/ejb/singleton/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.ejb - ejb-samples + org.javaee7 + ejb 1.0-SNAPSHOT ../pom.xml - - org.javaee7.ejb - singleton + org.javaee7 + ejb-singleton 1.0-SNAPSHOT war + Java EE 7 Sample: ejb - singleton diff --git a/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/MySingleton.java b/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/MySingleton.java index dfd2e4c99..16d7a193b 100644 --- a/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/MySingleton.java +++ b/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/MySingleton.java @@ -21,10 +21,9 @@ private void postConstruct() { builder = new StringBuilder(); } - @Lock(LockType.READ) public String readSomething() { - return "current timestamp: "+ new Date(); + return "current timestamp: " + new Date(); } @Lock(LockType.WRITE) diff --git a/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/MySingletonBeanManagedConcurrency.java b/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/MySingletonBeanManagedConcurrency.java index da208a240..000842282 100644 --- a/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/MySingletonBeanManagedConcurrency.java +++ b/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/MySingletonBeanManagedConcurrency.java @@ -11,7 +11,7 @@ @Startup @Singleton public class MySingletonBeanManagedConcurrency { - + volatile StringBuilder builder; @PostConstruct @@ -21,7 +21,7 @@ private void postConstruct() { } public String readSomething() { - return "current timestamp: "+ new Date(); + return "current timestamp: " + new Date(); } public String writeSomething(String something) { diff --git a/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/TestServlet.java b/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/TestServlet.java index 73c031b1c..18ef1c6fa 100644 --- a/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/TestServlet.java +++ b/ejb/singleton/src/main/java/org/javaee7/ejb/singleton/TestServlet.java @@ -12,7 +12,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { @Inject @@ -30,7 +30,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -62,7 +62,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -76,7 +76,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/ejb/stateful/pom.xml b/ejb/stateful/pom.xml index a9ab9be11..93ae142cb 100644 --- a/ejb/stateful/pom.xml +++ b/ejb/stateful/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.ejb - ejb-samples + org.javaee7 + ejb 1.0-SNAPSHOT ../pom.xml - - org.javaee7.ejb - stateful + org.javaee7 + ejb-stateful 1.0-SNAPSHOT war + Java EE 7 Sample: ejb - stateful diff --git a/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/CartBean.java b/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/CartBean.java index 18179add0..f3de7991b 100644 --- a/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/CartBean.java +++ b/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/CartBean.java @@ -25,10 +25,10 @@ public void removeItem(String item) { items.remove(item); } - public void purchase() { + public void purchase() { //. . . } - + public List getItems() { return items; } diff --git a/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/Cart.java b/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/Cart.java index cff1f8684..65086fef7 100644 --- a/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/Cart.java +++ b/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/Cart.java @@ -14,7 +14,7 @@ public interface Cart { public void removeItem(String item); public void purchase(); - + public List getItems(); } diff --git a/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/CartBeanWithInterface.java b/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/CartBeanWithInterface.java index 4c6a7e6f6..ae6689f1c 100644 --- a/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/CartBeanWithInterface.java +++ b/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/CartBeanWithInterface.java @@ -28,10 +28,10 @@ public void removeItem(String item) { } @Override - public void purchase() { + public void purchase() { //. . . } - + @Override public List getItems() { return items; diff --git a/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/TestServlet.java b/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/TestServlet.java index 0ed947d04..6d6fc4659 100644 --- a/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/TestServlet.java +++ b/ejb/stateful/src/main/java/org/javaee7/ejb/stateful/remote/TestServlet.java @@ -12,11 +12,12 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServletWithInterface"}) +@WebServlet(urlPatterns = { "/TestServletWithInterface" }) public class TestServlet extends HttpServlet { - + // Cannot be injected using @Inject - @EJB Cart bean; + @EJB + Cart bean; /** * Processes requests for both HTTP GET and POST @@ -28,13 +29,13 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Adding/Removing items from Stateful Bean (with Interface)"); + out.println("Adding/Removing items from Stateful Bean (with Interface)"); out.println(""); out.println(""); out.println("

Adding/Removing items from Stateful Bean (with Interface)

"); @@ -68,7 +69,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -82,7 +83,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanStatefulnessTest.java b/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanStatefulnessTest.java index d521455f0..3ba77534f 100644 --- a/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanStatefulnessTest.java +++ b/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanStatefulnessTest.java @@ -29,12 +29,12 @@ public class CartBeanStatefulnessTest { @EJB private CartBean bean2; - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class, "test.jar") - .addClass(CartBean.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class, "test.jar") + .addClass(CartBean.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } /** * JSR 318: Enterprise JavaBeans, Version 3.1 @@ -52,19 +52,19 @@ public void should_not_be_identical_beans() { assertThat("Expect different instances", bean1, is(not(bean2))); } - @Test + @Test @InSequence(2) - public void should_add_items_to_first_cart() { - // when - bean1.addItem(item_to_add); + public void should_add_items_to_first_cart() { + // when + bean1.addItem(item_to_add); - // then - assertThat(bean1.getItems(), hasItem(item_to_add)); - } + // then + assertThat(bean1.getItems(), hasItem(item_to_add)); + } - @Test + @Test @InSequence(3) - public void should_not_contain_any_items_in_second_cart() { - assertThat(bean2.getItems().isEmpty(), is(true)); - } + public void should_not_contain_any_items_in_second_cart() { + assertThat(bean2.getItems().isEmpty(), is(true)); + } } \ No newline at end of file diff --git a/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanTest.java b/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanTest.java index 0c4cb0d1b..216914cee 100644 --- a/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanTest.java +++ b/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanTest.java @@ -26,84 +26,84 @@ @RunWith(Arquillian.class) public class CartBeanTest { - @Inject - private CartBean sut; - - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class) - .addClass(CartBean.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } - - /** - * Test of addItem method, of class CartBean - * - * @throws Exception - */ - @Test - public void shouldAddOneItem() throws Exception { - // given - - // when - sut.addItem("apple"); - - // then - assertThat(sut.getItems(), hasItem("apple")); - } - - /** - * Test of addItem method, of class CartBean - * - * @throws Exception - */ - @Test - public void shouldAddManyItems() throws Exception { - // given - final List items = Arrays.asList("apple", "banana", "mango", "kiwi", "passion fruit"); - - // when - for (final String item : items) { - sut.addItem(item); - } - - // then - assertThat(sut.getItems(), is(items)); - } - - /** - * Test of removeItem method, of class CartBean - * - * @throws Exception - */ - @Test - public void shouldRemoveOneItem() throws Exception { - // given - final List items = Arrays.asList("apple", "banana", "mango", "kiwi", "passion fruit"); - for (final String item : items) { - sut.addItem(item); - } - - // when - sut.removeItem("banana"); - - // then - assertThat(sut.getItems(), not(hasItem("banana"))); - } - - /** - * Test of getItems method, of class CartBean - * - * @throws Exception - */ - @Test - public void shouldBeEmpty() throws Exception { - // given - - // when - final List actual = sut.getItems(); - - // then - assertThat(actual.isEmpty(), is(true)); - } + @Inject + private CartBean sut; + + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class) + .addClass(CartBean.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } + + /** + * Test of addItem method, of class CartBean + * + * @throws Exception + */ + @Test + public void shouldAddOneItem() throws Exception { + // given + + // when + sut.addItem("apple"); + + // then + assertThat(sut.getItems(), hasItem("apple")); + } + + /** + * Test of addItem method, of class CartBean + * + * @throws Exception + */ + @Test + public void shouldAddManyItems() throws Exception { + // given + final List items = Arrays.asList("apple", "banana", "mango", "kiwi", "passion fruit"); + + // when + for (final String item : items) { + sut.addItem(item); + } + + // then + assertThat(sut.getItems(), is(items)); + } + + /** + * Test of removeItem method, of class CartBean + * + * @throws Exception + */ + @Test + public void shouldRemoveOneItem() throws Exception { + // given + final List items = Arrays.asList("apple", "banana", "mango", "kiwi", "passion fruit"); + for (final String item : items) { + sut.addItem(item); + } + + // when + sut.removeItem("banana"); + + // then + assertThat(sut.getItems(), not(hasItem("banana"))); + } + + /** + * Test of getItems method, of class CartBean + * + * @throws Exception + */ + @Test + public void shouldBeEmpty() throws Exception { + // given + + // when + final List actual = sut.getItems(); + + // then + assertThat(actual.isEmpty(), is(true)); + } } \ No newline at end of file diff --git a/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanWithInterfaceTest.java b/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanWithInterfaceTest.java index ca992511e..d74ae943d 100644 --- a/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanWithInterfaceTest.java +++ b/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/CartBeanWithInterfaceTest.java @@ -28,85 +28,85 @@ @RunWith(Arquillian.class) public class CartBeanWithInterfaceTest { - @EJB - private Cart sut; - - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class) - .addClass(Cart.class) - .addClass(CartBeanWithInterface.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } - - /** - * Test of addItem method, of class CartBean - * - * @throws Exception - */ - @Test - public void shouldAddOneItem() throws Exception { - // given - - // when - sut.addItem("apple"); - - // then - assertThat(sut.getItems(), hasItem("apple")); - } - - /** - * Test of addItem method, of class CartBean - * - * @throws Exception - */ - @Test - public void shouldAddManyItems() throws Exception { - // given - final List items = Arrays.asList("apple", "banana", "mango", "kiwi", "passion fruit"); - - // when - for (final String item : items) { - sut.addItem(item); - } - - // then - assertThat(sut.getItems(), is(items)); - } - - /** - * Test of removeItem method, of class CartBean - * - * @throws Exception - */ - @Test - public void shouldRemoveOneItem() throws Exception { - // given - final List items = Arrays.asList("apple", "banana", "mango", "kiwi", "passion fruit"); - for (final String item : items) { - sut.addItem(item); - } - - // when - sut.removeItem("banana"); - - // then - assertThat(sut.getItems(), not(hasItem("banana"))); - } - - /** - * Test of getItems method, of class CartBean - * - * @throws Exception - */ - @Test - public void shouldBeEmpty() throws Exception { - // given - - // when - final List actual = sut.getItems(); - - // then - assertThat(actual.isEmpty(), is(true)); - } + @EJB + private Cart sut; + + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class) + .addClass(Cart.class) + .addClass(CartBeanWithInterface.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } + + /** + * Test of addItem method, of class CartBean + * + * @throws Exception + */ + @Test + public void shouldAddOneItem() throws Exception { + // given + + // when + sut.addItem("apple"); + + // then + assertThat(sut.getItems(), hasItem("apple")); + } + + /** + * Test of addItem method, of class CartBean + * + * @throws Exception + */ + @Test + public void shouldAddManyItems() throws Exception { + // given + final List items = Arrays.asList("apple", "banana", "mango", "kiwi", "passion fruit"); + + // when + for (final String item : items) { + sut.addItem(item); + } + + // then + assertThat(sut.getItems(), is(items)); + } + + /** + * Test of removeItem method, of class CartBean + * + * @throws Exception + */ + @Test + public void shouldRemoveOneItem() throws Exception { + // given + final List items = Arrays.asList("apple", "banana", "mango", "kiwi", "passion fruit"); + for (final String item : items) { + sut.addItem(item); + } + + // when + sut.removeItem("banana"); + + // then + assertThat(sut.getItems(), not(hasItem("banana"))); + } + + /** + * Test of getItems method, of class CartBean + * + * @throws Exception + */ + @Test + public void shouldBeEmpty() throws Exception { + // given + + // when + final List actual = sut.getItems(); + + // then + assertThat(actual.isEmpty(), is(true)); + } } \ No newline at end of file diff --git a/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/ReentrantCallTest.java b/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/ReentrantCallTest.java index 7ef73d27b..8145d98b4 100644 --- a/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/ReentrantCallTest.java +++ b/ejb/stateful/src/test/java/org/javaee7/ejb/stateful/ReentrantCallTest.java @@ -26,10 +26,9 @@ public class ReentrantCallTest { @Deployment public static Archive deployment() { return ShrinkWrap.create(WebArchive.class) - .addClass(ReentrantStatefulBean.class); + .addClass(ReentrantStatefulBean.class); } - @Test public void doReentrantCall() { // initialMethod() will internally call another method on itself. diff --git a/ejb/stateless/pom.xml b/ejb/stateless/pom.xml index bacd9f650..4ba53a455 100644 --- a/ejb/stateless/pom.xml +++ b/ejb/stateless/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.ejb - ejb-samples + org.javaee7 + ejb 1.0-SNAPSHOT ../pom.xml - - org.javaee7.ejb - stateless + org.javaee7 + ejb-stateless 1.0-SNAPSHOT war + Java EE 7 Sample: ejb - stateless diff --git a/ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/AccountSessionBeanWithInterface.java b/ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/AccountSessionBeanWithInterface.java index 3dbd1f43c..3d86e8beb 100644 --- a/ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/AccountSessionBeanWithInterface.java +++ b/ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/AccountSessionBeanWithInterface.java @@ -14,7 +14,7 @@ public String withdraw(float amount) { } @Override - public String deposit(float amount) { + public String deposit(float amount) { return "Deposited: " + amount; } } diff --git a/ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/TestServlet.java b/ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/TestServlet.java index fde10b4a5..e95a4915a 100644 --- a/ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/TestServlet.java +++ b/ejb/stateless/src/main/java/org/javaee7/ejb/stateless/remote/TestServlet.java @@ -12,7 +12,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServletWithInterface"}) +@WebServlet(urlPatterns = { "/TestServletWithInterface" }) public class TestServlet extends HttpServlet { // Cannot be injected using @Inject @@ -29,7 +29,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -57,7 +57,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -71,7 +71,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionBeanTest.java b/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionBeanTest.java index 3a6a8b78d..c9327444d 100644 --- a/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionBeanTest.java +++ b/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionBeanTest.java @@ -22,49 +22,49 @@ @RunWith(Arquillian.class) public class AccountSessionBeanTest { - @Inject - private AccountSessionBean sut; + @Inject + private AccountSessionBean sut; - /** - * Arquillian specific method for creating a file which can be deployed - * while executing the test. - * - * @return a war file - */ - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class) - .addClass(AccountSessionBean.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } + /** + * Arquillian specific method for creating a file which can be deployed + * while executing the test. + * + * @return a war file + */ + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class) + .addClass(AccountSessionBean.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } - /** - * Test of withdraw method, of class AccountSessionBean. - */ - @Test - public void shouldWithdrawGivenAmount() { - // given - final float amount = 5.0F; + /** + * Test of withdraw method, of class AccountSessionBean. + */ + @Test + public void shouldWithdrawGivenAmount() { + // given + final float amount = 5.0F; - // when - final String actual = sut.withdraw(amount); + // when + final String actual = sut.withdraw(amount); - // then - assertThat(actual, is(equalTo("Withdrawn: " + amount))); - } + // then + assertThat(actual, is(equalTo("Withdrawn: " + amount))); + } - /** - * Test of deposit method, of class AccountSessionBean. - */ - @Test - public void shouldDepositGivenAmount() { - // given - final float amount = 10.0F; + /** + * Test of deposit method, of class AccountSessionBean. + */ + @Test + public void shouldDepositGivenAmount() { + // given + final float amount = 10.0F; - // when - final String actual = sut.deposit(amount); + // when + final String actual = sut.deposit(amount); - // then - assertThat(actual, is(equalTo("Deposited: " + amount))); - } + // then + assertThat(actual, is(equalTo("Deposited: " + amount))); + } } \ No newline at end of file diff --git a/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionBeanWithInterfaceTest.java b/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionBeanWithInterfaceTest.java index 4d9607782..ea0012fa2 100644 --- a/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionBeanWithInterfaceTest.java +++ b/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionBeanWithInterfaceTest.java @@ -24,50 +24,50 @@ @RunWith(Arquillian.class) public class AccountSessionBeanWithInterfaceTest { - @EJB - private Account sut; + @EJB + private Account sut; - /** - * Arquillian specific method for creating a file which can be deployed - * while executing the test. - * - * @return a war file - */ - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class) - .addClass(AccountSessionBeanWithInterface.class) - .addClass(Account.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } + /** + * Arquillian specific method for creating a file which can be deployed + * while executing the test. + * + * @return a war file + */ + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class) + .addClass(AccountSessionBeanWithInterface.class) + .addClass(Account.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } - /** - * Test of withdraw method, of class AccountSessionBean. - */ - @Test - public void shouldWithdrawGivenAmount() { - // given - final float amount = 5.0F; + /** + * Test of withdraw method, of class AccountSessionBean. + */ + @Test + public void shouldWithdrawGivenAmount() { + // given + final float amount = 5.0F; - // when - final String actual = sut.withdraw(amount); + // when + final String actual = sut.withdraw(amount); - // then - assertThat(actual, is(equalTo("Withdrawn: " + amount))); - } + // then + assertThat(actual, is(equalTo("Withdrawn: " + amount))); + } - /** - * Test of deposit method, of class AccountSessionBean. - */ - @Test - public void shouldDepositGivenAmount() { - // given - final float amount = 10.0F; + /** + * Test of deposit method, of class AccountSessionBean. + */ + @Test + public void shouldDepositGivenAmount() { + // given + final float amount = 10.0F; - // when - final String actual = sut.deposit(amount); + // when + final String actual = sut.deposit(amount); - // then - assertThat(actual, is(equalTo("Deposited: " + amount))); - } + // then + assertThat(actual, is(equalTo("Deposited: " + amount))); + } } \ No newline at end of file diff --git a/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionStatelessnessTest.java b/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionStatelessnessTest.java index 279d11f60..416b70ca4 100644 --- a/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionStatelessnessTest.java +++ b/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionStatelessnessTest.java @@ -26,13 +26,13 @@ public class AccountSessionStatelessnessTest { @EJB AccountSessionBean account2; - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class, "test.jar") - .addClass(AccountSessionBean.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } - + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class, "test.jar") + .addClass(AccountSessionBean.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } + /** * JSR 318: Enterprise JavaBeans, Version 3.1 * 3.4.7.2 Session Object Identity / Stateless Session Beans diff --git a/ejb/timer/pom.xml b/ejb/timer/pom.xml index f9f34fe63..fc813cc07 100644 --- a/ejb/timer/pom.xml +++ b/ejb/timer/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.ejb - ejb-samples + org.javaee7 + ejb 1.0-SNAPSHOT ../pom.xml - - org.javaee7.ejb - timer + org.javaee7 + ejb-timer 1.0-SNAPSHOT war + Java EE 7 Sample: ejb - timer diff --git a/ejb/timer/src/main/java/org/javaee7/ejb/timer/Ping.java b/ejb/timer/src/main/java/org/javaee7/ejb/timer/Ping.java index 070a816cc..1fa8003a6 100644 --- a/ejb/timer/src/main/java/org/javaee7/ejb/timer/Ping.java +++ b/ejb/timer/src/main/java/org/javaee7/ejb/timer/Ping.java @@ -20,8 +20,8 @@ public String getTimeInfo() { @Override public String toString() { return "Ping {" + - "timeInfo='" + timeInfo + '\'' + - ", time=" + time + - '}'; + "timeInfo='" + timeInfo + '\'' + + ", time=" + time + + '}'; } } diff --git a/ejb/timer/src/test/java/org/javaee7/ejb/timer/TimerSessionBeanTest.java b/ejb/timer/src/test/java/org/javaee7/ejb/timer/TimerSessionBeanTest.java index 83aa3d977..0882d1c03 100644 --- a/ejb/timer/src/test/java/org/javaee7/ejb/timer/TimerSessionBeanTest.java +++ b/ejb/timer/src/test/java/org/javaee7/ejb/timer/TimerSessionBeanTest.java @@ -33,12 +33,12 @@ public class TimerSessionBeanTest { @Deployment public static WebArchive deploy() { File[] jars = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("com.jayway.awaitility:awaitility") - .withTransitivity().asFile(); + .resolve("com.jayway.awaitility:awaitility") + .withTransitivity().asFile(); return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(jars) - .addClasses(Ping.class, PingsListener.class, TimerSessionBean.class); + .addAsLibraries(jars) + .addClasses(Ping.class, PingsListener.class, TimerSessionBean.class); } @Test @@ -54,18 +54,18 @@ public void should_receive_two_pings() { } private Matcher withinWindow(final long timeout, final long tolerance) { - return new BaseMatcher() { - @Override - public boolean matches(Object item) { - final Long actual = (Long) item; - return Math.abs(actual - timeout) < tolerance; - } + return new BaseMatcher() { + @Override + public boolean matches(Object item) { + final Long actual = (Long) item; + return Math.abs(actual - timeout) < tolerance; + } - @Override - public void describeTo(Description description) { - //To change body of implemented methods use File | Settings | File Templates. - } - }; + @Override + public void describeTo(Description description) { + //To change body of implemented methods use File | Settings | File Templates. + } + }; } } diff --git a/el/README.md b/el/README.md new file mode 100644 index 000000000..6972a6f2d --- /dev/null +++ b/el/README.md @@ -0,0 +1,13 @@ +# Java EE 7 Samples: EL 3.0 # + +The [JSR 341](https://jcp.org/en/jsr/detail?id=341) is an update to Expression Language 2.2, currently part of JSR 245, JavaServer Page (JSP) 2.2. + +## Samples ## + + - standalone + +## How to run + +More information on how to run can be found at: + + diff --git a/el/pom.xml b/el/pom.xml index 4093f8eb9..0e9548643 100644 --- a/el/pom.xml +++ b/el/pom.xml @@ -1,22 +1,23 @@ - + + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.el - el-samples + org.javaee7 + el 1.0-SNAPSHOT pom - Java EE 7 Expression Language Samples + Java EE 7 Sample: el standalone + org.javaee7 diff --git a/el/standalone/pom.xml b/el/standalone/pom.xml index 574d40fb8..e2911c32f 100644 --- a/el/standalone/pom.xml +++ b/el/standalone/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.el - el-samples + org.javaee7 + el 1.0-SNAPSHOT ../pom.xml - - org.javaee7.el - standalone + org.javaee7 + el-standalone 1.0-SNAPSHOT war + Java EE 7 Sample: el - standalone diff --git a/el/standalone/src/test/java/org/javaee7/el/standalone/ELResolverTest.java b/el/standalone/src/test/java/org/javaee7/el/standalone/ELResolverTest.java index f36e524f7..35c005587 100644 --- a/el/standalone/src/test/java/org/javaee7/el/standalone/ELResolverTest.java +++ b/el/standalone/src/test/java/org/javaee7/el/standalone/ELResolverTest.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertEquals; - /** * @author Alexis Hassler */ @@ -24,6 +23,7 @@ public class ELResolverTest { public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class); } + private ELProcessor elProcessor; @Before diff --git a/extra/camel/src/main/java/org/javaee7/extra/camel/Bootstrap.java b/extra/camel/src/main/java/org/javaee7/extra/camel/Bootstrap.java index 01abea4c9..9e06cd315 100644 --- a/extra/camel/src/main/java/org/javaee7/extra/camel/Bootstrap.java +++ b/extra/camel/src/main/java/org/javaee7/extra/camel/Bootstrap.java @@ -32,14 +32,14 @@ public void init() { context.addRoutes(new RouteBuilder() { @Override public void configure() { -// from("test-jms:queue:test.queue").to("file://test"); + // from("test-jms:queue:test.queue").to("file://test"); from("timer://timer1?period=1000") - .process(new Processor() { - @Override - public void process(Exchange message) throws Exception { - logger.info("Processing {}", message); - } - }); + .process(new Processor() { + @Override + public void process(Exchange message) throws Exception { + logger.info("Processing {}", message); + } + }); } }); } catch (Exception ex) { @@ -47,7 +47,7 @@ public void process(Exchange message) throws Exception { } // Define Timer URI -// simpleRoute.setTimerUri("timer://simple?fixedRate=true&period=10s"); + // simpleRoute.setTimerUri("timer://simple?fixedRate=true&period=10s"); // Start Camel Context context.start(); diff --git a/extra/nosql/cassandra/src/main/java/org/javaee7/extra/nosql/cassandra/Person.java b/extra/nosql/cassandra/src/main/java/org/javaee7/extra/nosql/cassandra/Person.java index ae4b12e2d..78e49ed51 100644 --- a/extra/nosql/cassandra/src/main/java/org/javaee7/extra/nosql/cassandra/Person.java +++ b/extra/nosql/cassandra/src/main/java/org/javaee7/extra/nosql/cassandra/Person.java @@ -45,7 +45,7 @@ public void setAge(int age) { public String toString() { return name + ", " + age; } - + public static Person fromString(String string) { StringTokenizer tokens = new StringTokenizer(string, ","); return new Person(tokens.nextToken(), Integer.parseInt(tokens.nextToken().trim())); diff --git a/extra/nosql/cassandra/src/main/java/org/javaee7/extra/nosql/cassandra/PersonSessionBean.java b/extra/nosql/cassandra/src/main/java/org/javaee7/extra/nosql/cassandra/PersonSessionBean.java index d6806d528..f6577d28e 100644 --- a/extra/nosql/cassandra/src/main/java/org/javaee7/extra/nosql/cassandra/PersonSessionBean.java +++ b/extra/nosql/cassandra/src/main/java/org/javaee7/extra/nosql/cassandra/PersonSessionBean.java @@ -36,29 +36,29 @@ public class PersonSessionBean { @PostConstruct private void initDB() { cluster = Cluster.builder() - .addContactPoint("localhost") - // .withSSL() // Uncomment if using client to node encryption - .build(); + .addContactPoint("localhost") + // .withSSL() // Uncomment if using client to node encryption + .build(); Metadata metadata = cluster.getMetadata(); System.out.printf("Connected to cluster: %s\n", metadata.getClusterName()); for (Host host : metadata.getAllHosts()) { System.out.printf("Datacenter: %s; Host: %s; Rack: %s\n", - host.getDatacenter(), host.getAddress(), host.getRack()); + host.getDatacenter(), host.getAddress(), host.getRack()); } session = cluster.connect(); session.execute("CREATE KEYSPACE IF NOT EXISTS test WITH replication " - + "= {'class':'SimpleStrategy', 'replication_factor':1};"); + + "= {'class':'SimpleStrategy', 'replication_factor':1};"); session.execute( - "CREATE TABLE IF NOT EXISTS test.person (" + "CREATE TABLE IF NOT EXISTS test.person (" + "name text PRIMARY KEY," + "age int" + ");"); - + selectAllPersons = session.prepare("SELECT * FROM test.person"); insertPerson = session.prepare( - "INSERT INTO test.person (name, age) VALUES (?, ?);" - ); + "INSERT INTO test.person (name, age) VALUES (?, ?);" + ); } @PreDestroy diff --git a/extra/nosql/couchbase/src/main/java/org/javaee7/extra/nosql/couchbase/Person.java b/extra/nosql/couchbase/src/main/java/org/javaee7/extra/nosql/couchbase/Person.java index 59b576205..6c34cb10c 100644 --- a/extra/nosql/couchbase/src/main/java/org/javaee7/extra/nosql/couchbase/Person.java +++ b/extra/nosql/couchbase/src/main/java/org/javaee7/extra/nosql/couchbase/Person.java @@ -11,7 +11,7 @@ @Named @ApplicationScoped public class Person implements Serializable { - + @Size(min = 1, max = 20) private String name; diff --git a/extra/nosql/couchbase/src/main/java/org/javaee7/extra/nosql/couchbase/PersonSessionBean.java b/extra/nosql/couchbase/src/main/java/org/javaee7/extra/nosql/couchbase/PersonSessionBean.java index 1cbbe9af1..cc3ebef27 100644 --- a/extra/nosql/couchbase/src/main/java/org/javaee7/extra/nosql/couchbase/PersonSessionBean.java +++ b/extra/nosql/couchbase/src/main/java/org/javaee7/extra/nosql/couchbase/PersonSessionBean.java @@ -27,9 +27,9 @@ public class PersonSessionBean { @Inject Person person; - + CouchbaseClient client; - + Set set = new HashSet<>(); @PostConstruct @@ -37,8 +37,8 @@ private void initDB() { try { // Get an instance of Couchbase List hosts = Arrays.asList( - new URI("http://localhost:8091/pools") - ); + new URI("http://localhost:8091/pools") + ); // Get an instance of Couchbase // Name of the Bucket to connect to @@ -68,7 +68,7 @@ public List getPersons() { List persons = new ArrayList(); Map map = client.getBulk(set.iterator()); for (String key : map.keySet()) { - persons.add((Person)map.get(key)); + persons.add((Person) map.get(key)); } return persons; } diff --git a/extra/nosql/hbase/src/main/java/org/javaee7/extra/nosql/hbase/Person.java b/extra/nosql/hbase/src/main/java/org/javaee7/extra/nosql/hbase/Person.java index 514b005a1..7bafc16d2 100644 --- a/extra/nosql/hbase/src/main/java/org/javaee7/extra/nosql/hbase/Person.java +++ b/extra/nosql/hbase/src/main/java/org/javaee7/extra/nosql/hbase/Person.java @@ -45,7 +45,7 @@ public void setAge(int age) { public String toString() { return name + ", " + age; } - + public static Person fromString(String string) { StringTokenizer tokens = new StringTokenizer(string, ","); return new Person(tokens.nextToken(), Integer.parseInt(tokens.nextToken().trim())); diff --git a/extra/nosql/hbase/src/main/java/org/javaee7/extra/nosql/hbase/PersonSessionBean.java b/extra/nosql/hbase/src/main/java/org/javaee7/extra/nosql/hbase/PersonSessionBean.java index bb64424a6..a82d5bda0 100644 --- a/extra/nosql/hbase/src/main/java/org/javaee7/extra/nosql/hbase/PersonSessionBean.java +++ b/extra/nosql/hbase/src/main/java/org/javaee7/extra/nosql/hbase/PersonSessionBean.java @@ -49,23 +49,23 @@ private void initDB() { // By default, it's localhost, don't worry. Configuration config = HBaseConfiguration.create(); -// HTable table = new HTable(config, personsTable); + // HTable table = new HTable(config, personsTable); HBaseAdmin admin = new HBaseAdmin(config); HTableDescriptor blogstable = new HTableDescriptor(personsTable); admin.createTable(blogstable); -// -// // Cannot edit a stucture on an active table. -// admin.disableTable(personsTable); -// -// HColumnDescriptor userCol = new HColumnDescriptor("name"); -// admin.addColumn(personsTable, userCol); -// -// HColumnDescriptor ageCol = new HColumnDescriptor("age"); -// admin.addColumn(personsTable, ageCol); -// -// // For readin, it needs to be re-enabled. -// admin.enableTable(personsTable); + // + // // Cannot edit a stucture on an active table. + // admin.disableTable(personsTable); + // + // HColumnDescriptor userCol = new HColumnDescriptor("name"); + // admin.addColumn(personsTable, userCol); + // + // HColumnDescriptor ageCol = new HColumnDescriptor("age"); + // admin.addColumn(personsTable, ageCol); + // + // // For readin, it needs to be re-enabled. + // admin.enableTable(personsTable); } catch (IOException ex) { Logger.getLogger(PersonSessionBean.class.getName()).log(Level.SEVERE, null, ex); } @@ -80,20 +80,20 @@ public void createPerson() throws IOException { Put put = new Put(Bytes.toBytes(person.getName()), Calendar.getInstance().getTime().getTime()); put.add(Bytes.toBytes(personsColumnFamily), - Bytes.toBytes("name"), - Calendar.getInstance().getTime().getTime(), - Bytes.toBytes(person.getName())); + Bytes.toBytes("name"), + Calendar.getInstance().getTime().getTime(), + Bytes.toBytes(person.getName())); put.add(Bytes.toBytes(personsColumnFamily), - Bytes.toBytes("age"), - Calendar.getInstance().getTime().getTime(), - Bytes.toBytes(person.getAge())); + Bytes.toBytes("age"), + Calendar.getInstance().getTime().getTime(), + Bytes.toBytes(person.getAge())); table.put(put); } } public List getPersons() throws IOException { List persons = new ArrayList<>(); - + try (HTableInterface table = pool.getTable(personsTable)) { Scan scan = new Scan(); scan.addFamily(Bytes.toBytes(personsColumnFamily)); @@ -101,9 +101,9 @@ public List getPersons() throws IOException { for (Result result : resultScanner) { for (KeyValue kv : result.raw()) { Person p = new Person(); -// p.setTitle(Bytes.toString(kv.getQualifier())); -// p.setBody(Bytes.toString(kv.getValue())); -// p.setId(Bytes.toString(result.getRow())); + // p.setTitle(Bytes.toString(kv.getQualifier())); + // p.setBody(Bytes.toString(kv.getValue())); + // p.setId(Bytes.toString(result.getRow())); persons.add(person); } } diff --git a/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/EhcacheTest.java b/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/EhcacheTest.java index 638ec2e21..f36b9ab7d 100644 --- a/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/EhcacheTest.java +++ b/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/EhcacheTest.java @@ -12,8 +12,8 @@ @RunWith(Arquillian.class) public class EhcacheTest extends AbstractOgmTest { - @Deployment - public static WebArchive createDeployment() { - return AbstractOgmTest.createDeployment( "ehcache" ); - } + @Deployment + public static WebArchive createDeployment() { + return AbstractOgmTest.createDeployment("ehcache"); + } } diff --git a/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/commons/AbstractOgmTest.java b/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/commons/AbstractOgmTest.java index 3997cb928..d080756ff 100644 --- a/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/commons/AbstractOgmTest.java +++ b/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/commons/AbstractOgmTest.java @@ -20,41 +20,41 @@ * @author Guillaume Scheibel */ public abstract class AbstractOgmTest { - final static String OGM_VERSION = "4.0.0-SNAPSHOT"; - @PersistenceContext - EntityManager entityManager; - @Inject - UserTransaction ut; + final static String OGM_VERSION = "4.0.0-SNAPSHOT"; + @PersistenceContext + EntityManager entityManager; + @Inject + UserTransaction ut; - public static WebArchive createDeployment(String ogmModuleName) { - WebArchive webArchive = ShrinkWrap.create( WebArchive.class ) - .addClass( Person.class ) - .addClass( AbstractOgmTest.class ) - .addAsResource( ogmModuleName + "-persistence.xml", "META-INF/persistence.xml" ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ) - .addAsLibraries( - resolver().resolve( - "org.hibernate.ogm:hibernate-ogm-core:" + OGM_VERSION, - "org.hibernate.ogm:hibernate-ogm-" + ogmModuleName + ":" + OGM_VERSION - ) - .withTransitivity() - .asFile() - ); - return webArchive; - } + public static WebArchive createDeployment(String ogmModuleName) { + WebArchive webArchive = ShrinkWrap.create(WebArchive.class) + .addClass(Person.class) + .addClass(AbstractOgmTest.class) + .addAsResource(ogmModuleName + "-persistence.xml", "META-INF/persistence.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") + .addAsLibraries( + resolver().resolve( + "org.hibernate.ogm:hibernate-ogm-core:" + OGM_VERSION, + "org.hibernate.ogm:hibernate-ogm-" + ogmModuleName + ":" + OGM_VERSION + ) + .withTransitivity() + .asFile() + ); + return webArchive; + } - @Test - public void insertEntityTest() throws Exception { - final String name = "Guillaume"; - final Long id = 1L; - ut.begin(); - Person guillaume = new Person( id, name ); - entityManager.persist( guillaume ); - ut.commit(); + @Test + public void insertEntityTest() throws Exception { + final String name = "Guillaume"; + final Long id = 1L; + ut.begin(); + Person guillaume = new Person(id, name); + entityManager.persist(guillaume); + ut.commit(); - Person person = entityManager.find( Person.class, id ); - assertThat( person, is( notNullValue() ) ); - assertThat( person.getId(), is( id ) ); - assertThat( person.getName(), is( equalTo( name ) ) ); - } + Person person = entityManager.find(Person.class, id); + assertThat(person, is(notNullValue())); + assertThat(person.getId(), is(id)); + assertThat(person.getName(), is(equalTo(name))); + } } diff --git a/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/commons/Person.java b/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/commons/Person.java index f3ee3d9a6..bd38bda7c 100644 --- a/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/commons/Person.java +++ b/extra/nosql/hibernate-ogm/src/test/java/org/javaee7/extra/nosql/hibernateogm/commons/Person.java @@ -7,69 +7,69 @@ @Entity public class Person { - @Id - private Long id = null; - @NotNull - private String name; + @Id + private Long id = null; + @NotNull + private String name; - public Person() { - super(); - } + public Person() { + super(); + } - public Person(Long id, String name) { - this.id = id; - this.name = name; - } + public Person(Long id, String name) { + this.id = id; + this.name = name; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - @Override - public String toString() { - return "Person{" + - "id=" + id + - ", name='" + name + '\'' + - '}'; - } + @Override + public String toString() { + return "Person{" + + "id=" + id + + ", name='" + name + '\'' + + '}'; + } - @Override - public boolean equals(Object o) { - if ( this == o ) { - return true; - } - if ( o == null || getClass() != o.getClass() ) { - return false; - } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } - Person person = (Person) o; + Person person = (Person) o; - if ( id != null ? !id.equals( person.id ) : person.id != null ) { - return false; - } - if ( name != null ? !name.equals( person.name ) : person.name != null ) { - return false; - } + if (id != null ? !id.equals(person.id) : person.id != null) { + return false; + } + if (name != null ? !name.equals(person.name) : person.name != null) { + return false; + } - return true; - } + return true; + } - @Override - public int hashCode() { - int result = id != null ? id.hashCode() : 0; - result = 31 * result + ( name != null ? name.hashCode() : 0 ); - return result; - } + @Override + public int hashCode() { + int result = id != null ? id.hashCode() : 0; + result = 31 * result + (name != null ? name.hashCode() : 0); + return result; + } } diff --git a/extra/nosql/mongo/src/main/java/org/javaee7/extra/nosql/mongo/PersonSessionBean.java b/extra/nosql/mongo/src/main/java/org/javaee7/extra/nosql/mongo/PersonSessionBean.java index 1a2c6b52c..fd607d690 100644 --- a/extra/nosql/mongo/src/main/java/org/javaee7/extra/nosql/mongo/PersonSessionBean.java +++ b/extra/nosql/mongo/src/main/java/org/javaee7/extra/nosql/mongo/PersonSessionBean.java @@ -30,7 +30,7 @@ public class PersonSessionBean { @PostConstruct private void initDB() { - try { + try { // Get an instance of Mongo Mongo m = new Mongo("localhost", 27017); DB db = m.getDB("personDB"); @@ -42,7 +42,7 @@ private void initDB() { Logger.getLogger(PersonSessionBean.class.getName()).log(Level.SEVERE, null, ex); } } - + public void createPerson() { BasicDBObject doc = person.toDBObject(); personCollection.insert(doc); diff --git a/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/BackingBean.java b/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/BackingBean.java index 36a9c176c..be0c8caaf 100644 --- a/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/BackingBean.java +++ b/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/BackingBean.java @@ -10,16 +10,16 @@ @Named @ApplicationScoped public class BackingBean { - + @Size(min = 1, max = 20) private String name; private int age; - + private String name2; - + private int age2; - + private String relationship; public BackingBean() { @@ -69,11 +69,11 @@ public String getRelationship() { public void setRelationship(String relationship) { this.relationship = relationship; } - + public String person1String() { return name + ", " + age; } - + public String person2String() { return name2 + ", " + age2; } diff --git a/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/Person.java b/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/Person.java index 48f88fa2c..4fc1dcb75 100644 --- a/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/Person.java +++ b/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/Person.java @@ -7,12 +7,12 @@ * @author Arun Gupta */ public class Person { - + @Size(min = 1, max = 20) private String name; private int age; - + public Person() { } @@ -41,11 +41,11 @@ public void setAge(int age) { public String toString() { return name + ", " + age; } - + public static final Person fromString(String string) { StringTokenizer tokens = new StringTokenizer(string, ","); Person p = new Person(tokens.nextToken(), Integer.parseInt(tokens.nextToken().trim())); - + return p; } } diff --git a/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/PersonSessionBean.java b/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/PersonSessionBean.java index 1dcd687b5..547dc7b07 100644 --- a/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/PersonSessionBean.java +++ b/extra/nosql/neo4j/src/main/java/org/javaee7/extra/nosql/neo4j/PersonSessionBean.java @@ -36,7 +36,9 @@ public class PersonSessionBean { Node secondNode; private static enum RelTypes implements RelationshipType { - SPOUSE, BROTHER, SISTER + SPOUSE, + BROTHER, + SISTER } Set set = new HashSet<>(); diff --git a/extra/nosql/oracle/src/main/java/org/javaee7/extra/nosql/oracle/Person.java b/extra/nosql/oracle/src/main/java/org/javaee7/extra/nosql/oracle/Person.java index 31fd9a202..05c3a3b86 100644 --- a/extra/nosql/oracle/src/main/java/org/javaee7/extra/nosql/oracle/Person.java +++ b/extra/nosql/oracle/src/main/java/org/javaee7/extra/nosql/oracle/Person.java @@ -12,7 +12,7 @@ @Named @ApplicationScoped public class Person implements Serializable { - + @Size(min = 1, max = 20) private String name; @@ -46,11 +46,11 @@ public void setAge(int age) { public String toString() { return name + ", " + age; } - + public static Person fromString(String string) { StringTokenizer tokens = new StringTokenizer(string, ","); - + return new Person(tokens.nextToken(), Integer.parseInt(tokens.nextToken().trim())); } - + } diff --git a/extra/nosql/redis/src/main/java/org/javaee7/extra/nosql/redis/Person.java b/extra/nosql/redis/src/main/java/org/javaee7/extra/nosql/redis/Person.java index ca75ffe99..fcc817af3 100644 --- a/extra/nosql/redis/src/main/java/org/javaee7/extra/nosql/redis/Person.java +++ b/extra/nosql/redis/src/main/java/org/javaee7/extra/nosql/redis/Person.java @@ -45,7 +45,7 @@ public void setAge(int age) { public String toString() { return name + ", " + age; } - + public static Person fromString(String string) { StringTokenizer tokens = new StringTokenizer(string, ","); return new Person(tokens.nextToken(), Integer.parseInt(tokens.nextToken().trim())); diff --git a/extra/nosql/redis/src/main/java/org/javaee7/extra/nosql/redis/PersonSessionBean.java b/extra/nosql/redis/src/main/java/org/javaee7/extra/nosql/redis/PersonSessionBean.java index 6736d52e6..98d601e3e 100644 --- a/extra/nosql/redis/src/main/java/org/javaee7/extra/nosql/redis/PersonSessionBean.java +++ b/extra/nosql/redis/src/main/java/org/javaee7/extra/nosql/redis/PersonSessionBean.java @@ -20,17 +20,17 @@ public class PersonSessionBean { @Inject Person person; - + Jedis jedis; - + Set set = new HashSet<>(); @PostConstruct private void initDB() { -// Start embedded Redis + // Start embedded Redis jedis = new Jedis("localhost", 6379); } - + @PreDestroy private void stopDB() { jedis.shutdown(); diff --git a/extra/nosql/riak/src/main/java/org/javaee7/extra/nosql/riak/Person.java b/extra/nosql/riak/src/main/java/org/javaee7/extra/nosql/riak/Person.java index b6d0c1c00..a1c817dbe 100644 --- a/extra/nosql/riak/src/main/java/org/javaee7/extra/nosql/riak/Person.java +++ b/extra/nosql/riak/src/main/java/org/javaee7/extra/nosql/riak/Person.java @@ -12,7 +12,7 @@ @Named @ApplicationScoped public class Person implements Serializable { - + @Size(min = 1, max = 20) private String name; @@ -46,11 +46,11 @@ public void setAge(int age) { public String toString() { return name + ", " + age; } - + public static Person fromString(String string) { StringTokenizer tokens = new StringTokenizer(string, ","); - + return new Person(tokens.nextToken(), Integer.parseInt(tokens.nextToken().trim())); } - + } diff --git a/extra/nosql/voldemort/src/main/java/org/javaee7/extra/nosql/voldemort/Person.java b/extra/nosql/voldemort/src/main/java/org/javaee7/extra/nosql/voldemort/Person.java index 316b7df04..5258f4b58 100644 --- a/extra/nosql/voldemort/src/main/java/org/javaee7/extra/nosql/voldemort/Person.java +++ b/extra/nosql/voldemort/src/main/java/org/javaee7/extra/nosql/voldemort/Person.java @@ -12,7 +12,7 @@ @Named @ApplicationScoped public class Person implements Serializable { - + @Size(min = 1, max = 20) private String name; @@ -46,11 +46,11 @@ public void setAge(int age) { public String toString() { return name + ", " + age; } - + public static Person fromString(String string) { StringTokenizer tokens = new StringTokenizer(string, ","); - + return new Person(tokens.nextToken(), Integer.parseInt(tokens.nextToken().trim())); } - + } diff --git a/extra/nosql/voldemort/src/main/java/org/javaee7/extra/nosql/voldemort/PersonSessionBean.java b/extra/nosql/voldemort/src/main/java/org/javaee7/extra/nosql/voldemort/PersonSessionBean.java index e24ee53c2..7780b1f55 100644 --- a/extra/nosql/voldemort/src/main/java/org/javaee7/extra/nosql/voldemort/PersonSessionBean.java +++ b/extra/nosql/voldemort/src/main/java/org/javaee7/extra/nosql/voldemort/PersonSessionBean.java @@ -32,10 +32,10 @@ public class PersonSessionBean { @PostConstruct private void initDB() { -// // start embedded -// VoldemortConfig config = VoldemortConfig.loadFromEnvironmentVariable(); -// VoldemortServer server = new VoldemortServer(config); -// server.start(); + // // start embedded + // VoldemortConfig config = VoldemortConfig.loadFromEnvironmentVariable(); + // VoldemortServer server = new VoldemortServer(config); + // server.start(); // bootstrap String bootstrapUrl = "tcp://localhost:6666"; diff --git a/extra/quartz/src/main/java/org/javaee7/extra/quartz/MyCronJob.java b/extra/quartz/src/main/java/org/javaee7/extra/quartz/MyCronJob.java index 54ddb9af7..57dd042b6 100644 --- a/extra/quartz/src/main/java/org/javaee7/extra/quartz/MyCronJob.java +++ b/extra/quartz/src/main/java/org/javaee7/extra/quartz/MyCronJob.java @@ -14,5 +14,5 @@ public class MyCronJob implements Job { public void execute(JobExecutionContext jec) throws JobExecutionException { System.out.println("MyCronJob.execute: " + Calendar.getInstance().getTime()); } - + } diff --git a/extra/quartz/src/main/java/org/javaee7/extra/quartz/MySimpleJob.java b/extra/quartz/src/main/java/org/javaee7/extra/quartz/MySimpleJob.java index 60e714ba6..ee4b78608 100644 --- a/extra/quartz/src/main/java/org/javaee7/extra/quartz/MySimpleJob.java +++ b/extra/quartz/src/main/java/org/javaee7/extra/quartz/MySimpleJob.java @@ -14,5 +14,5 @@ public class MySimpleJob implements Job { public void execute(JobExecutionContext jec) throws JobExecutionException { System.out.println("MySimpleJob.execute: " + Calendar.getInstance().getTime()); } - + } diff --git a/extra/quartz/src/main/java/org/javaee7/extra/quartz/TestServlet.java b/extra/quartz/src/main/java/org/javaee7/extra/quartz/TestServlet.java index 1228c2a6c..c0f3f6558 100644 --- a/extra/quartz/src/main/java/org/javaee7/extra/quartz/TestServlet.java +++ b/extra/quartz/src/main/java/org/javaee7/extra/quartz/TestServlet.java @@ -22,7 +22,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -35,7 +35,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -50,35 +50,35 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re JobDetail cronJob = JobBuilder.newJob(MyCronJob.class).build(); Trigger simpleTrigger = TriggerBuilder - .newTrigger() - .withSchedule( - SimpleScheduleBuilder.simpleSchedule().withIntervalInSeconds(1).repeatForever() - ) - .build(); + .newTrigger() + .withSchedule( + SimpleScheduleBuilder.simpleSchedule().withIntervalInSeconds(1).repeatForever() + ) + .build(); Trigger cronTrigger = TriggerBuilder - .newTrigger() - .withSchedule( - CronScheduleBuilder.cronSchedule("0/3 * * * * ?") - ) - .build(); + .newTrigger() + .withSchedule( + CronScheduleBuilder.cronSchedule("0/3 * * * * ?") + ) + .build(); Scheduler scheduler = StdSchedulerFactory.getDefaultScheduler(); - + out.println("Starting the scheduler"); scheduler.start(); - + out.println("

Starting Simple Trigger - every 1 second

"); scheduler.scheduleJob(simpleJob, simpleTrigger); out.println("

Starting Cron Trigger - every 3 seconds

"); scheduler.scheduleJob(cronJob, cronTrigger); - + out.println("Sleeping for 7 seconds"); Thread.sleep(7000); out.println("
Shutting down the scheduler"); scheduler.shutdown(); - + out.println("

Check \"server.log\" for output - 8 outputs from simple trigger, 3 from cron trigger"); out.println(""); out.println(""); @@ -98,7 +98,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -112,7 +112,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/extra/twitter-search/src/main/java/org/javaee7/extra/twitter/search/TestServlet.java b/extra/twitter-search/src/main/java/org/javaee7/extra/twitter/search/TestServlet.java index 1bcd25c0b..e807d03ce 100644 --- a/extra/twitter-search/src/main/java/org/javaee7/extra/twitter/search/TestServlet.java +++ b/extra/twitter-search/src/main/java/org/javaee7/extra/twitter/search/TestServlet.java @@ -15,7 +15,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { @Inject @@ -32,7 +32,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -63,7 +63,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -78,7 +78,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/interceptor/README.md b/interceptor/README.md new file mode 100644 index 000000000..92e052719 --- /dev/null +++ b/interceptor/README.md @@ -0,0 +1,13 @@ +# Java EE 7 Samples: Interceptor 1.2 # + +The [JSR 318](https://jcp.org/en/jsr/detail?id=318) specifies Interceptors 1.2. Since this is a maintenance release on top of 1.1 the JSR number still remained the same as EJB 3.1 (JSR 318). + +## Samples ## + + - around-construct + +## How to run + +More information on how to run can be found at: + + diff --git a/interceptor/around-construct/pom.xml b/interceptor/around-construct/pom.xml index c8f0a81ec..4efdff461 100644 --- a/interceptor/around-construct/pom.xml +++ b/interceptor/around-construct/pom.xml @@ -1,12 +1,13 @@ 4.0.0 + - org.javaee7.interceptor - interceptor-samples + org.javaee7 + interceptor 1.0-SNAPSHOT ../pom.xml - - around-construct + interceptor-around-construct + Java EE 7 Sample: interceptor - around-construct diff --git a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/Greeting.java b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/Greeting.java index bfa8f061d..59c96bfcd 100644 --- a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/Greeting.java +++ b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/Greeting.java @@ -4,8 +4,9 @@ * @author Radim Hanus */ public interface Greeting { - boolean isConstructed(); - boolean isInitialized(); + boolean isConstructed(); - Param getParam(); + boolean isInitialized(); + + Param getParam(); } diff --git a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/GreetingBean.java b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/GreetingBean.java index 2b651ea3b..e09b539a1 100644 --- a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/GreetingBean.java +++ b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/GreetingBean.java @@ -8,34 +8,34 @@ */ @MyInterceptorBinding public class GreetingBean implements Greeting { - private boolean constructed = false; - private boolean initialized = false; - - private Param param; - - @Inject - public GreetingBean(Param param) { - this.param = param; - constructed = true; - } - - @PostConstruct - void onPostConstruct() { - initialized = true; - } - - @Override - public boolean isConstructed() { - return constructed; - } - - @Override - public boolean isInitialized() { - return initialized; - } - - @Override - public Param getParam() { - return param; - } + private boolean constructed = false; + private boolean initialized = false; + + private Param param; + + @Inject + public GreetingBean(Param param) { + this.param = param; + constructed = true; + } + + @PostConstruct + void onPostConstruct() { + initialized = true; + } + + @Override + public boolean isConstructed() { + return constructed; + } + + @Override + public boolean isInitialized() { + return initialized; + } + + @Override + public Param getParam() { + return param; + } } diff --git a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/GreetingParam.java b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/GreetingParam.java index b9e5748ce..477f2a92f 100644 --- a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/GreetingParam.java +++ b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/GreetingParam.java @@ -4,14 +4,14 @@ * @author Radim Hanus */ public class GreetingParam implements Param { - private String value; + private String value; - public GreetingParam() { - value = "Greeting"; - } + public GreetingParam() { + value = "Greeting"; + } - @Override - public String getValue() { - return value; - } + @Override + public String getValue() { + return value; + } } diff --git a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/MyInterceptor.java b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/MyInterceptor.java index e0fca84e2..45a093154 100644 --- a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/MyInterceptor.java +++ b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/MyInterceptor.java @@ -12,50 +12,50 @@ @Interceptor @MyInterceptorBinding public class MyInterceptor { - @AroundConstruct - public Object onConstruct(InvocationContext context) throws Exception { - // null before the InvocationContext.proceed() returns - Object target = context.getTarget(); - isNull(target); - // null in case of AroundConstruct - Method method = context.getMethod(); - isNull(method); - // NOT null in case of AroundConstruct - Constructor ctor = context.getConstructor(); - isNotNull(ctor); - - // perform the constructor injection - Object result = context.proceed(); - isNull(result); - - // NOT null after the InvocationContext.proceed() completes - target = context.getTarget(); - isNotNull(target); - // a constructor should have been called - GreetingBean bean = (GreetingBean) target; - isBoolean(bean.isConstructed(), true); - isBoolean(bean.isInitialized(), false); - // constructor injection should have been done - isNotNull(bean.getParam()); - - return null; - } - - private static void isNull(Object o) throws Exception { - if (o != null) { - throw new IllegalStateException("null required"); - } - } - - private static void isNotNull(Object o) throws Exception { - if (o == null) { - throw new IllegalStateException("not null required"); - } - } - - private static void isBoolean(Object o, Boolean value) { - if (!o.equals(value)) { - throw new IllegalStateException(value + " required"); - } - } + @AroundConstruct + public Object onConstruct(InvocationContext context) throws Exception { + // null before the InvocationContext.proceed() returns + Object target = context.getTarget(); + isNull(target); + // null in case of AroundConstruct + Method method = context.getMethod(); + isNull(method); + // NOT null in case of AroundConstruct + Constructor ctor = context.getConstructor(); + isNotNull(ctor); + + // perform the constructor injection + Object result = context.proceed(); + isNull(result); + + // NOT null after the InvocationContext.proceed() completes + target = context.getTarget(); + isNotNull(target); + // a constructor should have been called + GreetingBean bean = (GreetingBean) target; + isBoolean(bean.isConstructed(), true); + isBoolean(bean.isInitialized(), false); + // constructor injection should have been done + isNotNull(bean.getParam()); + + return null; + } + + private static void isNull(Object o) throws Exception { + if (o != null) { + throw new IllegalStateException("null required"); + } + } + + private static void isNotNull(Object o) throws Exception { + if (o == null) { + throw new IllegalStateException("not null required"); + } + } + + private static void isBoolean(Object o, Boolean value) { + if (!o.equals(value)) { + throw new IllegalStateException(value + " required"); + } + } } diff --git a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/MyInterceptorBinding.java b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/MyInterceptorBinding.java index e1305c57c..e7d17b872 100644 --- a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/MyInterceptorBinding.java +++ b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/MyInterceptorBinding.java @@ -13,6 +13,6 @@ */ @InterceptorBinding @Retention(RUNTIME) -@Target({METHOD, TYPE}) +@Target({ METHOD, TYPE }) public @interface MyInterceptorBinding { } diff --git a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/Param.java b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/Param.java index 900d4ed9e..8aab12b2f 100644 --- a/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/Param.java +++ b/interceptor/around-construct/src/main/java/org/javaee7/interceptor/aroundconstruct/Param.java @@ -4,5 +4,5 @@ * @author Radim Hanus */ public interface Param { - String getValue(); + String getValue(); } diff --git a/interceptor/around-construct/src/test/java/org/javaee7/interceptor/aroundconstruct/GreetingBeanTest.java b/interceptor/around-construct/src/test/java/org/javaee7/interceptor/aroundconstruct/GreetingBeanTest.java index 515bed816..acb42e087 100644 --- a/interceptor/around-construct/src/test/java/org/javaee7/interceptor/aroundconstruct/GreetingBeanTest.java +++ b/interceptor/around-construct/src/test/java/org/javaee7/interceptor/aroundconstruct/GreetingBeanTest.java @@ -21,22 +21,22 @@ */ @RunWith(Arquillian.class) public class GreetingBeanTest { - @Inject - private Greeting bean; + @Inject + private Greeting bean; - @Deployment - public static Archive deploy() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(Greeting.class, GreetingBean.class, GreetingParam.class, MyInterceptor.class, MyInterceptorBinding.class, Param.class) - .addAsManifestResource("beans.xml"); - } + @Deployment + public static Archive deploy() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(Greeting.class, GreetingBean.class, GreetingParam.class, MyInterceptor.class, MyInterceptorBinding.class, Param.class) + .addAsManifestResource("beans.xml"); + } - @Test - public void should_be_ready() throws Exception { - assertThat(bean, is(notNullValue())); - assertThat(bean, instanceOf(GreetingBean.class)); - assertTrue(bean.isConstructed()); - assertTrue(bean.isInitialized()); - assertThat(bean.getParam(), instanceOf(GreetingParam.class)); - } + @Test + public void should_be_ready() throws Exception { + assertThat(bean, is(notNullValue())); + assertThat(bean, instanceOf(GreetingBean.class)); + assertTrue(bean.isConstructed()); + assertTrue(bean.isInitialized()); + assertThat(bean.getParam(), instanceOf(GreetingParam.class)); + } } diff --git a/interceptor/around-construct/src/test/resources/beans.xml b/interceptor/around-construct/src/test/resources/beans.xml index 766d619cc..04ea14faf 100644 --- a/interceptor/around-construct/src/test/resources/beans.xml +++ b/interceptor/around-construct/src/test/resources/beans.xml @@ -1,11 +1,11 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee%20http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd" + bean-discovery-mode="all"> - - org.javaee7.interceptor.aroundconstruct.MyInterceptor - + + org.javaee7.interceptor.aroundconstruct.MyInterceptor + diff --git a/interceptor/pom.xml b/interceptor/pom.xml index 9cbc7e15d..bb3a574f9 100644 --- a/interceptor/pom.xml +++ b/interceptor/pom.xml @@ -1,22 +1,23 @@ 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.interceptor - interceptor-samples + org.javaee7 + interceptor 1.0-SNAPSHOT pom - JSR 318 Interceptors 1.2 Samples + Java EE 7 Sample: interceptor around-construct + org.javaee7 diff --git a/jacc/README.md b/jacc/README.md new file mode 100644 index 000000000..53a9efaa5 --- /dev/null +++ b/jacc/README.md @@ -0,0 +1,13 @@ +# Java EE 7 Samples: JACC - Java Authorization Contract for Containers # + +The [JSR 115](https://jcp.org/en/jsr/detail?id=115) seeks to define a contract between containers and authorization service providers that will result in the implementation of providers for use by containers. + +## Samples ## + + - contexts + +## How to run + +More information on how to run can be found at: + + diff --git a/jacc/contexts/pom.xml b/jacc/contexts/pom.xml index 943fdea2c..e179ee0fa 100644 --- a/jacc/contexts/pom.xml +++ b/jacc/contexts/pom.xml @@ -1,24 +1,22 @@ - - - 4.0.0 - - - org.javaee7.jacc - jacc-samples - 1.0-SNAPSHOT - ../pom.xml - - - contexts - war - - - - org.javaee7.jaspic - common - 1.0-SNAPSHOT - - - - + + + 4.0.0 + + + org.javaee7 + jacc + 1.0-SNAPSHOT + ../pom.xml + + jacc-contexts + war + Java EE 7 Sample: jacc - contexts + + + + org.javaee7 + jaspic-common + 1.0-SNAPSHOT + + + diff --git a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/bean/JaccRequestBean.java b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/bean/JaccRequestBean.java index d877b860f..0d4a50497 100644 --- a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/bean/JaccRequestBean.java +++ b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/bean/JaccRequestBean.java @@ -16,11 +16,11 @@ public class JaccRequestBean { public HttpServletRequest getRequest() throws PolicyContextException { return (HttpServletRequest) PolicyContext.getContext("javax.servlet.http.HttpServletRequest"); } - + public boolean hasAttribute() throws PolicyContextException { return "true".equals(getRequest().getAttribute("jaccTest")); } - + public boolean hasParameter() throws PolicyContextException { return "true".equals(getRequest().getParameter("jacc_test")); } diff --git a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/sam/TestServerAuthModule.java b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/sam/TestServerAuthModule.java index 6af494d0d..93793f0b2 100644 --- a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/sam/TestServerAuthModule.java +++ b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/sam/TestServerAuthModule.java @@ -35,13 +35,13 @@ public class TestServerAuthModule implements ServerAuthModule { @Override public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, - @SuppressWarnings("rawtypes") Map options) throws AuthException { + @SuppressWarnings("rawtypes") Map options) throws AuthException { this.handler = handler; } @Override public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) - throws AuthException { + throws AuthException { HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage(); @@ -52,11 +52,11 @@ public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject // For the test perform a login by directly "returning" the details of the authenticated user. // Normally credentials would be checked and the details fetched from some repository - callbacks = new Callback[] { + callbacks = new Callback[] { // The name of the authenticated user - new CallerPrincipalCallback(clientSubject, "test"), + new CallerPrincipalCallback(clientSubject, "test"), // the roles of the authenticated user - new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) + new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }; } else { diff --git a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/RequestServlet.java b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/RequestServlet.java index 2c9ba3a71..5007ead25 100644 --- a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/RequestServlet.java +++ b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/RequestServlet.java @@ -24,21 +24,21 @@ public class RequestServlet extends HttpServlet { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { request.setAttribute("jaccTest", "true"); - + try { HttpServletRequest requestFromPolicy = (HttpServletRequest) PolicyContext.getContext("javax.servlet.http.HttpServletRequest"); - + if (requestFromPolicy != null) { response.getWriter().print("Obtained request from context."); - + if ("true".equals(requestFromPolicy.getAttribute("jaccTest"))) { response.getWriter().print("Attribute present in request from context."); } - + if ("true".equals(requestFromPolicy.getParameter("jacc_test"))) { response.getWriter().print("Request parameter present in request from context."); } - + } } catch (PolicyContextException e) { e.printStackTrace(response.getWriter()); diff --git a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/RequestServletEJB.java b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/RequestServletEJB.java index 3938dd38e..43b9f705e 100644 --- a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/RequestServletEJB.java +++ b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/RequestServletEJB.java @@ -21,7 +21,7 @@ public class RequestServletEJB extends HttpServlet { private static final long serialVersionUID = 1L; - + @Inject private JaccRequestBean jaccRequestBean; @@ -29,19 +29,19 @@ public class RequestServletEJB extends HttpServlet { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { request.setAttribute("jaccTest", "true"); - + try { if (jaccRequestBean.getRequest() != null) { response.getWriter().print("Obtained request from context."); - + if (jaccRequestBean.hasAttribute()) { response.getWriter().print("Attribute present in request from context."); } - + if (jaccRequestBean.hasParameter()) { response.getWriter().print("Request parameter present in request from context."); } - + } } catch (PolicyContextException e) { e.printStackTrace(response.getWriter()); diff --git a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/SubjectServlet.java b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/SubjectServlet.java index 955dc61f3..3a579f72f 100644 --- a/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/SubjectServlet.java +++ b/jacc/contexts/src/main/java/org/javaee7/jacc/contexts/servlet/SubjectServlet.java @@ -37,60 +37,59 @@ public class SubjectServlet extends HttpServlet { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - + try { Subject subject = (Subject) PolicyContext.getContext("javax.security.auth.Subject.container"); - + if (subject != null) { response.getWriter().print("Obtained subject from context.\n"); // Get the permissions associated with the Subject we obtained PermissionCollection permissionCollection = getPermissionCollection(subject); - + // Resolve any potentially unresolved permissions permissionCollection.implies(new WebRoleRefPermission("", "nothing")); - + // Filter just the roles from all the permissions, which may include things like // java.net.SocketPermission, java.io.FilePermission, and obtain the actual role names. Set roles = filterRoles(request, permissionCollection); - - for (String role : roles) { - response.getWriter().print("User has role " + role + "\n"); - } + + for (String role : roles) { + response.getWriter().print("User has role " + role + "\n"); + } } } catch (PolicyContextException e) { e.printStackTrace(response.getWriter()); } } - + private PermissionCollection getPermissionCollection(Subject subject) { return getPolicy().getPermissions( new ProtectionDomain( - new CodeSource(null, (Certificate[]) null), - null, null, + new CodeSource(null, (Certificate[]) null), + null, null, subject.getPrincipals().toArray(new Principal[subject.getPrincipals().size()]) ) - ); + ); + } + + private Set filterRoles(HttpServletRequest request, PermissionCollection permissionCollection) { + Set roles = new HashSet<>(); + for (Permission permission : list(permissionCollection.elements())) { + if (permission instanceof WebRoleRefPermission) { + String role = permission.getActions(); + + // Note that the WebRoleRefPermission is given for every Servlet in the application, even when + // no role refs are used anywhere. This will also include Servlets like the default servlet and the + // implicit JSP servlet. So if there are 2 application roles, and 3 application servlets, then + // at least 6 WebRoleRefPermission elements will be present in the collection. + if (!roles.contains(role) && request.isUserInRole(role)) { + roles.add(role); + } + } + } + + return roles; } - - private Set filterRoles(HttpServletRequest request, PermissionCollection permissionCollection) { - Set roles = new HashSet<>(); - for (Permission permission : list(permissionCollection.elements())) { - if (permission instanceof WebRoleRefPermission) { - String role = permission.getActions(); - - // Note that the WebRoleRefPermission is given for every Servlet in the application, even when - // no role refs are used anywhere. This will also include Servlets like the default servlet and the - // implicit JSP servlet. So if there are 2 application roles, and 3 application servlets, then - // at least 6 WebRoleRefPermission elements will be present in the collection. - if (!roles.contains(role) && request.isUserInRole(role)) { - roles.add(role); - } - } - } - - return roles; - } - } diff --git a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java index 17d0e043b..a2d59a394 100644 --- a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java +++ b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java @@ -34,61 +34,57 @@ public static WebArchive createDeployment() { */ @Test public void testCanObtainRequestInServlet() throws IOException, SAXException { - + String response = getFromServerPath("requestServlet"); assertTrue(response.contains("Obtained request from context.")); } - + /** * Tests that we are able to obtain a reference to the {@link HttpServletRequest} from an EJB. */ @Test public void testCanObtainRequestInEJB() throws IOException, SAXException { - + String response = getFromServerPath("requestServletEJB"); assertTrue(response.contains("Obtained request from context.")); } - + /** * Tests that the {@link HttpServletRequest} reference that we obtained from JACC in a Servlet actually * works by getting a request attribute and request parameter from it. */ @Test public void testDataInServlet() throws IOException, SAXException { - + String response = getFromServerPath("requestServlet?jacc_test=true"); assertTrue( "Request scope attribute not present in request obtained from context in Servlet, but should have been", - response.contains("Attribute present in request from context.") - ); - + response.contains("Attribute present in request from context.")); + assertTrue( - "Request parameter not present in request obtained from context in Servlet, but should have been", - response.contains("Request parameter present in request from context.") - ); + "Request parameter not present in request obtained from context in Servlet, but should have been", + response.contains("Request parameter present in request from context.")); } - + /** * Tests that the {@link HttpServletRequest} reference that we obtained from JACC in an EJB actually * works by getting a request attribute and request parameter from it. */ @Test public void testDataInEJB() throws IOException, SAXException { - + String response = getFromServerPath("requestServlet?jacc_test=true"); assertTrue( - "Request scope attribute not present in request obtained from context in EJB, but should have been", - response.contains("Attribute present in request from context.") - ); - + "Request scope attribute not present in request obtained from context in EJB, but should have been", + response.contains("Attribute present in request from context.")); + assertTrue( - "Request parameter not present in request obtained from context in EJB, but should have been", - response.contains("Request parameter present in request from context.") - ); + "Request parameter not present in request obtained from context in EJB, but should have been", + response.contains("Request parameter present in request from context.")); } } \ No newline at end of file diff --git a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java index e1c169cce..f7e2fa70f 100644 --- a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java +++ b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java @@ -53,24 +53,24 @@ public static WebArchive createDeployment() { */ @Test public void testCanObtainRequestInServlet() throws IOException, SAXException { - + String response = getFromServerPath("subjectServlet?doLogin"); assertTrue(response.contains("Obtained subject from context.")); } - + /** * Tests that we are able to obtain a reference to the {@link Subject} from a Servlet and * use JACC to get the roles the user from its principals. */ @Test public void testCanObtainRolesFromSubjectInServlet() throws IOException, SAXException { - + String response = getFromServerPath("subjectServlet?doLogin"); // The role that was assigned to the user in TestServerAuthModule assertTrue(response.contains("User has role architect")); - + // Servlet 13.3; Every authenticated user should have this role and isUserInRole should return true // when tested. assertTrue(response.contains("User has role **")); diff --git a/jacc/pom.xml b/jacc/pom.xml index 3794211f6..332609e23 100644 --- a/jacc/pom.xml +++ b/jacc/pom.xml @@ -1,29 +1,28 @@ - - - - org.javaee7 - javaee7-samples - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - org.javaee7.jacc - jacc-samples - 1.0-SNAPSHOT - pom - Java EE 7 JACC Samples - - - contexts - - - - org.javaee7 - test-utils - ${project.version} - - - + + + 4.0.0 + + + org.javaee7 + samples-parent + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jacc + 1.0-SNAPSHOT + pom + Java EE 7 Sample: jacc + + + contexts + + + + + org.javaee7 + test-utils + ${project.version} + + + diff --git a/jaspic/README.md b/jaspic/README.md new file mode 100644 index 000000000..40c4613fa --- /dev/null +++ b/jaspic/README.md @@ -0,0 +1,18 @@ +# Java EE 7 Samples: JASPIC - Java Authentication Service Provider Interface for Containers# + +The [JSR 196](https://jcp.org/en/jsr/detail?id=196) seeks to define a standard interface by which authentication modules may be integrated with containers and such that these modules may establish the authentication identities used by containers. + +## Samples ## + + - async-authentication + - basic-authentication + - ejb-propagation + - lifecycle + - register-session + - wrapping + +## How to run + +More information on how to run can be found at: + + diff --git a/jaspic/async-authentication/pom.xml b/jaspic/async-authentication/pom.xml index e62c5d34a..f8ead854c 100644 --- a/jaspic/async-authentication/pom.xml +++ b/jaspic/async-authentication/pom.xml @@ -1,26 +1,24 @@ - - - 4.0.0 - - - org.javaee7.jaspic - jaspic-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jaspic - async-authentication - 1.0-SNAPSHOT - war - - - - org.javaee7.jaspic - common - 1.0-SNAPSHOT - - - - \ No newline at end of file + + + 4.0.0 + + + org.javaee7 + jaspic + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaspic-async-authentication + 1.0-SNAPSHOT + war + Java EE 7 Sample: jaspic - async-authentication + + + + org.javaee7 + jaspic-common + 1.0-SNAPSHOT + + + diff --git a/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/bean/AsyncBean.java b/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/bean/AsyncBean.java index 0e36e1f1e..aec517f6b 100644 --- a/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/bean/AsyncBean.java +++ b/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/bean/AsyncBean.java @@ -19,20 +19,20 @@ public class AsyncBean { @Asynchronous public void doAsync(AsyncContext asyncContext) { - + try { sleep(1000); } catch (InterruptedException e) { interrupted(); } - + try { asyncContext.getResponse().getWriter().write("async response"); } catch (IOException e) { e.printStackTrace(); } - + asyncContext.complete(); } - + } diff --git a/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/sam/TestServerAuthModule.java b/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/sam/TestServerAuthModule.java index 79f33a4cc..61b779405 100644 --- a/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/sam/TestServerAuthModule.java +++ b/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/sam/TestServerAuthModule.java @@ -35,13 +35,13 @@ public class TestServerAuthModule implements ServerAuthModule { @Override public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, - @SuppressWarnings("rawtypes") Map options) throws AuthException { + @SuppressWarnings("rawtypes") Map options) throws AuthException { this.handler = handler; } @Override public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) - throws AuthException { + throws AuthException { HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage(); @@ -52,11 +52,11 @@ public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject // For the test perform a login by directly "returning" the details of the authenticated user. // Normally credentials would be checked and the details fetched from some repository - callbacks = new Callback[] { + callbacks = new Callback[] { // The name of the authenticated user - new CallerPrincipalCallback(clientSubject, "test"), + new CallerPrincipalCallback(clientSubject, "test"), // the roles of the authenticated user - new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) + new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }; } else { diff --git a/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/servlet/AsyncServlet.java b/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/servlet/AsyncServlet.java index d28832d8e..efc9a54bd 100644 --- a/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/servlet/AsyncServlet.java +++ b/jaspic/async-authentication/src/main/java/org/javaee7/jaspic/asyncauthentication/servlet/AsyncServlet.java @@ -24,13 +24,13 @@ public class AsyncServlet extends HttpServlet { @EJB private AsyncBean asyncBean; - + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - + AsyncContext asyncContext = request.startAsync(); asyncContext.setTimeout(5000); - + asyncBean.doAsync(asyncContext); } diff --git a/jaspic/basic-authentication/pom.xml b/jaspic/basic-authentication/pom.xml index 7ebf69dcb..17bb1bf47 100644 --- a/jaspic/basic-authentication/pom.xml +++ b/jaspic/basic-authentication/pom.xml @@ -1,26 +1,24 @@ - - - 4.0.0 - - - org.javaee7.jaspic - jaspic-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jaspic - basic-authentication - 1.0-SNAPSHOT - war - - - - org.javaee7.jaspic - common - 1.0-SNAPSHOT - - - - + + + 4.0.0 + + + org.javaee7 + jaspic + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaspic-basic-authentication + 1.0-SNAPSHOT + war + Java EE 7 Sample: jaspic - basic-authentication + + + + org.javaee7 + jaspic-common + 1.0-SNAPSHOT + + + diff --git a/jaspic/basic-authentication/src/main/java/org/javaee7/jaspic/basicauthentication/sam/TestServerAuthModule.java b/jaspic/basic-authentication/src/main/java/org/javaee7/jaspic/basicauthentication/sam/TestServerAuthModule.java index 836c95f5d..ca1616221 100644 --- a/jaspic/basic-authentication/src/main/java/org/javaee7/jaspic/basicauthentication/sam/TestServerAuthModule.java +++ b/jaspic/basic-authentication/src/main/java/org/javaee7/jaspic/basicauthentication/sam/TestServerAuthModule.java @@ -35,13 +35,13 @@ public class TestServerAuthModule implements ServerAuthModule { @Override public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, - @SuppressWarnings("rawtypes") Map options) throws AuthException { + @SuppressWarnings("rawtypes") Map options) throws AuthException { this.handler = handler; } @Override public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) - throws AuthException { + throws AuthException { HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage(); @@ -52,11 +52,11 @@ public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject // For the test perform a login by directly "returning" the details of the authenticated user. // Normally credentials would be checked and the details fetched from some repository - callbacks = new Callback[] { + callbacks = new Callback[] { // The name of the authenticated user - new CallerPrincipalCallback(clientSubject, "test"), + new CallerPrincipalCallback(clientSubject, "test"), // the roles of the authenticated user - new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) + new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }; } else { diff --git a/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationProtectedTest.java b/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationProtectedTest.java index 2bd9f1232..830cf24da 100644 --- a/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationProtectedTest.java +++ b/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationProtectedTest.java @@ -30,7 +30,7 @@ public static WebArchive createDeployment() { @Test public void testProtectedPageNotLoggedin() throws IOException, SAXException { - + String response = getFromServerPath("protected/servlet"); // Not logged-in thus should not be accessible. @@ -39,7 +39,7 @@ public void testProtectedPageNotLoggedin() throws IOException, SAXException { @Test public void testProtectedPageLoggedin() throws IOException, SAXException { - + String response = getFromServerPath("protected/servlet?doLogin=true"); // Now has to be logged-in so page is accessible diff --git a/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationPublicTest.java b/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationPublicTest.java index 9bd58fb47..35b58a86a 100644 --- a/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationPublicTest.java +++ b/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationPublicTest.java @@ -28,7 +28,7 @@ public static WebArchive createDeployment() { @Test public void testPublicPageNotLoggedin() throws IOException, SAXException { - + String response = getFromServerPath("public/servlet"); // Not logged-in @@ -40,7 +40,7 @@ public void testPublicPageNotLoggedin() throws IOException, SAXException { public void testPublicPageLoggedin() throws IOException, SAXException { // JASPIC has to be able to authenticate a user when accessing a public (non-protected) resource. - + String response = getFromServerPath("public/servlet?doLogin"); // Now has to be logged-in @@ -51,16 +51,14 @@ public void testPublicPageLoggedin() throws IOException, SAXException { @Test public void testPublicPageNotRememberLogin() throws IOException, SAXException { - // -------------------- Request 1 --------------------------- - + String response = getFromServerPath("public/servlet"); // Not logged-in assertTrue(response.contains("web username: null")); assertTrue(response.contains("web user has role \"architect\": false")); - // -------------------- Request 2 --------------------------- response = getFromServerPath("public/servlet?doLogin"); @@ -69,7 +67,6 @@ public void testPublicPageNotRememberLogin() throws IOException, SAXException { assertTrue(response.contains("web username: test")); assertTrue(response.contains("web user has role \"architect\": true")); - // -------------------- Request 3 --------------------------- response = getFromServerPath("public/servlet"); diff --git a/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationStatelessTest.java b/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationStatelessTest.java index 6261dc4e9..09b8d5810 100644 --- a/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationStatelessTest.java +++ b/jaspic/basic-authentication/src/test/java/org/javaee7/jaspic/basicauthentication/BasicAuthenticationStatelessTest.java @@ -25,7 +25,6 @@ public class BasicAuthenticationStatelessTest extends ArquillianBase { public static WebArchive createDeployment() { return defaultArchive(); } - /** * Tests that access to a protected page does not depend on the authenticated identity that was established in a previous @@ -33,16 +32,14 @@ public static WebArchive createDeployment() { */ @Test public void testProtectedAccessIsStateless() throws IOException, SAXException { - // -------------------- Request 1 --------------------------- // Accessing protected page without login String response = getFromServerPath("protected/servlet"); - + // Not logged-in thus should not be accessible. assertFalse(response.contains("This is a protected servlet")); - // -------------------- Request 2 --------------------------- @@ -57,9 +54,8 @@ public void testProtectedAccessIsStateless() throws IOException, SAXException { // Now has to be logged-in so page is accessible assertTrue("Could not access protected page, but should be able to. " - + "Did the container remember the previously set 'unauthenticated identity'?", - response.contains("This is a protected servlet")); - + + "Did the container remember the previously set 'unauthenticated identity'?", + response.contains("This is a protected servlet")); // -------------------- Request 3 --------------------------- @@ -71,8 +67,8 @@ public void testProtectedAccessIsStateless() throws IOException, SAXException { // Not logged-in thus should not be accessible. assertFalse("Could access protected page, but should not be able to. " - + "Did the container remember the authenticated identity that was set in previous request?", - response.contains("This is a protected servlet")); + + "Did the container remember the authenticated identity that was set in previous request?", + response.contains("This is a protected servlet")); } /** @@ -86,7 +82,6 @@ public void testProtectedAccessIsStateless2() throws IOException, SAXException { // Start with doing a login String response = getFromServerPath("protected/servlet?doLogin"); - // -------------------- Request 2 --------------------------- @@ -100,8 +95,8 @@ public void testProtectedAccessIsStateless2() throws IOException, SAXException { // Not logged-in thus should not be accessible. assertFalse("Could access protected page, but should not be able to. " - + "Did the container remember the authenticated identity that was set in previous request?", - response.contains("This is a protected servlet")); + + "Did the container remember the authenticated identity that was set in previous request?", + response.contains("This is a protected servlet")); } /** @@ -110,13 +105,11 @@ public void testProtectedAccessIsStateless2() throws IOException, SAXException { */ @Test public void testUserIdentityIsStateless() throws IOException, SAXException { - // -------------------- Request 1 --------------------------- // Accessing protected page with login String response = getFromServerPath("protected/servlet?doLogin"); - // -------------------- Request 2 --------------------------- @@ -125,13 +118,13 @@ public void testUserIdentityIsStateless() throws IOException, SAXException { // No details should linger around assertFalse("User principal was 'test', but it should be null here. " - + "The container seemed to have remembered it from the previous request.", - response.contains("web username: test")); + + "The container seemed to have remembered it from the previous request.", + response.contains("web username: test")); assertTrue("User principal was not null, but it should be null here. ", - response.contains("web username: null")); + response.contains("web username: null")); assertTrue("The unauthenticated user has the role 'architect', which should not be the case. " - + "The container seemed to have remembered it from the previous request.", - response.contains("web user has role \"architect\": false")); + + "The container seemed to have remembered it from the previous request.", + response.contains("web user has role \"architect\": false")); } } \ No newline at end of file diff --git a/jaspic/common/pom.xml b/jaspic/common/pom.xml index 57683aae6..961a3a672 100644 --- a/jaspic/common/pom.xml +++ b/jaspic/common/pom.xml @@ -1,43 +1,40 @@ - - - - 4.0.0 - - - org.javaee7.jaspic - jaspic-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jaspic - common - 1.0-SNAPSHOT - jar - - - - - org.jboss.arquillian.junit - arquillian-junit-container - provided - - - junit - junit - 4.11 - provided - - - net.sourceforge.htmlunit - htmlunit - 2.13 - provided - - - - + + + + 4.0.0 + + + org.javaee7 + jaspic + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaspic-common + 1.0-SNAPSHOT + jar + Java EE 7 Sample: jaspic - common + + + + org.jboss.arquillian.junit + arquillian-junit-container + provided + + + junit + junit + 4.11 + provided + + + net.sourceforge.htmlunit + htmlunit + 2.13 + provided + + + diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java index 395d65c39..3428d33e0 100644 --- a/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java +++ b/jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java @@ -25,20 +25,18 @@ public class ArquillianBase { public static WebArchive defaultArchive() { return ShrinkWrap.create(WebArchive.class) - .addPackages(true, "org.javaee7.jaspic") - .addAsWebInfResource(resource("web.xml")) - .addAsWebInfResource(resource("jboss-web.xml")) - .addAsWebInfResource(resource("glassfish-web.xml")); + .addPackages(true, "org.javaee7.jaspic") + .addAsWebInfResource(resource("web.xml")) + .addAsWebInfResource(resource("jboss-web.xml")) + .addAsWebInfResource(resource("glassfish-web.xml")); } private static File resource(String name) { return new File(WEBAPP_SRC + "/WEB-INF", name); } - + @ArquillianResource private URL base; - - @Before public void setUp() { @@ -51,15 +49,15 @@ public void tearDown() { webClient.getCookieManager().clearCookies(); webClient.closeAllWindows(); } - + protected WebClient getWebClient() { return webClient; } - + protected URL getBase() { return base; } - + /** * Gets content from the path that's relative to the base URL on which the Arquillian test * archive is deployed. diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/JaspicUtils.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/JaspicUtils.java index c6201022d..d89eaf22f 100644 --- a/jaspic/common/src/main/java/org/javaee7/jaspic/common/JaspicUtils.java +++ b/jaspic/common/src/main/java/org/javaee7/jaspic/common/JaspicUtils.java @@ -22,7 +22,7 @@ private JaspicUtils() { */ public static void registerSAM(ServletContext context, ServerAuthModule serverAuthModule) { AuthConfigFactory.getFactory().registerConfigProvider(new TestAuthConfigProvider(serverAuthModule), "HttpServlet", - getAppContextID(context), "Test authentication config provider"); + getAppContextID(context), "Test authentication config provider"); } public static String getAppContextID(ServletContext context) { diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestAuthConfigProvider.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestAuthConfigProvider.java index df2178a31..053ee1ee9 100644 --- a/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestAuthConfigProvider.java +++ b/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestAuthConfigProvider.java @@ -51,14 +51,14 @@ public TestAuthConfigProvider(Map properties, AuthConfigFactory */ @Override public ServerAuthConfig getServerAuthConfig(String layer, String appContext, CallbackHandler handler) throws AuthException, - SecurityException { + SecurityException { return new TestServerAuthConfig(layer, appContext, handler == null ? createDefaultCallbackHandler() : handler, - providerProperties, serverAuthModule); + providerProperties, serverAuthModule); } @Override public ClientAuthConfig getClientAuthConfig(String layer, String appContext, CallbackHandler handler) throws AuthException, - SecurityException { + SecurityException { return null; } diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestServerAuthConfig.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestServerAuthConfig.java index 7c422c5d3..510a29f2f 100644 --- a/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestServerAuthConfig.java +++ b/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestServerAuthConfig.java @@ -25,7 +25,7 @@ public class TestServerAuthConfig implements ServerAuthConfig { private ServerAuthModule serverAuthModule; public TestServerAuthConfig(String layer, String appContext, CallbackHandler handler, - Map providerProperties, ServerAuthModule serverAuthModule) { + Map providerProperties, ServerAuthModule serverAuthModule) { this.layer = layer; this.appContext = appContext; this.handler = handler; @@ -35,7 +35,7 @@ public TestServerAuthConfig(String layer, String appContext, CallbackHandler han @Override public ServerAuthContext getAuthContext(String authContextID, Subject serviceSubject, - @SuppressWarnings("rawtypes") Map properties) throws AuthException { + @SuppressWarnings("rawtypes") Map properties) throws AuthException { return new TestServerAuthContext(handler, serverAuthModule); } diff --git a/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestServerAuthContext.java b/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestServerAuthContext.java index 82cad20d8..9c2d09558 100644 --- a/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestServerAuthContext.java +++ b/jaspic/common/src/main/java/org/javaee7/jaspic/common/TestServerAuthContext.java @@ -32,7 +32,7 @@ public TestServerAuthContext(CallbackHandler handler, ServerAuthModule serverAut @Override public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) - throws AuthException { + throws AuthException { return serverAuthModule.validateRequest(messageInfo, clientSubject, serviceSubject); } diff --git a/jaspic/ejb-propagation/pom.xml b/jaspic/ejb-propagation/pom.xml index d0e32c37c..a8d6d5d99 100644 --- a/jaspic/ejb-propagation/pom.xml +++ b/jaspic/ejb-propagation/pom.xml @@ -1,26 +1,24 @@ - - - 4.0.0 - - - org.javaee7.jaspic - jaspic-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jaspic - ejb-propagation - 1.0-SNAPSHOT - war - - - - org.javaee7.jaspic - common - 1.0-SNAPSHOT - - - - + + + 4.0.0 + + + org.javaee7 + jaspic + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaspic-ejb-propagation + 1.0-SNAPSHOT + war + Java EE 7 Sample: jaspic - ejb-propagation + + + + org.javaee7 + jaspic-common + 1.0-SNAPSHOT + + + diff --git a/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/ejb/ProtectedEJB.java b/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/ejb/ProtectedEJB.java index eff4b1900..c3ab52725 100644 --- a/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/ejb/ProtectedEJB.java +++ b/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/ejb/ProtectedEJB.java @@ -19,7 +19,6 @@ * @author Arjan Tijms */ @Stateless - //Required by GlassFish @DeclareRoles({ "architect" }) //JBoss EAP 6.1+ defaults unchecked methods to DenyAll diff --git a/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/sam/TestServerAuthModule.java b/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/sam/TestServerAuthModule.java index 193f9220e..a11992455 100644 --- a/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/sam/TestServerAuthModule.java +++ b/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/sam/TestServerAuthModule.java @@ -34,13 +34,13 @@ public class TestServerAuthModule implements ServerAuthModule { @Override public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, - @SuppressWarnings("rawtypes") Map options) throws AuthException { + @SuppressWarnings("rawtypes") Map options) throws AuthException { this.handler = handler; } @Override public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) - throws AuthException { + throws AuthException { HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage(); @@ -49,7 +49,7 @@ public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject if (request.getParameter("doLogin") != null) { callbacks = new Callback[] { new CallerPrincipalCallback(clientSubject, "test"), - new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }; + new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }; } else { // The JASPIC protocol for "do nothing" diff --git a/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/servlet/ProtectedServletProtectedEJB.java b/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/servlet/ProtectedServletProtectedEJB.java index 9e15ae9df..4065f3837 100644 --- a/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/servlet/ProtectedServletProtectedEJB.java +++ b/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/servlet/ProtectedServletProtectedEJB.java @@ -40,8 +40,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro boolean ejbHasRole = protectedEJB.isUserArchitect(); response.getWriter().write( - "web user has role \"architect\": " + webHasRole + "\n" + "EJB user has role \"architect\": " + ejbHasRole - + "\n"); + "web user has role \"architect\": " + webHasRole + "\n" + "EJB user has role \"architect\": " + ejbHasRole + + "\n"); } diff --git a/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/servlet/PublicServletProtectedEJB.java b/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/servlet/PublicServletProtectedEJB.java index df9e29f34..b2c9d79dc 100644 --- a/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/servlet/PublicServletProtectedEJB.java +++ b/jaspic/ejb-propagation/src/main/java/org/javaee7/jaspic/ejbpropagation/servlet/PublicServletProtectedEJB.java @@ -35,13 +35,13 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro String ejbName = protectedEJB.getUserName(); response.getWriter().write("web username: " + webName + "\n" + "EJB username: " + ejbName + "\n"); - + boolean webHasRole = request.isUserInRole("architect"); boolean ejbHasRole = protectedEJB.isUserArchitect(); response.getWriter().write( - "web user has role \"architect\": " + webHasRole + "\n" + "EJB user has role \"architect\": " + ejbHasRole - + "\n"); + "web user has role \"architect\": " + webHasRole + "\n" + "EJB user has role \"architect\": " + ejbHasRole + + "\n"); } diff --git a/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/ProtectedEJBPropagationTest.java b/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/ProtectedEJBPropagationTest.java index d3a5081cf..de167eb7f 100644 --- a/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/ProtectedEJBPropagationTest.java +++ b/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/ProtectedEJBPropagationTest.java @@ -29,7 +29,7 @@ public static WebArchive createDeployment() { @Test public void testProtectedServletWithLoginCallingEJB() throws IOException, SAXException { - + String response = getFromServerPath("protected/servlet-protected-ejb?doLogin"); // Both the web (HttpServletRequest) and EJB (EJBContext) should see the same @@ -41,7 +41,7 @@ public void testProtectedServletWithLoginCallingEJB() throws IOException, SAXExc // user has the role "architect". assertTrue(response.contains("web user has role \"architect\": true")); assertTrue("Web user principal has role \"architect\", but one in EJB doesn't.", - response.contains("EJB user has role \"architect\": true")); + response.contains("EJB user has role \"architect\": true")); } /** @@ -51,7 +51,7 @@ public void testProtectedServletWithLoginCallingEJB() throws IOException, SAXExc */ @Test public void testPublicServletWithLoginCallingEJB() throws IOException, SAXException { - + String response = getFromServerPath("public/servlet-protected-ejb?doLogin"); // Both the web (HttpServletRequest) and EJB (EJBContext) should see the same @@ -63,7 +63,7 @@ public void testPublicServletWithLoginCallingEJB() throws IOException, SAXExcept // user has the role "architect". assertTrue(response.contains("web user has role \"architect\": true")); assertTrue("Web user principal has role \"architect\", but one in EJB doesn't.", - response.contains("EJB user has role \"architect\": true")); + response.contains("EJB user has role \"architect\": true")); } } \ No newline at end of file diff --git a/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/PublicEJBPropagationTest.java b/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/PublicEJBPropagationTest.java index 3d37516ce..4b560f53f 100644 --- a/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/PublicEJBPropagationTest.java +++ b/jaspic/ejb-propagation/src/test/java/org/javaee7/jaspic/ejbpropagation/PublicEJBPropagationTest.java @@ -29,7 +29,7 @@ public static WebArchive createDeployment() { @Test public void testProtectedServletWithLoginCallingEJB() throws IOException, SAXException { - + String response = getFromServerPath("protected/servlet-public-ejb?doLogin"); // Both the web (HttpServletRequest) and EJB (EJBContext) should see the same diff --git a/jaspic/lifecycle/pom.xml b/jaspic/lifecycle/pom.xml index a4eb48c41..1827d8de4 100644 --- a/jaspic/lifecycle/pom.xml +++ b/jaspic/lifecycle/pom.xml @@ -1,26 +1,24 @@ - - - 4.0.0 - - - org.javaee7.jaspic - jaspic-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jaspic - lifecycle - 1.0-SNAPSHOT - war - - - - org.javaee7.jaspic - common - 1.0-SNAPSHOT - - - - + + + 4.0.0 + + + org.javaee7 + jaspic + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaspic-lifecycle + 1.0-SNAPSHOT + war + Java EE 7 Sample: jaspic - lifecycle + + + + org.javaee7 + jaspic-common + 1.0-SNAPSHOT + + + diff --git a/jaspic/lifecycle/src/main/java/org/javaee7/jaspic/lifecycle/sam/TestLifecycleAuthModule.java b/jaspic/lifecycle/src/main/java/org/javaee7/jaspic/lifecycle/sam/TestLifecycleAuthModule.java index 64fc1bc78..5da3f4c9a 100644 --- a/jaspic/lifecycle/src/main/java/org/javaee7/jaspic/lifecycle/sam/TestLifecycleAuthModule.java +++ b/jaspic/lifecycle/src/main/java/org/javaee7/jaspic/lifecycle/sam/TestLifecycleAuthModule.java @@ -33,20 +33,20 @@ public class TestLifecycleAuthModule implements ServerAuthModule { @Override public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, - @SuppressWarnings("rawtypes") Map options) throws AuthException { + @SuppressWarnings("rawtypes") Map options) throws AuthException { this.handler = handler; } @Override public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) - throws AuthException { + throws AuthException { HttpServletResponse response = (HttpServletResponse) messageInfo.getResponseMessage(); try { response.getWriter().write("validateRequest invoked\n"); - handler.handle(new Callback[] { + handler.handle(new Callback[] { new CallerPrincipalCallback(clientSubject, "test"), new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }); } catch (IOException | UnsupportedCallbackException e) { diff --git a/jaspic/lifecycle/src/test/java/org/javaee7/jaspic/lifecycle/AuthModuleMethodInvocationTest.java b/jaspic/lifecycle/src/test/java/org/javaee7/jaspic/lifecycle/AuthModuleMethodInvocationTest.java index 2723c73ae..95918dc8e 100644 --- a/jaspic/lifecycle/src/test/java/org/javaee7/jaspic/lifecycle/AuthModuleMethodInvocationTest.java +++ b/jaspic/lifecycle/src/test/java/org/javaee7/jaspic/lifecycle/AuthModuleMethodInvocationTest.java @@ -43,24 +43,23 @@ public static WebArchive createDeployment() { */ @Test public void testBasicSAMMethodsCalled() throws IOException, SAXException { - + String response = getFromServerPath("protected/servlet"); - // First test if individual methods are called assertTrue("SAM method validateRequest not called, but should have been.", - response.contains("validateRequest invoked")); + response.contains("validateRequest invoked")); assertTrue("Resource (Servlet) not invoked, but should have been.", response.contains("Resource invoked")); // The previous two methods are rare to not be called, but secureResponse is more likely to fail. Seemingly it's hard // to understand what this method should do exactly. assertTrue("SAM method secureResponse not called, but should have been.", - response.contains("secureResponse invoked")); + response.contains("secureResponse invoked")); // Finally the order should be correct. More than a few implementations call secureResponse before the resource is // invoked. assertTrue("SAM methods called in wrong order", - response.contains("validateRequest invoked\nResource invoked\nsecureResponse invoked\n")); + response.contains("validateRequest invoked\nResource invoked\nsecureResponse invoked\n")); } /** @@ -77,7 +76,7 @@ public void testLogout() throws IOException, SAXException { String response = getFromServerPath("protected/servlet?doLogout"); assertTrue("SAM method cleanSubject not called, but should have been.", - response.contains("cleanSubject invoked")); + response.contains("cleanSubject invoked")); } } \ No newline at end of file diff --git a/jaspic/pom.xml b/jaspic/pom.xml index b11bc3ea3..c89ef59d6 100644 --- a/jaspic/pom.xml +++ b/jaspic/pom.xml @@ -1,52 +1,51 @@ - - - - org.javaee7 - javaee7-samples - 1.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - org.javaee7.jaspic - jaspic-samples - 1.0-SNAPSHOT - pom - Java EE 7 Jaspic Samples - - - - common - - - async-authentication - - - basic-authentication - - - ejb-propagation - - - lifecycle - - - register-session - - - wrapping - - - - org.javaee7 - test-utils - ${project.version} - - - + + + 4.0.0 + + + org.javaee7 + samples-parent + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaspic + 1.0-SNAPSHOT + pom + Java EE 7 Sample: jaspic + + + + common + + + async-authentication + + + basic-authentication + + + ejb-propagation + + + lifecycle + + + register-session + + + wrapping + + + + + org.javaee7 + test-utils + ${project.version} + + + diff --git a/jaspic/register-session/pom.xml b/jaspic/register-session/pom.xml index 192e28c12..c89a3dbde 100644 --- a/jaspic/register-session/pom.xml +++ b/jaspic/register-session/pom.xml @@ -1,27 +1,25 @@ - - - 4.0.0 - - - org.javaee7.jaspic - jaspic-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jaspic - register-session - 1.0-SNAPSHOT - war - - - - org.javaee7.jaspic - common - 1.0-SNAPSHOT - - - - - + + + 4.0.0 + + + org.javaee7 + jaspic + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaspic-register-session + 1.0-SNAPSHOT + war + Java EE 7 Sample: jaspic - register-session + + + + org.javaee7 + jaspic-common + 1.0-SNAPSHOT + + + + diff --git a/jaspic/register-session/src/main/java/org/javaee7/jaspic/registersession/sam/TestServerAuthModule.java b/jaspic/register-session/src/main/java/org/javaee7/jaspic/registersession/sam/TestServerAuthModule.java index 35ab646d8..47e471be1 100644 --- a/jaspic/register-session/src/main/java/org/javaee7/jaspic/registersession/sam/TestServerAuthModule.java +++ b/jaspic/register-session/src/main/java/org/javaee7/jaspic/registersession/sam/TestServerAuthModule.java @@ -30,51 +30,51 @@ public class TestServerAuthModule implements ServerAuthModule { Logger logger = Logger.getLogger("blalllalala"); - + private CallbackHandler handler; private Class[] supportedMessageTypes = new Class[] { HttpServletRequest.class, HttpServletResponse.class }; @Override public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, - @SuppressWarnings("rawtypes") Map options) throws AuthException { + @SuppressWarnings("rawtypes") Map options) throws AuthException { this.handler = handler; } @SuppressWarnings("unchecked") @Override public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) - throws AuthException { + throws AuthException { HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage(); Callback[] callbacks; - + Principal userPrincipal = request.getUserPrincipal(); if (userPrincipal != null && request.getParameter("continueSession") != null) { - + // ### If already authenticated before, continue this session - + // Execute protocol to signal container registered authentication session be used. callbacks = new Callback[] { new CallerPrincipalCallback(clientSubject, userPrincipal) }; - + } else if (request.getParameter("doLogin") != null) { - + // ### If not authenticated before, do a new login if so requested // For the test perform a login by directly "returning" the details of the authenticated user. // Normally credentials would be checked and the details fetched from some repository callbacks = new Callback[] { - // The name of the authenticated user - new CallerPrincipalCallback(clientSubject, "test"), - // the roles of the authenticated user - new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }; + // The name of the authenticated user + new CallerPrincipalCallback(clientSubject, "test"), + // the roles of the authenticated user + new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }; // Tell container to register an authentication session. messageInfo.getMap().put("javax.servlet.http.registerSession", TRUE.toString()); } else { - + // ### If no registered session and no login request "do nothing" - + // The JASPIC protocol for "do nothing" callbacks = new Callback[] { new CallerPrincipalCallback(clientSubject, (Principal) null) }; } diff --git a/jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml b/jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml index f38ceb099..26559e3f6 100644 --- a/jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml +++ b/jaspic/register-session/src/main/webapp/WEB-INF/glassfish-web.xml @@ -2,11 +2,11 @@ - - architect - architect - + + architect + architect + - + \ No newline at end of file diff --git a/jaspic/register-session/src/main/webapp/WEB-INF/web.xml b/jaspic/register-session/src/main/webapp/WEB-INF/web.xml index 3e6905016..0ed6791b4 100644 --- a/jaspic/register-session/src/main/webapp/WEB-INF/web.xml +++ b/jaspic/register-session/src/main/webapp/WEB-INF/web.xml @@ -1,21 +1,21 @@ + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee%20http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> - - - Test - /protected/* - - - architect - - + + + Test + /protected/* + + + architect + + - - architect - + + architect + \ No newline at end of file diff --git a/jaspic/register-session/src/test/java/org/javaee7/jaspic/registersession/RegisterSessionTest.java b/jaspic/register-session/src/test/java/org/javaee7/jaspic/registersession/RegisterSessionTest.java index 7202b1e86..d45dc74ba 100644 --- a/jaspic/register-session/src/test/java/org/javaee7/jaspic/registersession/RegisterSessionTest.java +++ b/jaspic/register-session/src/test/java/org/javaee7/jaspic/registersession/RegisterSessionTest.java @@ -23,40 +23,37 @@ public static WebArchive createDeployment() { @Test public void testRemembersSession() throws IOException, SAXException { - // -------------------- Request 1 --------------------------- - + // Accessing protected page without login String response = getFromServerPath("protected/servlet"); - + // Not logged-in thus should not be accessible. assertFalse(response.contains("This is a protected servlet")); - // -------------------- Request 2 --------------------------- // We access the protected page again and now login - + response = getFromServerPath("protected/servlet?doLogin"); // Now has to be logged-in so page is accessible assertTrue("Could not access protected page, but should be able to. " - + "Did the container remember the previously set 'unauthenticated identity'?", - response.contains("This is a protected servlet")); - + + "Did the container remember the previously set 'unauthenticated identity'?", + response.contains("This is a protected servlet")); // -------------------- Request 3 --------------------------- // JASPIC is normally stateless, but for this test the SAM uses the register session feature so now // we should be logged-in when doing a call without explicitly logging in again. - + response = getFromServerPath("protected/servlet?continueSession"); - + // Logged-in thus should be accessible. assertTrue("Could not access protected page, but should be able to. " - + "Did the container not remember the authenticated identity via 'javax.servlet.http.registerSession'?", - response.contains("This is a protected servlet")); + + "Did the container not remember the authenticated identity via 'javax.servlet.http.registerSession'?", + response.contains("This is a protected servlet")); // Both the user name and roles/groups have to be restored @@ -66,14 +63,13 @@ public void testRemembersSession() throws IOException, SAXException { // but again the spec should make this clear to avoid ambiguity. assertTrue(response.contains("web username: test")); assertTrue(response.contains("web user has role \"architect\": true")); - - + // -------------------- Request 4 --------------------------- - + // The session should also be remembered for other resources, including public ones - + response = getFromServerPath("public/servlet?continueSession"); - + // This test almost can't fail, but include for clarity assertTrue(response.contains("This is a public servlet")); @@ -82,35 +78,33 @@ public void testRemembersSession() throws IOException, SAXException { assertTrue(response.contains("web username: test")); assertTrue(response.contains("web user has role \"architect\": true")); } - + @Test public void testJoinSessionIsOptional() throws IOException, SAXException { - // -------------------- Request 1 --------------------------- // We access a protected page and login // - + String response = getFromServerPath("protected/servlet?doLogin"); // Now has to be logged-in so page is accessible assertTrue("Could not access protected page, but should be able to. " - + "Did the container remember the previously set 'unauthenticated identity'?", - response.contains("This is a protected servlet")); - + + "Did the container remember the previously set 'unauthenticated identity'?", + response.contains("This is a protected servlet")); // -------------------- Request 2 --------------------------- // JASPIC is normally stateless, but for this test the SAM uses the register session feature so now // we should be logged-in when doing a call without explicitly logging in again. - + response = getFromServerPath("protected/servlet?continueSession"); - + // Logged-in thus should be accessible. assertTrue("Could not access protected page, but should be able to. " - + "Did the container not remember the authenticated identity via 'javax.servlet.http.registerSession'?", - response.contains("This is a protected servlet")); + + "Did the container not remember the authenticated identity via 'javax.servlet.http.registerSession'?", + response.contains("This is a protected servlet")); // Both the user name and roles/groups have to be restored @@ -120,27 +114,25 @@ public void testJoinSessionIsOptional() throws IOException, SAXException { // but again the spec should make this clear to avoid ambiguity. assertTrue(response.contains("web username: test")); assertTrue(response.contains("web user has role \"architect\": true")); - - + // -------------------- Request 3 --------------------------- - + // Although the container remembers the authentication session, the SAM needs to OPT-IN to it. // If the SAM instead "does nothing", we should not have access to the protected resource anymore // even within the same HTTP session. - + response = getFromServerPath("protected/servlet"); assertFalse(response.contains("This is a protected servlet")); - - + // -------------------- Request 4 --------------------------- - + // Access to a public page is unaffected by joining or not joining the session, but if we do not join the // session we shouldn't see the user's name and roles. - + // THIS NOW FAILS ON GLASSFISH 4.0. CHECKED WITH RON MONZILLO THAT THIS IS INDEED AN ERROR AND FILED A BUG - + response = getFromServerPath("public/servlet"); - + assertTrue(response.contains("This is a public servlet")); assertFalse(response.contains("web username: test")); assertFalse(response.contains("web user has role \"architect\": true")); diff --git a/jaspic/wrapping/pom.xml b/jaspic/wrapping/pom.xml index e4180be69..f6da086fc 100644 --- a/jaspic/wrapping/pom.xml +++ b/jaspic/wrapping/pom.xml @@ -1,26 +1,24 @@ - - - 4.0.0 - - - org.javaee7.jaspic - jaspic-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jaspic - wrapping - 1.0-SNAPSHOT - war - - - - org.javaee7.jaspic - common - 1.0-SNAPSHOT - - - - + + + 4.0.0 + + + org.javaee7 + jaspic + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaspic-wrapping + 1.0-SNAPSHOT + war + Java EE 7 Sample: jaspic - wrapping + + + + org.javaee7 + jaspic-common + 1.0-SNAPSHOT + + + diff --git a/jaspic/wrapping/src/main/java/org/javaee7/jaspic/wrapping/sam/TestWrappingServerAuthModule.java b/jaspic/wrapping/src/main/java/org/javaee7/jaspic/wrapping/sam/TestWrappingServerAuthModule.java index 92ab3d283..05b91c59e 100644 --- a/jaspic/wrapping/src/main/java/org/javaee7/jaspic/wrapping/sam/TestWrappingServerAuthModule.java +++ b/jaspic/wrapping/src/main/java/org/javaee7/jaspic/wrapping/sam/TestWrappingServerAuthModule.java @@ -35,16 +35,16 @@ public class TestWrappingServerAuthModule implements ServerAuthModule { @Override public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, - @SuppressWarnings("rawtypes") Map options) throws AuthException { + @SuppressWarnings("rawtypes") Map options) throws AuthException { this.handler = handler; } @Override public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, Subject serviceSubject) - throws AuthException { + throws AuthException { try { - handler.handle(new Callback[] { + handler.handle(new Callback[] { new CallerPrincipalCallback(clientSubject, "test"), new GroupPrincipalCallback(clientSubject, new String[] { "architect" }) }); } catch (IOException | UnsupportedCallbackException e) { @@ -54,12 +54,12 @@ public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject // Wrap the request - the resource to be invoked should get to see this messageInfo.setRequestMessage(new TestHttpServletRequestWrapper( (HttpServletRequest) messageInfo.getRequestMessage()) - ); + ); // Wrap the response - the resource to be invoked should get to see this messageInfo.setResponseMessage(new TestHttpServletResponseWrapper( (HttpServletResponse) messageInfo.getResponseMessage()) - ); + ); return SUCCESS; } diff --git a/jaspic/wrapping/src/test/java/org/javaee7/jaspic/wrapping/WrappingTest.java b/jaspic/wrapping/src/test/java/org/javaee7/jaspic/wrapping/WrappingTest.java index 6f191a2be..644468cbd 100644 --- a/jaspic/wrapping/src/test/java/org/javaee7/jaspic/wrapping/WrappingTest.java +++ b/jaspic/wrapping/src/test/java/org/javaee7/jaspic/wrapping/WrappingTest.java @@ -29,22 +29,22 @@ public static WebArchive createDeployment() { @Test public void testRequestWrapping() throws IOException, SAXException { - + String response = getFromServerPath("protected/servlet"); // The SAM wrapped a request so that it always contains the request attribute "isWrapped" with value true. assertTrue("Request wrapped by SAM did not arrive in Servlet.", - response.contains("request isWrapped: true")); + response.contains("request isWrapped: true")); } @Test public void testResponseWrapping() throws IOException, SAXException { - + String response = getFromServerPath("protected/servlet"); // The SAM wrapped a response so that it always contains the header "isWrapped" with value true. assertTrue("Response wrapped by SAM did not arrive in Servlet.", - response.contains("response isWrapped: true")); + response.contains("response isWrapped: true")); } } \ No newline at end of file diff --git a/javamail/README.md b/javamail/README.md new file mode 100644 index 000000000..1826f14f4 --- /dev/null +++ b/javamail/README.md @@ -0,0 +1,13 @@ +# Java EE 7 Samples: Javamail 1.5# + +The [JSR 919](https://jcp.org/en/jsr/detail?id=919) seeks to define a description of the new APIs that are being introduced in JavaMail. + +## Samples ## + + - definition + +## How to run + +More information on how to run can be found at: + + diff --git a/javamail/definition/pom.xml b/javamail/definition/pom.xml index c6c2dc49f..3f6a96341 100644 --- a/javamail/definition/pom.xml +++ b/javamail/definition/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.javamail - javamail-samples + org.javaee7 + javamail 1.0-SNAPSHOT ../pom.xml - - org.javaee7.javamail - definition + org.javaee7 + javamail-definition 1.0-SNAPSHOT war + Java EE 7 Sample: javamail - definition diff --git a/javamail/definition/src/main/java/org/javaee7/javamail/definition/AnnotatedEmailServlet.java b/javamail/definition/src/main/java/org/javaee7/javamail/definition/AnnotatedEmailServlet.java index 60a77db79..ef62d8b9b 100644 --- a/javamail/definition/src/main/java/org/javaee7/javamail/definition/AnnotatedEmailServlet.java +++ b/javamail/definition/src/main/java/org/javaee7/javamail/definition/AnnotatedEmailServlet.java @@ -21,13 +21,13 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/AnnotatedEmailServlet"}) +@WebServlet(urlPatterns = { "/AnnotatedEmailServlet" }) @MailSessionDefinition(name = "java:comp/myMailSession", - host = "smtp.gmail.com", - transportProtocol = "smtps", - properties = { - "mail.debug=true" - }) + host = "smtp.gmail.com", + transportProtocol = "smtps", + properties = { + "mail.debug=true" + }) public class AnnotatedEmailServlet extends HttpServlet { @Resource(lookup = "java:comp/myMailSession") @@ -46,7 +46,7 @@ public class AnnotatedEmailServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -59,16 +59,16 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re try { out.println("Sending message from \"" - + creds.getFrom() - + "\" to \"" - + creds.getTo() - + "\"...
"); + + creds.getFrom() + + "\" to \"" + + creds.getTo() + + "\"...
"); Message message = new MimeMessage(session); message.setFrom(new InternetAddress(creds.getFrom())); message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(creds.getTo())); message.setSubject("Sending message using Annotated JavaMail " - + Calendar.getInstance().getTime()); + + Calendar.getInstance().getTime()); message.setText("Java EE 7 is cool!"); Transport t = session.getTransport(); @@ -97,7 +97,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -111,7 +111,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/javamail/definition/src/main/java/org/javaee7/javamail/definition/Credentials.java b/javamail/definition/src/main/java/org/javaee7/javamail/definition/Credentials.java index 7e8c297e8..5e1d28f7b 100644 --- a/javamail/definition/src/main/java/org/javaee7/javamail/definition/Credentials.java +++ b/javamail/definition/src/main/java/org/javaee7/javamail/definition/Credentials.java @@ -21,8 +21,8 @@ public Credentials() { try { final Properties creds = new Properties(); creds.load(new FileInputStream(System.getProperty("user.home") - + System.getProperty("file.separator") - + ".javamail")); + + System.getProperty("file.separator") + + ".javamail")); from = creds.getProperty("from"); password = creds.getProperty("password"); to = creds.getProperty("to"); diff --git a/javamail/definition/src/main/java/org/javaee7/javamail/definition/ProgrammaticEmailServlet.java b/javamail/definition/src/main/java/org/javaee7/javamail/definition/ProgrammaticEmailServlet.java index f81eebec8..fe0bcbe46 100644 --- a/javamail/definition/src/main/java/org/javaee7/javamail/definition/ProgrammaticEmailServlet.java +++ b/javamail/definition/src/main/java/org/javaee7/javamail/definition/ProgrammaticEmailServlet.java @@ -21,10 +21,11 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/ProgrammaticEmailServlet"}) +@WebServlet(urlPatterns = { "/ProgrammaticEmailServlet" }) public class ProgrammaticEmailServlet extends HttpServlet { - - @Inject Credentials creds; + + @Inject + Credentials creds; /** * Processes requests for both HTTP GET and POST @@ -36,7 +37,7 @@ public class ProgrammaticEmailServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -54,34 +55,33 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re props.put("mail.transport.protocol", "smtp"); props.put("mail.debug", "true"); - Session session = Session.getInstance(props, - new javax.mail.Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(creds.getFrom(), creds.getPassword()); - } - }); -// Session session = Session.getInstance(props); + new javax.mail.Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(creds.getFrom(), creds.getPassword()); + } + }); + // Session session = Session.getInstance(props); try { - out.println("Sending message from \"" - + creds.getFrom() - + "\" to \"" - + creds.getTo() - + "\"...
"); + out.println("Sending message from \"" + + creds.getFrom() + + "\" to \"" + + creds.getTo() + + "\"...
"); Message message = new MimeMessage(session); message.setFrom(new InternetAddress(creds.getFrom())); message.setRecipients(Message.RecipientType.TO, - InternetAddress.parse(creds.getTo())); + InternetAddress.parse(creds.getTo())); message.setSubject("Sending message using Programmatic JavaMail " + Calendar.getInstance().getTime()); message.setText("Java EE 7 is cool!"); -// Transport t = session.getTransport(); -// t.connect(creds.getFrom(), creds.getTo()); -// t.sendMessage(message, message.getAllRecipients()); + // Transport t = session.getTransport(); + // t.connect(creds.getFrom(), creds.getTo()); + // t.sendMessage(message, message.getAllRecipients()); Transport.send(message, message.getAllRecipients()); out.println("message sent!"); @@ -106,7 +106,7 @@ protected PasswordAuthentication getPasswordAuthentication() { */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -120,7 +120,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/javamail/pom.xml b/javamail/pom.xml index ff3eb4544..4f4fd1611 100644 --- a/javamail/pom.xml +++ b/javamail/pom.xml @@ -1,22 +1,23 @@ - + + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.javamail - javamail-samples + org.javaee7 + javamail 1.0-SNAPSHOT pom - Java EE 7 JavaMail Samples + Java EE 7 Sample: javamail definition + org.javaee7 diff --git a/jaxrs/README.md b/jaxrs/README.md new file mode 100644 index 000000000..747296b8d --- /dev/null +++ b/jaxrs/README.md @@ -0,0 +1,41 @@ +# Java EE 7 Samples: JAX-RS 2.0# + +The [JSR 339](https://jcp.org/en/jsr/detail?id=339) specifies the next version of JAX-RS, the API for for RESTful (Representational State Transfer) Web Services in the Java Platform. + +## Samples ## + + - angularjs + - async-client + - async-server + - beanvalidation + - beanparam + - client-negotiation + - dynamicfilter + - fileupload + - filter + - filter-interceptor + - interceptor + - invocation + - invocation-async + - jaxrs-client + - jaxrs-endpoint + - jsonp + - link + - mapping-exceptions + - paramconverter + - readerwriter + - readerwriter-json + - request-binding + - resource-validation + - server-negotiation + - singleton + - readerwriter-injection + - jaxrs-security-declarative + - db-access + + +## How to run + +More information on how to run can be found at: + + diff --git a/jaxrs/angularjs/pom.xml b/jaxrs/angularjs/pom.xml index c59cffc0e..682a915bf 100644 --- a/jaxrs/angularjs/pom.xml +++ b/jaxrs/angularjs/pom.xml @@ -1,16 +1,18 @@ - + + 4.0.0 + - jaxrs-samples - org.javaee7.jaxrs + jaxrs + org.javaee7 1.0-SNAPSHOT ../pom.xml - 4.0.0 - jax-rs-angularjs + jaxrs-angularjs war + Java EE 7 Sample: jaxrs - angularjs Angular JS consuming REST services + org.jboss.arquillian.extension @@ -38,4 +40,4 @@ test - \ No newline at end of file + diff --git a/jaxrs/angularjs/src/test/java/org/javaee7/jaxrs/angularjs/NoteResourceImplTest.java b/jaxrs/angularjs/src/test/java/org/javaee7/jaxrs/angularjs/NoteResourceImplTest.java index 9dd6c8e42..64eb2bae0 100644 --- a/jaxrs/angularjs/src/test/java/org/javaee7/jaxrs/angularjs/NoteResourceImplTest.java +++ b/jaxrs/angularjs/src/test/java/org/javaee7/jaxrs/angularjs/NoteResourceImplTest.java @@ -82,16 +82,16 @@ public void setupDB_ARQ1077_Workaround_3() @Test public void addNewNote(@ArquillianResource URL deploymentURL, @Drone WebDriver driver) throws Exception { -// Given + // Given driver.navigate().to(deploymentURL); final TodoPage page = GrapheneRuntime.getInstance().goTo(TodoPage.class); assertEquals(3, page.getTodos().size()); -// When + // When page.addNote(); page.typeTitle("New title"); page.typeSummary("New summary"); page.save(); -// Then + // Then assertEquals(4, page.getTodos().size()); assertEquals("New title", page.getTodos().get(3).getTitle()); assertEquals("New summary", page.getTodos().get(3).getSummary()); @@ -102,11 +102,11 @@ public void addNewNote(@ArquillianResource URL deploymentURL, @Drone WebDriver d @Test public void onenterContainsNotesFromDB(@ArquillianResource URL deploymentURL, @Drone WebDriver driver) { -// Given -// When + // Given + // When driver.navigate().to(deploymentURL); final TodoPage page = GrapheneRuntime.getInstance().goTo(TodoPage.class); -// Then + // Then assertEquals(3, page.getTodos().size()); assertEquals("Note A", page.getTodos().get(0).getTitle()); assertEquals("Note B", page.getTodos().get(1).getTitle()); @@ -118,13 +118,13 @@ public void onenterContainsNotesFromDB(@ArquillianResource URL deploymentURL, @D @Test public void removeNote(@ArquillianResource URL deploymentURL, @Drone WebDriver driver) throws Exception { -// Given + // Given driver.navigate().to(deploymentURL); final TodoPage page = GrapheneRuntime.getInstance().goTo(TodoPage.class); assertEquals(3, page.getTodos().size()); -// When + // When page.getTodos().get(0).remove(); -// Then + // Then assertEquals("Note B", page.getTodos().get(0).getTitle()); assertEquals("Note C", page.getTodos().get(1).getTitle()); } diff --git a/jaxrs/async-client/pom.xml b/jaxrs/async-client/pom.xml index 6eca31bdf..cf09c2039 100644 --- a/jaxrs/async-client/pom.xml +++ b/jaxrs/async-client/pom.xml @@ -1,17 +1,17 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - async-client - Async Client - Invoke a JAX-RS service via an asynchronous client + org.javaee7 + jaxrs-async-client 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - async-client + Invoke a JAX-RS service via an asynchronous client diff --git a/jaxrs/async-client/src/main/java/org/javaee7/jaxrs/asyncclient/MyApplication.java b/jaxrs/async-client/src/main/java/org/javaee7/jaxrs/asyncclient/MyApplication.java index 057a45565..36b67ff7e 100644 --- a/jaxrs/async-client/src/main/java/org/javaee7/jaxrs/asyncclient/MyApplication.java +++ b/jaxrs/async-client/src/main/java/org/javaee7/jaxrs/asyncclient/MyApplication.java @@ -8,5 +8,5 @@ */ @ApplicationPath("webresources") public class MyApplication extends Application { - + } diff --git a/jaxrs/async-client/src/main/java/org/javaee7/jaxrs/asyncclient/MyResource.java b/jaxrs/async-client/src/main/java/org/javaee7/jaxrs/asyncclient/MyResource.java index 9b2c9de60..04987c5d3 100644 --- a/jaxrs/async-client/src/main/java/org/javaee7/jaxrs/asyncclient/MyResource.java +++ b/jaxrs/async-client/src/main/java/org/javaee7/jaxrs/asyncclient/MyResource.java @@ -9,7 +9,7 @@ @Path("fruits") public class MyResource { private final String[] response = { "apple", "banana", "mango" }; - + @GET public String getList() { return response[0]; diff --git a/jaxrs/async-client/src/test/java/org/javaee7/jaxrs/asyncclient/MyResourceTest.java b/jaxrs/async-client/src/test/java/org/javaee7/jaxrs/asyncclient/MyResourceTest.java index b69997359..1d6f34048 100644 --- a/jaxrs/async-client/src/test/java/org/javaee7/jaxrs/asyncclient/MyResourceTest.java +++ b/jaxrs/async-client/src/test/java/org/javaee7/jaxrs/asyncclient/MyResourceTest.java @@ -41,7 +41,7 @@ */ @RunWith(Arquillian.class) public class MyResourceTest { - + /** * Since +JAX-RS+ webservices are, well, web related and require a * web context, they are required to be deployed within a +web archive+. @@ -63,13 +63,13 @@ public class MyResourceTest { */ @Deployment(testable = false) public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, MyResource.class); + return ShrinkWrap.create(WebArchive.class) + .addClasses(MyApplication.class, MyResource.class); } @ArquillianResource private URL base; - + private static WebTarget target; @Before @@ -93,8 +93,8 @@ public void setUpClass() throws MalformedURLException { @Test public void testPollingResponse() throws InterruptedException, ExecutionException { Future r1 = target.request().async().get(); // <1> Build an asynchronous request handler for the +Response+ object - String response = r1.get().readEntity(String.class); // <2> Read the entity from the body of the +Response+ - assertEquals("apple", response); // <3> Validate we got the expected value + String response = r1.get().readEntity(String.class); // <2> Read the entity from the body of the +Response+ + assertEquals("apple", response); // <3> Validate we got the expected value } /** @@ -103,8 +103,8 @@ public void testPollingResponse() throws InterruptedException, ExecutionExceptio @Test public void testPollingString() throws InterruptedException, ExecutionException { Future r1 = target.request().async().get(String.class); // <1> Build an asynchronous request handler for the body of the +Response+ - String response = r1.get(); // <2> Read the entity directly from the +Future+ - assertEquals("apple", response); // <3> Validate we got the expected value + String response = r1.get(); // <2> Read the entity directly from the +Future+ + assertEquals("apple", response); // <3> Validate we got the expected value } /** @@ -112,18 +112,18 @@ public void testPollingString() throws InterruptedException, ExecutionException */ @Test public void testInvocationCallback() throws InterruptedException, ExecutionException { - target.request().async().get(new InvocationCallback() { // <1> Build an asynchronous request callback for the body of the +Response+ + target.request().async().get(new InvocationCallback() { // <1> Build an asynchronous request callback for the body of the +Response+ @Override - public void completed(String r) { // <2> Called when the +Request+ is completed and our entiy parsed + public void completed(String r) { // <2> Called when the +Request+ is completed and our entiy parsed assertEquals("apple", r); } @Override - public void failed(Throwable t) { // <3> Called if the +Request+ failed to complete + public void failed(Throwable t) { // <3> Called if the +Request+ failed to complete fail(t.getMessage()); } - + }); } diff --git a/jaxrs/async-server/pom.xml b/jaxrs/async-server/pom.xml index 7b8f69624..b5378c3ff 100644 --- a/jaxrs/async-server/pom.xml +++ b/jaxrs/async-server/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - async-server + org.javaee7 + jaxrs-async-server 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - async-server diff --git a/jaxrs/async-server/src/main/java/org/javaee7/jaxrs/asyncserver/MyApplication.java b/jaxrs/async-server/src/main/java/org/javaee7/jaxrs/asyncserver/MyApplication.java index 518074e18..a8281ca8d 100644 --- a/jaxrs/async-server/src/main/java/org/javaee7/jaxrs/asyncserver/MyApplication.java +++ b/jaxrs/async-server/src/main/java/org/javaee7/jaxrs/asyncserver/MyApplication.java @@ -8,5 +8,5 @@ */ @ApplicationPath("webresources") public class MyApplication extends Application { - + } diff --git a/jaxrs/async-server/src/main/java/org/javaee7/jaxrs/asyncserver/MyResource.java b/jaxrs/async-server/src/main/java/org/javaee7/jaxrs/asyncserver/MyResource.java index 9cbc8fd18..632999ce7 100644 --- a/jaxrs/async-server/src/main/java/org/javaee7/jaxrs/asyncserver/MyResource.java +++ b/jaxrs/async-server/src/main/java/org/javaee7/jaxrs/asyncserver/MyResource.java @@ -20,10 +20,10 @@ @Path("fruits") public class MyResource { private final String[] response = { "apple", "banana", "mango" }; - -// @Resource(name = "DefaultManagedThreadFactory") -// ManagedThreadFactory threadFactory; - + + // @Resource(name = "DefaultManagedThreadFactory") + // ManagedThreadFactory threadFactory; + @GET public void getList(@Suspended final AsyncResponse ar) throws NamingException { ar.setTimeoutHandler(new TimeoutHandler() { @@ -34,13 +34,13 @@ public void handleTimeout(AsyncResponse ar) { } }); ar.setTimeout(4000, TimeUnit.MILLISECONDS); - + ar.register(new MyCompletionCallback()); ar.register(new MyConnectionCallback()); - + ManagedThreadFactory threadFactory = (ManagedThreadFactory) new InitialContext() - .lookup("java:comp/DefaultManagedThreadFactory"); - + .lookup("java:comp/DefaultManagedThreadFactory"); + Executors.newSingleThreadExecutor(threadFactory).submit(new Runnable() { @Override @@ -49,29 +49,29 @@ public void run() { Thread.sleep(3000); ar.resume(response[0]); } catch (InterruptedException ex) { - + } } - + }); } - + class MyCompletionCallback implements CompletionCallback { @Override public void onComplete(Throwable t) { System.out.println("onComplete"); } - + } - + class MyConnectionCallback implements ConnectionCallback { @Override public void onDisconnect(AsyncResponse ar) { System.out.println("onDisconnect"); } - + } } diff --git a/jaxrs/async-server/src/test/java/org/javaee7/jaxrs/asyncserver/MyResourceTest.java b/jaxrs/async-server/src/test/java/org/javaee7/jaxrs/asyncserver/MyResourceTest.java index 265166af3..330c0efb2 100644 --- a/jaxrs/async-server/src/test/java/org/javaee7/jaxrs/asyncserver/MyResourceTest.java +++ b/jaxrs/async-server/src/test/java/org/javaee7/jaxrs/asyncserver/MyResourceTest.java @@ -24,11 +24,11 @@ */ @RunWith(Arquillian.class) public class MyResourceTest { - + @Deployment(testable = false) public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, MyResource.class); + return ShrinkWrap.create(WebArchive.class) + .addClasses(MyApplication.class, MyResource.class); } private WebTarget target; @@ -41,7 +41,7 @@ public void setUpClass() throws MalformedURLException { Client client = ClientBuilder.newClient(); target = client.target(URI.create(new URL(base, "webresources/fruits").toExternalForm())); } - + /** * Test of getList method, of class MyResource. */ @@ -50,5 +50,5 @@ public void testGetList() { String result = target.request().get(String.class); assertEquals("apple", result); } - + } diff --git a/jaxrs/beanparam/pom.xml b/jaxrs/beanparam/pom.xml index 2d0b983b2..452ab8555 100644 --- a/jaxrs/beanparam/pom.xml +++ b/jaxrs/beanparam/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - beanparam + org.javaee7 + jaxrs-beanparam 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - beanparam diff --git a/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyPathParams.java b/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyPathParams.java index 401234c03..24fb473ca 100644 --- a/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyPathParams.java +++ b/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyPathParams.java @@ -7,27 +7,27 @@ * */ public class MyPathParams { - - @PathParam("id1") - private String id1; - - private String id2; - - public String getId1() { - return id1; - } - - public void setId1(String id1) { - this.id1 = id1; - } - - public String getId2() { - return id2; - } - - @PathParam("id2") - public void setId2(String id2) { - this.id2 = id2; - } + + @PathParam("id1") + private String id1; + + private String id2; + + public String getId1() { + return id1; + } + + public void setId1(String id1) { + this.id1 = id1; + } + + public String getId2() { + return id2; + } + + @PathParam("id2") + public void setId2(String id2) { + this.id2 = id2; + } } diff --git a/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyQueryParams.java b/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyQueryParams.java index b55618bba..04195777f 100644 --- a/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyQueryParams.java +++ b/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyQueryParams.java @@ -7,26 +7,26 @@ * */ public class MyQueryParams { - - @QueryParam("param1") - private String param1; - - @QueryParam("param2") - private String param2; - - @QueryParam("param3") - private String param3; - - public String getParam1() { - return param1; - } - - public String getParam2() { - return param2; - } - - public String getParam3() { - return param3; - } + + @QueryParam("param1") + private String param1; + + @QueryParam("param2") + private String param2; + + @QueryParam("param3") + private String param3; + + public String getParam1() { + return param1; + } + + public String getParam2() { + return param2; + } + + public String getParam3() { + return param3; + } } diff --git a/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyResource.java b/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyResource.java index eab4aafb8..ae174fa86 100644 --- a/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyResource.java +++ b/jaxrs/beanparam/src/main/java/org/javaee7/jaxrs/beanparam/MyResource.java @@ -14,9 +14,9 @@ public class MyResource { @GET() @Path("/{id1}/{id2}") - @Produces(MediaType.TEXT_PLAIN) + @Produces(MediaType.TEXT_PLAIN) public String get(@BeanParam MyPathParams pathParams, @BeanParam MyQueryParams queryParams) { - return "/" + pathParams.getId1() + "/" + pathParams.getId2() + "?param1=" + queryParams.getParam1() + "¶m2=" - + queryParams.getParam2() + "¶m3=" + queryParams.getParam3(); + return "/" + pathParams.getId1() + "/" + pathParams.getId2() + "?param1=" + queryParams.getParam1() + "¶m2=" + + queryParams.getParam2() + "¶m3=" + queryParams.getParam3(); } } diff --git a/jaxrs/beanparam/src/test/java/org/javaee7/jaxrs/beanparam/MyResourceTest.java b/jaxrs/beanparam/src/test/java/org/javaee7/jaxrs/beanparam/MyResourceTest.java index e697a2e72..8f94e3958 100644 --- a/jaxrs/beanparam/src/test/java/org/javaee7/jaxrs/beanparam/MyResourceTest.java +++ b/jaxrs/beanparam/src/test/java/org/javaee7/jaxrs/beanparam/MyResourceTest.java @@ -28,9 +28,10 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, MyResource.class, MyPathParams.class, MyQueryParams.class); + return ShrinkWrap.create(WebArchive.class) + .addClasses(MyApplication.class, MyResource.class, MyPathParams.class, MyQueryParams.class); } + private static WebTarget target; @ArquillianResource @@ -44,8 +45,8 @@ public void setUpClass() throws MalformedURLException { @Test public void testRequestWithAllParams() { - WebTarget t = target.path("/123").path("/abc").queryParam("param1", "foo").queryParam("param2", "bar").queryParam("param3", "baz"); - String r = t.request(). get(String.class); + WebTarget t = target.path("/123").path("/abc").queryParam("param1", "foo").queryParam("param2", "bar").queryParam("param3", "baz"); + String r = t.request().get(String.class); assertEquals("/123/abc?param1=foo¶m2=bar¶m3=baz", r); } diff --git a/jaxrs/beanvalidation/pom.xml b/jaxrs/beanvalidation/pom.xml index 66db1a28a..6fa91f18d 100644 --- a/jaxrs/beanvalidation/pom.xml +++ b/jaxrs/beanvalidation/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - beanvalidation + org.javaee7 + jaxrs-beanvalidation 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - beanvalidation diff --git a/jaxrs/beanvalidation/src/main/java/org/javaee7/jaxrs/beanvalidation/MyResource.java b/jaxrs/beanvalidation/src/main/java/org/javaee7/jaxrs/beanvalidation/MyResource.java index a33557bee..f10ff2999 100644 --- a/jaxrs/beanvalidation/src/main/java/org/javaee7/jaxrs/beanvalidation/MyResource.java +++ b/jaxrs/beanvalidation/src/main/java/org/javaee7/jaxrs/beanvalidation/MyResource.java @@ -25,6 +25,6 @@ public String post(@Size(min = 3) String payload) { @POST @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - public void post2(@NotNull @FormParam("name")String name, @Min(1) @Max(10)@FormParam("age")int age) { + public void post2(@NotNull @FormParam("name") String name, @Min(1) @Max(10) @FormParam("age") int age) { } } diff --git a/jaxrs/beanvalidation/src/test/java/org/javaee7/jaxrs/beanvalidation/MyResourceTest.java b/jaxrs/beanvalidation/src/test/java/org/javaee7/jaxrs/beanvalidation/MyResourceTest.java index 390913b2a..2912c918d 100644 --- a/jaxrs/beanvalidation/src/test/java/org/javaee7/jaxrs/beanvalidation/MyResourceTest.java +++ b/jaxrs/beanvalidation/src/test/java/org/javaee7/jaxrs/beanvalidation/MyResourceTest.java @@ -33,8 +33,9 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, MyResource.class); + .addClasses(MyApplication.class, MyResource.class); } + private static WebTarget target; @ArquillianResource diff --git a/jaxrs/client-negotiation/pom.xml b/jaxrs/client-negotiation/pom.xml index 1be7a4eb0..78542067c 100644 --- a/jaxrs/client-negotiation/pom.xml +++ b/jaxrs/client-negotiation/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - client-negotiation + org.javaee7 + jaxrs-client-negotiation 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - client-negotiation diff --git a/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/MyApplication.java b/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/MyApplication.java index e3d5a4ddc..d5e35ad5e 100644 --- a/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/MyApplication.java +++ b/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/MyApplication.java @@ -16,5 +16,5 @@ public Set> getClasses() { resources.add(MyResource.class); return resources; } - + } diff --git a/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/MyResource.java b/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/MyResource.java index 01dbfc8f2..7dfcd0948 100644 --- a/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/MyResource.java +++ b/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/MyResource.java @@ -12,7 +12,7 @@ @Path("persons") public class MyResource { @GET - @Produces({"application/xml", "application/json"}) + @Produces({ "application/xml", "application/json" }) public List getList() { People people = new People(); people.add(new Person("Penny", 1)); diff --git a/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/People.java b/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/People.java index 61754651a..675d31291 100644 --- a/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/People.java +++ b/jaxrs/client-negotiation/src/main/java/org/javaee7/jaxrs/client/negotiation/People.java @@ -6,13 +6,13 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -@XmlRootElement +@XmlRootElement public class People extends ArrayList { - private static final long serialVersionUID = 1L; - - @XmlElement(name = "person") - public List getPeople() { - return this; - } + private static final long serialVersionUID = 1L; + + @XmlElement(name = "person") + public List getPeople() { + return this; + } } diff --git a/jaxrs/client-negotiation/src/test/java/org/javaee7/jaxrs/client/negotiation/MyResourceTest.java b/jaxrs/client-negotiation/src/test/java/org/javaee7/jaxrs/client/negotiation/MyResourceTest.java index 8e4d18626..5596e458f 100644 --- a/jaxrs/client-negotiation/src/test/java/org/javaee7/jaxrs/client/negotiation/MyResourceTest.java +++ b/jaxrs/client-negotiation/src/test/java/org/javaee7/jaxrs/client/negotiation/MyResourceTest.java @@ -30,10 +30,10 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, MyResource.class, People.class, Person.class); + return ShrinkWrap.create(WebArchive.class) + .addClasses(MyApplication.class, MyResource.class, People.class, Person.class); } - + private WebTarget target; @ArquillianResource @@ -49,7 +49,10 @@ public void setUpClass() throws MalformedURLException { public void testXML() throws SAXException, IOException { String xml = target.request("application/xml").get(String.class); System.out.println(xml); - XMLAssert.assertXMLEqual("1Penny2Leonard3Sheldon", xml); + XMLAssert + .assertXMLEqual( + "1Penny2Leonard3Sheldon", + xml); } @Test @@ -57,5 +60,5 @@ public void testJSON() throws JSONException { String json = target.request("application/json").get(String.class); JSONAssert.assertEquals("[{\"age\":1,\"name\":\"Penny\"},{\"age\":2,\"name\":\"Leonard\"},{\"age\":3,\"name\":\"Sheldon\"}]", json, false); } - + } diff --git a/jaxrs/db-access/pom.xml b/jaxrs/db-access/pom.xml index c869eee66..aa65dd9ab 100644 --- a/jaxrs/db-access/pom.xml +++ b/jaxrs/db-access/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - db-access + jaxrs-db-access war + Java EE 7 Sample: jaxrs - db-access diff --git a/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/Employee.java b/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/Employee.java index 689482935..4b1e5fd7f 100644 --- a/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/Employee.java +++ b/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/Employee.java @@ -26,16 +26,17 @@ public class Employee implements Serializable { @Id @GeneratedValue(strategy = GenerationType.AUTO) private int id; - - @Column(length=40) + + @Column(length = 40) private String name; - - public Employee() { } - + + public Employee() { + } + public Employee(String name) { this.name = name; } - + public int getId() { return id; } @@ -63,7 +64,7 @@ public boolean equals(Object obj) { return false; if (!(obj instanceof Employee)) return false; - Employee that = (Employee)obj; + Employee that = (Employee) obj; if (that.name.equals(this.name) && that.id == this.id) return true; else @@ -74,6 +75,5 @@ public boolean equals(Object obj) { public int hashCode() { return Objects.hash(this.id, this.name); } - - + } diff --git a/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/EmployeeResource.java b/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/EmployeeResource.java index 6dd79e696..1d1383686 100644 --- a/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/EmployeeResource.java +++ b/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/EmployeeResource.java @@ -16,7 +16,7 @@ public class EmployeeResource { @PersistenceContext EntityManager em; - + @GET @Produces("application/xml") public Employee[] get() { diff --git a/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/MyApplication.java b/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/MyApplication.java index bddc3e2a9..a217b78e5 100644 --- a/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/MyApplication.java +++ b/jaxrs/db-access/src/main/java/org/javaee7/jaxrs/dbaccess/MyApplication.java @@ -7,5 +7,5 @@ */ @javax.ws.rs.ApplicationPath("webresources") public class MyApplication extends Application { - + } diff --git a/jaxrs/db-access/src/test/java/org/javaee7/jaxrs/dbaccess/EmployeeResourceTest.java b/jaxrs/db-access/src/test/java/org/javaee7/jaxrs/dbaccess/EmployeeResourceTest.java index da0115dd3..a50ec64a2 100644 --- a/jaxrs/db-access/src/test/java/org/javaee7/jaxrs/dbaccess/EmployeeResourceTest.java +++ b/jaxrs/db-access/src/test/java/org/javaee7/jaxrs/dbaccess/EmployeeResourceTest.java @@ -28,11 +28,11 @@ public class EmployeeResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(Employee.class, - EmployeeResource.class, - MyApplication.class) - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/load.sql"); + .addClasses(Employee.class, + EmployeeResource.class, + MyApplication.class) + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/load.sql"); } @ArquillianResource @@ -44,12 +44,12 @@ public void setUp() throws MalformedURLException { target = client.target(URI.create(new URL(base, "webresources/employee").toExternalForm())); target.register(Employee.class); } - + @Test public void testGet() { Employee[] list = target - .request(MediaType.APPLICATION_XML) - .get(Employee[].class); + .request(MediaType.APPLICATION_XML) + .get(Employee[].class); assertNotNull(list); assertEquals(8, list.length); assertFalse(list[0].equals(new Employee("Penny"))); diff --git a/jaxrs/dynamicfilter/pom.xml b/jaxrs/dynamicfilter/pom.xml index d4a5a81e0..53296ce60 100644 --- a/jaxrs/dynamicfilter/pom.xml +++ b/jaxrs/dynamicfilter/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - dynamicfilter + org.javaee7 + jaxrs-dynamicfilter 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - dynamicfilter diff --git a/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/DynamicServerLogggingFilterFeature.java b/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/DynamicServerLogggingFilterFeature.java index fcfbd3ab5..2447aa93f 100644 --- a/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/DynamicServerLogggingFilterFeature.java +++ b/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/DynamicServerLogggingFilterFeature.java @@ -14,9 +14,9 @@ public class DynamicServerLogggingFilterFeature implements DynamicFeature { @Override public void configure(ResourceInfo ri, FeatureContext fc) { -// if (MyResource.class.isAssignableFrom(ri.getResourceClass()) -// && ri.getResourceMethod().isAnnotationPresent(GET.class)) { - fc.register(new ServerLoggingFilter()); -// } + // if (MyResource.class.isAssignableFrom(ri.getResourceClass()) + // && ri.getResourceMethod().isAnnotationPresent(GET.class)) { + fc.register(new ServerLoggingFilter()); + // } } } diff --git a/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/MyResource.java b/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/MyResource.java index 97e8b6810..fc2031edd 100644 --- a/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/MyResource.java +++ b/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/MyResource.java @@ -13,24 +13,26 @@ @Path("fruits") public class MyResource { private final String[] response = { "apple", "banana", "mango" }; - - @Context Request request; - @Context HttpHeaders headers; - + + @Context + Request request; + @Context + HttpHeaders headers; + @GET public String getList() { System.out.println("GET"); System.out.println("--> size=" + headers.getRequestHeaders().keySet().size()); for (String header : headers.getRequestHeaders().keySet()) { System.out.println("--> " + header); - if (header.equals("myHeader") - && headers.getRequestHeader(header).get(0).equals("myValue")) { - return response[0]; + if (header.equals("myHeader") + && headers.getRequestHeader(header).get(0).equals("myValue")) { + return response[0]; } } return response[1]; } - + @POST public String echoFruit(String fruit) { System.out.println("POST"); diff --git a/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/ServerLoggingFilter.java b/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/ServerLoggingFilter.java index 994e519eb..bb3a3e98d 100644 --- a/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/ServerLoggingFilter.java +++ b/jaxrs/dynamicfilter/src/main/java/org/javaee7/jaxrs/dynamicfilter/ServerLoggingFilter.java @@ -18,10 +18,10 @@ public void filter(ContainerRequestContext crc) throws IOException { for (String key : crc.getHeaders().keySet()) { System.out.println("
" + key + ": " + crc.getHeaders().get(key)); } - + // add a header, check in test crc.getHeaders().add("myHeader", "myValue"); - + System.out.println("ContainerRequestFilter"); } diff --git a/jaxrs/dynamicfilter/src/test/java/org/javaee7/jaxrs/dynamicfilter/MyResourceTest.java b/jaxrs/dynamicfilter/src/test/java/org/javaee7/jaxrs/dynamicfilter/MyResourceTest.java index 35eb99a20..1d1377164 100644 --- a/jaxrs/dynamicfilter/src/test/java/org/javaee7/jaxrs/dynamicfilter/MyResourceTest.java +++ b/jaxrs/dynamicfilter/src/test/java/org/javaee7/jaxrs/dynamicfilter/MyResourceTest.java @@ -26,14 +26,14 @@ @RunWith(Arquillian.class) public class MyResourceTest { - @Deployment(testable=false) + @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses( - MyApplication.class, - MyResource.class, - DynamicServerLogggingFilterFeature.class, - ServerLoggingFilter.class); + .addClasses( + MyApplication.class, + MyResource.class, + DynamicServerLogggingFilterFeature.class, + ServerLoggingFilter.class); } private WebTarget target; diff --git a/jaxrs/fileupload/pom.xml b/jaxrs/fileupload/pom.xml index d8e8e9967..e6fe2bfbd 100644 --- a/jaxrs/fileupload/pom.xml +++ b/jaxrs/fileupload/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - fileupload + org.javaee7 + jaxrs-fileupload 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - fileupload diff --git a/jaxrs/fileupload/src/main/java/org/javaee7/jaxrs/fileupload/MyResource.java b/jaxrs/fileupload/src/main/java/org/javaee7/jaxrs/fileupload/MyResource.java index 4959352f1..00b32654d 100644 --- a/jaxrs/fileupload/src/main/java/org/javaee7/jaxrs/fileupload/MyResource.java +++ b/jaxrs/fileupload/src/main/java/org/javaee7/jaxrs/fileupload/MyResource.java @@ -25,37 +25,37 @@ public class MyResource { @Consumes(MediaType.APPLICATION_OCTET_STREAM) @Produces(MediaType.TEXT_PLAIN) public Response postOctetStream(InputStream content) { - try (Reader reader = new InputStreamReader(content)) { - int totalsize = 0; - int count = 0; - final char[] buffer = new char[256]; - while((count = reader.read(buffer)) != -1) { - totalsize += count; - } - return Response.ok(totalsize).build(); - } catch (IOException e) { - e.printStackTrace(); - return Response.serverError().build(); - } + try (Reader reader = new InputStreamReader(content)) { + int totalsize = 0; + int count = 0; + final char[] buffer = new char[256]; + while ((count = reader.read(buffer)) != -1) { + totalsize += count; + } + return Response.ok(totalsize).build(); + } catch (IOException e) { + e.printStackTrace(); + return Response.serverError().build(); + } } - + @POST @Path("/upload2") - @Consumes({MediaType.APPLICATION_OCTET_STREAM, "image/png"}) + @Consumes({ MediaType.APPLICATION_OCTET_STREAM, "image/png" }) @Produces(MediaType.TEXT_PLAIN) public Response postImageFile(File file) { - try (Reader reader = new FileReader(file)) { - int totalsize = 0; - int count = 0; - final char[] buffer = new char[256]; - while((count = reader.read(buffer)) != -1) { - totalsize += count; - } - return Response.ok(totalsize).build(); - } catch (IOException e) { - e.printStackTrace(); - return Response.serverError().build(); - } + try (Reader reader = new FileReader(file)) { + int totalsize = 0; + int count = 0; + final char[] buffer = new char[256]; + while ((count = reader.read(buffer)) != -1) { + totalsize += count; + } + return Response.ok(totalsize).build(); + } catch (IOException e) { + e.printStackTrace(); + return Response.serverError().build(); + } } } diff --git a/jaxrs/fileupload/src/test/java/org/javaee7/jaxrs/fileupload/MyResourceTest.java b/jaxrs/fileupload/src/test/java/org/javaee7/jaxrs/fileupload/MyResourceTest.java index 59790b4a0..0df77e935 100644 --- a/jaxrs/fileupload/src/test/java/org/javaee7/jaxrs/fileupload/MyResourceTest.java +++ b/jaxrs/fileupload/src/test/java/org/javaee7/jaxrs/fileupload/MyResourceTest.java @@ -35,74 +35,74 @@ @RunWith(Arquillian.class) public class MyResourceTest { - @Deployment(testable = false) - public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class).addClasses(MyApplication.class, MyResource.class); - } - - private static WebTarget target; - - private static File tempFile; - @ArquillianResource - private URL base; - - @BeforeClass - public static void generateSampleFile() throws IOException { - tempFile = File.createTempFile("javaee7samples", ".png"); - // fill the file with 1KB of content - try (FileOutputStream outputStream = new FileOutputStream(tempFile)) { - for (int i = 0; i < 1000; i++) { - outputStream.write(0); - } - } - assertThat(tempFile).canRead().has(new Condition() { - - @Override - public boolean matches(File tempFile) { - return tempFile.length() == 1000; - } - }); - } - - @Before - public void setUpClass() throws MalformedURLException { - Client client = ClientBuilder.newClient(); - target = client.target(URI.create(new URL(base, "webresources/endpoint").toExternalForm())); - } - - @Test - public void shouldPostOctetStreamContentAsInputStream() { - // when - Long uploadedFileSize = target.path("/upload").request() - .post(Entity.entity(tempFile, MediaType.APPLICATION_OCTET_STREAM), Long.class); - // then - assertThat(uploadedFileSize).isEqualTo(1000); - } - - @Test - public void shouldNotPostImagePngContentAsInputStream() { - // when - final Response response = target.path("/upload").request().post(Entity.entity(tempFile, "image/png")); - // then - assertThat(response.getStatus()).isEqualTo(Status.UNSUPPORTED_MEDIA_TYPE.getStatusCode()); - } - - @Test - public void shouldPostOctetStreamContentAsFile() { - // when - Long uploadedFileSize = target.path("/upload2").request() - .post(Entity.entity(tempFile, MediaType.APPLICATION_OCTET_STREAM), Long.class); - // then - assertThat(uploadedFileSize).isEqualTo(1000); - } - - @Test - public void shouldPostImagePngContentAsFile() { - // when - Long uploadedFileSize = target.path("/upload2").request() - .post(Entity.entity(tempFile, "image/png"), Long.class); - // then - assertThat(uploadedFileSize).isEqualTo(1000); - } + @Deployment(testable = false) + public static WebArchive createDeployment() { + return ShrinkWrap.create(WebArchive.class).addClasses(MyApplication.class, MyResource.class); + } + + private static WebTarget target; + + private static File tempFile; + @ArquillianResource + private URL base; + + @BeforeClass + public static void generateSampleFile() throws IOException { + tempFile = File.createTempFile("javaee7samples", ".png"); + // fill the file with 1KB of content + try (FileOutputStream outputStream = new FileOutputStream(tempFile)) { + for (int i = 0; i < 1000; i++) { + outputStream.write(0); + } + } + assertThat(tempFile).canRead().has(new Condition() { + + @Override + public boolean matches(File tempFile) { + return tempFile.length() == 1000; + } + }); + } + + @Before + public void setUpClass() throws MalformedURLException { + Client client = ClientBuilder.newClient(); + target = client.target(URI.create(new URL(base, "webresources/endpoint").toExternalForm())); + } + + @Test + public void shouldPostOctetStreamContentAsInputStream() { + // when + Long uploadedFileSize = target.path("/upload").request() + .post(Entity.entity(tempFile, MediaType.APPLICATION_OCTET_STREAM), Long.class); + // then + assertThat(uploadedFileSize).isEqualTo(1000); + } + + @Test + public void shouldNotPostImagePngContentAsInputStream() { + // when + final Response response = target.path("/upload").request().post(Entity.entity(tempFile, "image/png")); + // then + assertThat(response.getStatus()).isEqualTo(Status.UNSUPPORTED_MEDIA_TYPE.getStatusCode()); + } + + @Test + public void shouldPostOctetStreamContentAsFile() { + // when + Long uploadedFileSize = target.path("/upload2").request() + .post(Entity.entity(tempFile, MediaType.APPLICATION_OCTET_STREAM), Long.class); + // then + assertThat(uploadedFileSize).isEqualTo(1000); + } + + @Test + public void shouldPostImagePngContentAsFile() { + // when + Long uploadedFileSize = target.path("/upload2").request() + .post(Entity.entity(tempFile, "image/png"), Long.class); + // then + assertThat(uploadedFileSize).isEqualTo(1000); + } } diff --git a/jaxrs/filter-interceptor/pom.xml b/jaxrs/filter-interceptor/pom.xml index 95c357fa7..d9e302930 100644 --- a/jaxrs/filter-interceptor/pom.xml +++ b/jaxrs/filter-interceptor/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jaxrs - jaxrs-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jaxrs - filter-interceptor - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jaxrs + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jaxrs-filter-interceptor + 1.0-SNAPSHOT + war + Java EE 7 Sample: jaxrs - filter-interceptor + diff --git a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyApplication.java b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyApplication.java index 9f7dbfef5..46d4563e2 100644 --- a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyApplication.java +++ b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyApplication.java @@ -9,15 +9,15 @@ */ @ApplicationPath("webresources") public class MyApplication extends Application { - + // Resource and filters need to be explicitly specified // until http://java.net/jira/browse/JERSEY-1634 is fixed - -// @Override -// public Set> getClasses() { -// Set> resources = new java.util.HashSet<>(); -// resources.add(org.sample.filter.MyResource.class); -// resources.add(org.sample.filter.ServerLoggingFilter.class); -// return resources; -// } + + // @Override + // public Set> getClasses() { + // Set> resources = new java.util.HashSet<>(); + // resources.add(org.sample.filter.MyResource.class); + // resources.add(org.sample.filter.ServerLoggingFilter.class); + // return resources; + // } } diff --git a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyClientReaderInterceptor.java b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyClientReaderInterceptor.java index 50cf4a290..b3f2f298c 100644 --- a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyClientReaderInterceptor.java +++ b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyClientReaderInterceptor.java @@ -15,7 +15,7 @@ public class MyClientReaderInterceptor implements ReaderInterceptor { @Override public Object aroundReadFrom(ReaderInterceptorContext ric) throws IOException, WebApplicationException { - + System.out.println("MyClientReaderInterceptor"); final InputStream old = ric.getInputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -24,9 +24,9 @@ public Object aroundReadFrom(ReaderInterceptorContext ric) throws IOException, W baos.write(c); } System.out.println("MyClientReaderInterceptor --> " + baos.toString()); - + ric.setInputStream(new ByteArrayInputStream(baos.toByteArray())); - + return ric.proceed(); } } diff --git a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyClientWriterInterceptor.java b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyClientWriterInterceptor.java index b7c9995f6..6d19d1c4f 100644 --- a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyClientWriterInterceptor.java +++ b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyClientWriterInterceptor.java @@ -20,7 +20,7 @@ public void aroundWriteTo(WriterInterceptorContext wic) throws IOException, WebA wic.setOutputStream(new FilterOutputStream(wic.getOutputStream()) { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - + @Override public void write(int b) throws IOException { baos.write(b); @@ -33,17 +33,17 @@ public void close() throws IOException { super.close(); } }); - -// wic.setOutputStream(new FilterOutputStream(wic.getOutputStream()) { -// -// @Override -// public void write(int b) throws IOException { -// System.out.println("**** " + (char)b); -// super.write(b); -// } -// -// }); - + + // wic.setOutputStream(new FilterOutputStream(wic.getOutputStream()) { + // + // @Override + // public void write(int b) throws IOException { + // System.out.println("**** " + (char)b); + // super.write(b); + // } + // + // }); + wic.proceed(); } diff --git a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyResource.java b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyResource.java index 35d4ac01c..a793c2a9b 100644 --- a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyResource.java +++ b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyResource.java @@ -17,9 +17,9 @@ public String getFruit() { } @POST - @Consumes(value="*/*") + @Consumes(value = "*/*") @Produces("text/plain") public String getFruit2(String index) { return "apple"; - } + } } diff --git a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyServerReaderInterceptor.java b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyServerReaderInterceptor.java index d7a8e8873..a0d43a9b2 100644 --- a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyServerReaderInterceptor.java +++ b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyServerReaderInterceptor.java @@ -25,9 +25,9 @@ public Object aroundReadFrom(ReaderInterceptorContext ric) throws IOException, W baos.write(c); } System.out.println("MyClientReaderInterceptor --> " + baos.toString()); - + ric.setInputStream(new ByteArrayInputStream(baos.toByteArray())); - + return ric.proceed(); } diff --git a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyServerWriterInterceptor.java b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyServerWriterInterceptor.java index 1f89aa094..47eeaa526 100644 --- a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyServerWriterInterceptor.java +++ b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/MyServerWriterInterceptor.java @@ -20,7 +20,7 @@ public void aroundWriteTo(WriterInterceptorContext wic) throws IOException, WebA wic.setOutputStream(new FilterOutputStream(wic.getOutputStream()) { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - + @Override public void write(int b) throws IOException { baos.write(b); @@ -34,7 +34,6 @@ public void close() throws IOException { } }); - wic.proceed(); } diff --git a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/ServerLoggingFilter.java b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/ServerLoggingFilter.java index b356a6a3d..74d8352d9 100644 --- a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/ServerLoggingFilter.java +++ b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/ServerLoggingFilter.java @@ -16,7 +16,8 @@ * @author Arun Gupta */ @Provider -@Priority(Priorities.USER) // default value +@Priority(Priorities.USER) +// default value public class ServerLoggingFilter implements ContainerRequestFilter, ContainerResponseFilter { @Override diff --git a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/TestServlet.java b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/TestServlet.java index 2961412b8..4d5c3cb3c 100644 --- a/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/TestServlet.java +++ b/jaxrs/filter-interceptor/src/main/java/org/javaee7/jaxrs/sample/filter/interceptor/TestServlet.java @@ -15,7 +15,7 @@ /** * @author Arun Gupta */ -@WebServlet(name = "TestServlet", urlPatterns = {"/TestServlet"}) +@WebServlet(name = "TestServlet", urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -29,7 +29,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -41,20 +41,20 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re Client client = ClientBuilder.newClient(); client.register(ClientLoggingFilter.class).register(MyClientReaderInterceptor.class).register(MyClientWriterInterceptor.class); WebTarget target = client.target("http://" - + request.getServerName() - + ":" - + request.getServerPort() - + request.getContextPath() - + "/webresources/fruits"); - out.println(target.getUri()+ "

"); - out.println("GET request"+ "

"); + + request.getServerName() + + ":" + + request.getServerPort() + + request.getContextPath() + + "/webresources/fruits"); + out.println(target.getUri() + "

"); + out.println("GET request" + "

"); String result = target.request().get(String.class); out.println("Received response (GET): " + result + "

"); System.out.println("**** POST request"); result = target - .request() - .post(Entity.text("1"), String.class); + .request() + .post(Entity.text("1"), String.class); out.println("Received response (POST): " + result + "

"); out.println("Received response: " + result + "

"); @@ -75,7 +75,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -90,7 +90,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jaxrs/filter/pom.xml b/jaxrs/filter/pom.xml index 254deff10..14f40a31b 100644 --- a/jaxrs/filter/pom.xml +++ b/jaxrs/filter/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - filter + org.javaee7 + jaxrs-filter 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - filter diff --git a/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/MyApplication.java b/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/MyApplication.java index 26bc8921f..4c6ed88fa 100644 --- a/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/MyApplication.java +++ b/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/MyApplication.java @@ -8,5 +8,5 @@ */ @ApplicationPath("webresources") public class MyApplication extends Application { - + } diff --git a/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/MyResource.java b/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/MyResource.java index 69b8c96b5..c2ddc3f33 100644 --- a/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/MyResource.java +++ b/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/MyResource.java @@ -23,9 +23,9 @@ public String getFruit() { String serverHeaderValue = headers.getHeaderString("serverHeader"); if (clientHeaderValue != null - && clientHeaderValue.equals("clientHeaderValue") - && serverHeaderValue != null - && serverHeaderValue.equals("serverHeaderValue")) { + && clientHeaderValue.equals("clientHeaderValue") + && serverHeaderValue != null + && serverHeaderValue.equals("serverHeaderValue")) { return "apple"; } else { return "banana"; @@ -40,9 +40,9 @@ public String echoFruit(String fruit) { String serverHeaderValue = headers.getHeaderString("serverHeader"); if (clientHeaderValue != null - && clientHeaderValue.equals("clientHeaderValue") - && serverHeaderValue != null - && serverHeaderValue.equals("serverHeaderValue")) { + && clientHeaderValue.equals("clientHeaderValue") + && serverHeaderValue != null + && serverHeaderValue.equals("serverHeaderValue")) { return fruit; } else { return fruit.toUpperCase(); diff --git a/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/ServerLoggingFilter.java b/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/ServerLoggingFilter.java index c65b8a812..83ca00fc2 100644 --- a/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/ServerLoggingFilter.java +++ b/jaxrs/filter/src/main/java/org/javaee7/jaxrs/filter/ServerLoggingFilter.java @@ -16,7 +16,8 @@ * @author Arun Gupta */ @Provider -@Priority(Priorities.USER) // default value +@Priority(Priorities.USER) +// default value public class ServerLoggingFilter implements ContainerRequestFilter, ContainerResponseFilter { @Override diff --git a/jaxrs/filter/src/test/java/org/javaee7/jaxrs/filter/MyResourceTest.java b/jaxrs/filter/src/test/java/org/javaee7/jaxrs/filter/MyResourceTest.java index 2826570d7..d0ff6f4ae 100644 --- a/jaxrs/filter/src/test/java/org/javaee7/jaxrs/filter/MyResourceTest.java +++ b/jaxrs/filter/src/test/java/org/javaee7/jaxrs/filter/MyResourceTest.java @@ -28,8 +28,8 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, MyResource.class, ServerLoggingFilter.class); + return ShrinkWrap.create(WebArchive.class) + .addClasses(MyApplication.class, MyResource.class, ServerLoggingFilter.class); } private WebTarget target; @@ -51,8 +51,8 @@ public void setUpClass() throws MalformedURLException { public void testGetFruit() { String result = target.request().get(String.class); assertEquals("Likely that the headers set in the filter were not available in endpoint", - "apple", - result); + "apple", + result); } /** @@ -62,8 +62,8 @@ public void testGetFruit() { public void testPostFruit() { String result = target.request().post(Entity.text("apple"), String.class); assertEquals("Likely that the headers set in the filter were not available in endpoint", - "apple", - result); + "apple", + result); } } diff --git a/jaxrs/interceptor/pom.xml b/jaxrs/interceptor/pom.xml index 2b9142015..55b0d175d 100644 --- a/jaxrs/interceptor/pom.xml +++ b/jaxrs/interceptor/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - interceptor + org.javaee7 + jaxrs-interceptor 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - interceptor diff --git a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyApplication.java b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyApplication.java index 07375f9a9..16796c85b 100644 --- a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyApplication.java +++ b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyApplication.java @@ -9,12 +9,12 @@ */ @ApplicationPath("webresources") public class MyApplication extends Application { -// @Override -// public Set> getClasses() { -// Set> resources = new java.util.HashSet<>(); -// resources.add(MyResource.class); -// resources.add(MyServerReaderInterceptor.class); -// resources.add(MyServerWriterInterceptor.class); -// return resources; -// } + // @Override + // public Set> getClasses() { + // Set> resources = new java.util.HashSet<>(); + // resources.add(MyResource.class); + // resources.add(MyServerReaderInterceptor.class); + // resources.add(MyServerWriterInterceptor.class); + // return resources; + // } } diff --git a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyClientReaderInterceptor.java b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyClientReaderInterceptor.java index e9b8be23b..665ad057d 100644 --- a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyClientReaderInterceptor.java +++ b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyClientReaderInterceptor.java @@ -16,25 +16,25 @@ public class MyClientReaderInterceptor implements ReaderInterceptor { @Override public Object aroundReadFrom(ReaderInterceptorContext ric) throws IOException, WebApplicationException { - + System.out.println("MyClientReaderInterceptor"); -// ric.setInputStream(new FilterInputStream(ric.getInputStream()) { -// -// final ByteArrayOutputStream baos = new ByteArrayOutputStream(); -// -// @Override -// public int read(byte[] b, int off, int len) throws IOException { -// baos.write(b, off, len); -//// System.out.println("@@@@@@ " + b); -// return super.read(b, off, len); -// } -// -// @Override -// public void close() throws IOException { -// System.out.println("### " + baos.toString()); -// super.close(); -// } -// }); + // ric.setInputStream(new FilterInputStream(ric.getInputStream()) { + // + // final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + // + // @Override + // public int read(byte[] b, int off, int len) throws IOException { + // baos.write(b, off, len); + //// System.out.println("@@@@@@ " + b); + // return super.read(b, off, len); + // } + // + // @Override + // public void close() throws IOException { + // System.out.println("### " + baos.toString()); + // super.close(); + // } + // }); final InputStream old = ric.getInputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); int c; @@ -42,9 +42,9 @@ public Object aroundReadFrom(ReaderInterceptorContext ric) throws IOException, W baos.write(c); } System.out.println("MyClientReaderInterceptor --> " + baos.toString()); - + ric.setInputStream(new ByteArrayInputStream(baos.toByteArray())); - + return ric.proceed(); } } diff --git a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyClientWriterInterceptor.java b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyClientWriterInterceptor.java index 246d957c4..935f7f121 100644 --- a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyClientWriterInterceptor.java +++ b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyClientWriterInterceptor.java @@ -20,7 +20,7 @@ public void aroundWriteTo(WriterInterceptorContext wic) throws IOException, WebA wic.setOutputStream(new FilterOutputStream(wic.getOutputStream()) { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - + @Override public void write(int b) throws IOException { baos.write(b); @@ -33,17 +33,17 @@ public void close() throws IOException { super.close(); } }); - -// wic.setOutputStream(new FilterOutputStream(wic.getOutputStream()) { -// -// @Override -// public void write(int b) throws IOException { -// System.out.println("**** " + (char)b); -// super.write(b); -// } -// -// }); - + + // wic.setOutputStream(new FilterOutputStream(wic.getOutputStream()) { + // + // @Override + // public void write(int b) throws IOException { + // System.out.println("**** " + (char)b); + // super.write(b); + // } + // + // }); + wic.proceed(); } diff --git a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyResource.java b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyResource.java index 50ca4625f..e56a5830e 100644 --- a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyResource.java +++ b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyResource.java @@ -16,13 +16,13 @@ public String getResource() { System.out.println("endpoint invoked (getResource)"); return "banana"; } - + @POST - @Consumes(value="*/*") + @Consumes(value = "*/*") @Produces("text/plain") public String getResource2(String index) { System.out.println("endpoint invoked (getResource2(" + index + "))"); - + return "apple"; } } diff --git a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyServerReaderInterceptor.java b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyServerReaderInterceptor.java index f0d073ad6..f7c404ea1 100644 --- a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyServerReaderInterceptor.java +++ b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyServerReaderInterceptor.java @@ -25,9 +25,9 @@ public Object aroundReadFrom(ReaderInterceptorContext ric) throws IOException, W baos.write(c); } System.out.println("MyClientReaderInterceptor --> " + baos.toString()); - + ric.setInputStream(new ByteArrayInputStream(baos.toByteArray())); - + return ric.proceed(); } diff --git a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyServerWriterInterceptor.java b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyServerWriterInterceptor.java index 0b1aa4994..d3551c78f 100644 --- a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyServerWriterInterceptor.java +++ b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/MyServerWriterInterceptor.java @@ -20,7 +20,7 @@ public void aroundWriteTo(WriterInterceptorContext wic) throws IOException, WebA wic.setOutputStream(new FilterOutputStream(wic.getOutputStream()) { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - + @Override public void write(int b) throws IOException { baos.write(b); @@ -34,7 +34,6 @@ public void close() throws IOException { } }); - wic.proceed(); } diff --git a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/TestServlet.java b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/TestServlet.java index 70b6f3b95..e7e5d7bec 100644 --- a/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/TestServlet.java +++ b/jaxrs/interceptor/src/main/java/org/javaee7/jaxrs/interceptor/TestServlet.java @@ -15,7 +15,7 @@ /** * @author Arun Gupta */ -@WebServlet(name = "TestServlet", urlPatterns = {"/TestServlet"}) +@WebServlet(name = "TestServlet", urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -29,40 +29,40 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); Client client = ClientBuilder.newClient(); client - .register(MyClientReaderInterceptor.class) - .register(MyClientWriterInterceptor.class); + .register(MyClientReaderInterceptor.class) + .register(MyClientWriterInterceptor.class); WebTarget target = client.target("http://" - + request.getServerName() - + ":" - + request.getServerPort() - + request.getContextPath() - + "/webresources/fruits"); + + request.getServerName() + + ":" + + request.getServerPort() + + request.getContextPath() + + "/webresources/fruits"); System.out.println("GET request"); String result = target - .request() - .get(String.class); + .request() + .get(String.class); out.println("Received response: " + result + "

"); - + System.out.println("POST request"); result = target - .request() - .post(Entity.text("1"), String.class); + .request() + .post(Entity.text("1"), String.class); out.println("Received response: " + result + "

"); - + out.println("Check server.log for client/server interceptor output." - + "Only ServerWriter and ClientReader invoked for GET." - + "ClientWriter, ServerReader, ServerWriter, and ClientReader are invoked for POST."); + + "Only ServerWriter and ClientReader invoked for GET." + + "ClientWriter, ServerReader, ServerWriter, and ClientReader are invoked for POST."); out.println(""); out.println(""); } @@ -79,7 +79,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -94,7 +94,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jaxrs/invocation-async/pom.xml b/jaxrs/invocation-async/pom.xml index c5a33d40f..55655daa4 100644 --- a/jaxrs/invocation-async/pom.xml +++ b/jaxrs/invocation-async/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - invocation-async + org.javaee7 + jaxrs-invocation-async 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - invocation-async diff --git a/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/MyApplication.java b/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/MyApplication.java index 307f98ad4..3a88e163b 100644 --- a/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/MyApplication.java +++ b/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/MyApplication.java @@ -16,5 +16,5 @@ public Set> getClasses() { resources.add(MyResource.class); return resources; } - + } diff --git a/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/MyResource.java b/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/MyResource.java index 242250dfb..cbbdfd889 100644 --- a/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/MyResource.java +++ b/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/MyResource.java @@ -20,7 +20,7 @@ public String get() { System.out.println("get"); return "foobar"; } - + @POST @Consumes(MediaType.APPLICATION_FORM_URLENCODED) public String post(@FormParam("name") String name, @FormParam("age") int age) { diff --git a/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/TestServlet.java b/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/TestServlet.java index efa0ab603..7ec8db761 100644 --- a/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/TestServlet.java +++ b/jaxrs/invocation-async/src/main/java/org/javaee7/jaxrs/invocation/async/TestServlet.java @@ -22,7 +22,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -36,7 +36,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -48,11 +48,11 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println("Initializing client...
"); Client client = ClientBuilder.newClient(); WebTarget target = client.target("http://" - + request.getServerName() - + ":" - + request.getServerPort() - + request.getContextPath() - + "/webresources/resource"); + + request.getServerName() + + ":" + + request.getServerPort() + + request.getContextPath() + + "/webresources/resource"); // GET out.print("Building a GET request ...
"); @@ -78,7 +78,6 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re Logger.getLogger(TestServlet.class.getName()).log(Level.SEVERE, null, ex); } - out.println("... done.
"); out.println(""); @@ -97,7 +96,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -112,7 +111,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jaxrs/invocation/pom.xml b/jaxrs/invocation/pom.xml index ed173fcb3..376fd8fe4 100644 --- a/jaxrs/invocation/pom.xml +++ b/jaxrs/invocation/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - invocation + org.javaee7 + jaxrs-invocation 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - invocation diff --git a/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/MyApplication.java b/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/MyApplication.java index ff3cfa106..903cc9394 100644 --- a/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/MyApplication.java +++ b/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/MyApplication.java @@ -16,5 +16,5 @@ public Set> getClasses() { resources.add(MyResource.class); return resources; } - + } diff --git a/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/MyResource.java b/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/MyResource.java index 3de5f181d..b691a78c6 100644 --- a/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/MyResource.java +++ b/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/MyResource.java @@ -20,7 +20,7 @@ public String get() { System.out.println("get"); return "foobar"; } - + @POST @Consumes(MediaType.APPLICATION_FORM_URLENCODED) public void post(@FormParam("name") String name, @FormParam("age") int age) { diff --git a/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/TestServlet.java b/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/TestServlet.java index 87a8436e1..78f782c78 100644 --- a/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/TestServlet.java +++ b/jaxrs/invocation/src/main/java/org/javaee7/jaxrs/invocation/TestServlet.java @@ -19,7 +19,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -33,7 +33,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -45,17 +45,17 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println("Initializing client...
"); Client client = ClientBuilder.newClient(); WebTarget target = client.target("http://" - + request.getServerName() - + ":" - + request.getServerPort() - + request.getContextPath() - + "/webresources/resource"); + + request.getServerName() + + ":" + + request.getServerPort() + + request.getContextPath() + + "/webresources/resource"); // GET out.print("Building a GET request ...
"); Invocation i1 = target.request().buildGet(); out.print("GET request ready ...
"); - + // POST out.print("Building a POST request...
"); MultivaluedHashMap map = new MultivaluedHashMap<>(); @@ -63,16 +63,16 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re map.add("age", "17"); Invocation i2 = target.request().buildPost(Entity.form(map)); out.print("POSTed request ready...
"); - + Collection is = Arrays.asList(i1, i2); - + for (Invocation i : is) { i.invoke(); System.out.println("Request invoked"); } out.println("... done.
"); - + out.println(""); out.println(""); } @@ -89,7 +89,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -104,7 +104,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jaxrs/jaxrs-client/pom.xml b/jaxrs/jaxrs-client/pom.xml index c32f1e47c..7fbb7a645 100644 --- a/jaxrs/jaxrs-client/pom.xml +++ b/jaxrs/jaxrs-client/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - jaxrs-client + jaxrs-jaxrs-client war + Java EE 7 Sample: jaxrs - jaxrs-client diff --git a/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/MyApplication.java b/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/MyApplication.java index f654470dd..ad91039af 100644 --- a/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/MyApplication.java +++ b/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/MyApplication.java @@ -16,5 +16,5 @@ public Set> getClasses() { resources.add(MyResource.class); return resources; } - + } diff --git a/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/MyResource.java b/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/MyResource.java index 196203360..2c6cc479e 100644 --- a/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/MyResource.java +++ b/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/MyResource.java @@ -16,21 +16,23 @@ /** * @author Arun Gupta */ -@Path("persons") @RequestScoped +@Path("persons") +@RequestScoped public class MyResource { // Ideally this state should be stored in a database - @EJB PersonSessionBean bean; + @EJB + PersonSessionBean bean; @GET - @Produces({"application/xml", "application/json"}) + @Produces({ "application/xml", "application/json" }) public Person[] getList() { return bean.getPersons().toArray(new Person[0]); } - + @GET - @Produces({"application/json", "application/xml"}) + @Produces({ "application/json", "application/xml" }) @Path("{id}") - public Person getPerson(@PathParam("id")int id) { + public Person getPerson(@PathParam("id") int id) { if (id < bean.getPersons().size()) return bean.getPersons().get(id); else diff --git a/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/PersonSessionBean.java b/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/PersonSessionBean.java index d91b4ff30..f67030503 100644 --- a/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/PersonSessionBean.java +++ b/jaxrs/jaxrs-client/src/main/java/org/javaee7/jaxrs/client/PersonSessionBean.java @@ -23,8 +23,9 @@ public void addPerson(Person p) { public void deletePerson(String name) { Person p = findPersonByName(name); if (p != null) - list.remove(p); + list.remove(p); } + private Person findPersonByName(String name) { for (Person p : list) { if (name.equals(p.getName())) diff --git a/jaxrs/jaxrs-client/src/test/java/org/javaee7/jaxrs/client/MyResourceTest.java b/jaxrs/jaxrs-client/src/test/java/org/javaee7/jaxrs/client/MyResourceTest.java index 43ea294f1..e3ae4d499 100644 --- a/jaxrs/jaxrs-client/src/test/java/org/javaee7/jaxrs/client/MyResourceTest.java +++ b/jaxrs/jaxrs-client/src/test/java/org/javaee7/jaxrs/client/MyResourceTest.java @@ -41,9 +41,9 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses( - MyApplication.class, MyResource.class, People.class, - Person.class, PersonSessionBean.class); + .addClasses( + MyApplication.class, MyResource.class, People.class, + Person.class, PersonSessionBean.class); } @ArquillianResource @@ -95,10 +95,10 @@ public void test1PostAndGet() { @Test public void test2GetSingle() { Person p = target - .path("{id}") - .resolveTemplate("id", "1") - .request(MediaType.APPLICATION_XML) - .get(Person.class); + .path("{id}") + .resolveTemplate("id", "1") + .request(MediaType.APPLICATION_XML) + .get(Person.class); assertEquals("Leonard", p.getName()); assertEquals(2, p.getAge()); } @@ -126,10 +126,10 @@ public void test3Put() { @Test public void test4Delete() { target - .path("{name}") - .resolveTemplate("name", "Howard") - .request() - .delete(); + .path("{name}") + .resolveTemplate("name", "Howard") + .request() + .delete(); Person[] list = target.request().get(Person[].class); assertEquals(3, list.length); } @@ -153,10 +153,10 @@ public void test6DeleteAll() { Person[] list = target.request().get(Person[].class); for (Person p : list) { target - .path("{name}") - .resolveTemplate("name", p.getName()) - .request() - .delete(); + .path("{name}") + .resolveTemplate("name", p.getName()) + .request() + .delete(); } list = target.request().get(Person[].class); assertEquals(0, list.length); diff --git a/jaxrs/jaxrs-endpoint/pom.xml b/jaxrs/jaxrs-endpoint/pom.xml index df573aa32..9053bc9fb 100644 --- a/jaxrs/jaxrs-endpoint/pom.xml +++ b/jaxrs/jaxrs-endpoint/pom.xml @@ -1,14 +1,14 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - jaxrs-endpoint + jaxrs-jaxrs-endpoint war - + Java EE 7 Sample: jaxrs - jaxrs-endpoint diff --git a/jaxrs/jaxrs-endpoint/src/main/java/org/javaee7/jaxrs/endpoint/Database.java b/jaxrs/jaxrs-endpoint/src/main/java/org/javaee7/jaxrs/endpoint/Database.java index d0062865a..23f88bc35 100644 --- a/jaxrs/jaxrs-endpoint/src/main/java/org/javaee7/jaxrs/endpoint/Database.java +++ b/jaxrs/jaxrs-endpoint/src/main/java/org/javaee7/jaxrs/endpoint/Database.java @@ -12,15 +12,15 @@ public class Database { static public String getAll() { return list.toString(); } - + static public String get(String fruit) { return list.contains(fruit) ? fruit : ""; } - + static public void add(String fruit) { list.add(fruit); } - + static public void delete(String fruit) { list.remove(fruit); } diff --git a/jaxrs/jaxrs-endpoint/src/main/java/org/javaee7/jaxrs/endpoint/MyResource.java b/jaxrs/jaxrs-endpoint/src/main/java/org/javaee7/jaxrs/endpoint/MyResource.java index 6b23ea855..94d7409f2 100644 --- a/jaxrs/jaxrs-endpoint/src/main/java/org/javaee7/jaxrs/endpoint/MyResource.java +++ b/jaxrs/jaxrs-endpoint/src/main/java/org/javaee7/jaxrs/endpoint/MyResource.java @@ -18,29 +18,29 @@ public String get() { System.out.println("GET"); return Database.getAll(); } - + @GET @Path("{name}") - public String get(@PathParam("name")String payload) { + public String get(@PathParam("name") String payload) { System.out.println("GET"); return Database.get(payload); } - + @POST public void post(String payload) { System.out.println("POST"); Database.add(payload); } - + @PUT public void put(String payload) { System.out.println("PUT"); Database.add(payload); } - + @DELETE @Path("{name}") - public void delete(@PathParam("name")String payload) { + public void delete(@PathParam("name") String payload) { System.out.println("DELETE"); Database.delete(payload); } diff --git a/jaxrs/jaxrs-endpoint/src/test/java/org/javaee7/jaxrs/endpoint/MyResourceTest.java b/jaxrs/jaxrs-endpoint/src/test/java/org/javaee7/jaxrs/endpoint/MyResourceTest.java index 82d4c77ca..8b464e171 100644 --- a/jaxrs/jaxrs-endpoint/src/test/java/org/javaee7/jaxrs/endpoint/MyResourceTest.java +++ b/jaxrs/jaxrs-endpoint/src/test/java/org/javaee7/jaxrs/endpoint/MyResourceTest.java @@ -30,7 +30,7 @@ public class MyResourceTest { private static WebTarget target; - + /** * Arquillian specific method for creating a file which can be deployed * while executing the test. @@ -40,14 +40,14 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class). - addClass(MyApplication.class). - addClass(Database.class). - addClass(MyResource.class); + addClass(MyApplication.class). + addClass(Database.class). + addClass(MyResource.class); System.out.println(war.toString(true)); - + return war; } - + @ArquillianResource private URL base; @@ -56,7 +56,7 @@ public void setupClass() throws MalformedURLException { Client client = ClientBuilder.newClient(); target = client.target(URI.create(new URL(base, "webresources/fruit").toExternalForm())); } - + /** * Test of POST method, of class MyResource. */ @@ -103,7 +103,7 @@ public void test5Delete() { target.path("banana").request().delete(); String r = target.request().get(String.class); assertEquals("[apple]", r); - + target.path("apple").request().delete(); r = target.request().get(String.class); assertEquals("[]", r); diff --git a/jaxrs/jaxrs-security-declarative/pom.xml b/jaxrs/jaxrs-security-declarative/pom.xml index c030ff74a..fe7be0371 100644 --- a/jaxrs/jaxrs-security-declarative/pom.xml +++ b/jaxrs/jaxrs-security-declarative/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - jaxrs-security-declarative + jaxrs-jaxrs-security-declarative war + Java EE 7 Sample: jaxrs - jaxrs-security-declarative diff --git a/jaxrs/jaxrs-security-declarative/src/main/java/org/javaee7/jaxrs/security/declarative/MyApplication.java b/jaxrs/jaxrs-security-declarative/src/main/java/org/javaee7/jaxrs/security/declarative/MyApplication.java index e1cf973a5..3fdc74631 100644 --- a/jaxrs/jaxrs-security-declarative/src/main/java/org/javaee7/jaxrs/security/declarative/MyApplication.java +++ b/jaxrs/jaxrs-security-declarative/src/main/java/org/javaee7/jaxrs/security/declarative/MyApplication.java @@ -16,5 +16,5 @@ public Set> getClasses() { resources.add(MyResource.class); return resources; } - + } diff --git a/jaxrs/jaxrs-security-declarative/src/main/java/org/javaee7/jaxrs/security/declarative/MyResource.java b/jaxrs/jaxrs-security-declarative/src/main/java/org/javaee7/jaxrs/security/declarative/MyResource.java index d6115242c..380d3d7e8 100644 --- a/jaxrs/jaxrs-security-declarative/src/main/java/org/javaee7/jaxrs/security/declarative/MyResource.java +++ b/jaxrs/jaxrs-security-declarative/src/main/java/org/javaee7/jaxrs/security/declarative/MyResource.java @@ -23,10 +23,10 @@ public class MyResource { public String get() { return "get"; } - + @GET @Path("{id}") - public String getPerson(@PathParam("id")int id) { + public String getPerson(@PathParam("id") int id) { return "get" + id; } diff --git a/jaxrs/jaxrs-security-declarative/src/main/webapp/WEB-INF/web.xml b/jaxrs/jaxrs-security-declarative/src/main/webapp/WEB-INF/web.xml index 58672e8c7..b51cb721b 100644 --- a/jaxrs/jaxrs-security-declarative/src/main/webapp/WEB-INF/web.xml +++ b/jaxrs/jaxrs-security-declarative/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee%20http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" + version="3.1"> diff --git a/jaxrs/jaxrs-security-declarative/src/test/java/org/javaee7/jaxrs/security/declarative/MyResourceTest.java b/jaxrs/jaxrs-security-declarative/src/test/java/org/javaee7/jaxrs/security/declarative/MyResourceTest.java index e599a285f..5fed2b7d8 100644 --- a/jaxrs/jaxrs-security-declarative/src/test/java/org/javaee7/jaxrs/security/declarative/MyResourceTest.java +++ b/jaxrs/jaxrs-security-declarative/src/test/java/org/javaee7/jaxrs/security/declarative/MyResourceTest.java @@ -33,14 +33,14 @@ public class MyResourceTest { @ArquillianResource private URL base; - + private static final String WEBAPP_SRC = "src/main/webapp"; - + @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) - .addClasses(MyApplication.class, MyResource.class); + .addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))) + .addClasses(MyApplication.class, MyResource.class); } @Test diff --git a/jaxrs/jsonp/pom.xml b/jaxrs/jsonp/pom.xml index 86704047f..8ac7dbf63 100644 --- a/jaxrs/jsonp/pom.xml +++ b/jaxrs/jsonp/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.jaxrs - jaxrs-samples - 1.0-SNAPSHOT - ../pom.xml - - - jsonp - war - + + + 4.0.0 + + + org.javaee7 + jaxrs + 1.0-SNAPSHOT + ../pom.xml + + jaxrs-jsonp + war + Java EE 7 Sample: jaxrs - jsonp + diff --git a/jaxrs/jsonp/src/test/java/org/javaee7/jaxrs/jsonp/MyResourceTest.java b/jaxrs/jsonp/src/test/java/org/javaee7/jaxrs/jsonp/MyResourceTest.java index fc0fabc0a..c3eec9514 100644 --- a/jaxrs/jsonp/src/test/java/org/javaee7/jaxrs/jsonp/MyResourceTest.java +++ b/jaxrs/jsonp/src/test/java/org/javaee7/jaxrs/jsonp/MyResourceTest.java @@ -55,10 +55,10 @@ public void tearDown() { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses( - MyApplication.class, - MyObjectResource.class, - MyArrayResource.class); + .addClasses( + MyApplication.class, + MyObjectResource.class, + MyArrayResource.class); } /** @@ -67,13 +67,13 @@ public static WebArchive createDeployment() { @Test public void testEchoObject() { JsonObject jsonObject = Json.createObjectBuilder() - .add("apple", "red") - .add("banana", "yellow") - .build(); + .add("apple", "red") + .add("banana", "yellow") + .build(); JsonObject json = targetObject - .request() - .post(Entity.entity(jsonObject, MediaType.APPLICATION_JSON), JsonObject.class); + .request() + .post(Entity.entity(jsonObject, MediaType.APPLICATION_JSON), JsonObject.class); assertNotNull(json); assertFalse(json.isEmpty()); assertTrue(json.containsKey("apple")); @@ -85,15 +85,15 @@ public void testEchoObject() { @Test public void testEchoArray() { JsonArray jsonArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder() - .add("apple", "red")) - .add(Json.createObjectBuilder() - .add("banana", "yellow")) - .build(); + .add(Json.createObjectBuilder() + .add("apple", "red")) + .add(Json.createObjectBuilder() + .add("banana", "yellow")) + .build(); JsonArray json = targetArray - .request() - .post(Entity.entity(jsonArray, MediaType.APPLICATION_JSON), JsonArray.class); + .request() + .post(Entity.entity(jsonArray, MediaType.APPLICATION_JSON), JsonArray.class); assertNotNull(json); assertEquals(2, json.size()); assertTrue(json.getJsonObject(0).containsKey("apple")); diff --git a/jaxrs/link/pom.xml b/jaxrs/link/pom.xml index 669206a0a..cdb9d6398 100644 --- a/jaxrs/link/pom.xml +++ b/jaxrs/link/pom.xml @@ -1,17 +1,18 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - link + org.javaee7 + jaxrs-link 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - link @@ -36,5 +37,4 @@ 2.0 - diff --git a/jaxrs/link/src/main/java/org/javaee7/jaxrs/link/MyApplication.java b/jaxrs/link/src/main/java/org/javaee7/jaxrs/link/MyApplication.java index 19af5b703..ee7934cbc 100644 --- a/jaxrs/link/src/main/java/org/javaee7/jaxrs/link/MyApplication.java +++ b/jaxrs/link/src/main/java/org/javaee7/jaxrs/link/MyApplication.java @@ -8,10 +8,10 @@ */ @ApplicationPath("webresources") public class MyApplication extends Application { -// @Override -// public Set> getClasses() { -// Set> resources = new java.util.HashSet<>(); -// resources.add(MyResource.class); -// return resources; -// } + // @Override + // public Set> getClasses() { + // Set> resources = new java.util.HashSet<>(); + // resources.add(MyResource.class); + // return resources; + // } } diff --git a/jaxrs/link/src/main/java/org/javaee7/jaxrs/link/MyResource.java b/jaxrs/link/src/main/java/org/javaee7/jaxrs/link/MyResource.java index e1773b52f..b47372196 100644 --- a/jaxrs/link/src/main/java/org/javaee7/jaxrs/link/MyResource.java +++ b/jaxrs/link/src/main/java/org/javaee7/jaxrs/link/MyResource.java @@ -13,7 +13,7 @@ @Path("fruits") public class MyResource { - private final String[] response = {"apple", "banana", "mango"}; + private final String[] response = { "apple", "banana", "mango" }; @GET public String getList() { @@ -25,9 +25,9 @@ public String getList() { @GET public Response get() throws URISyntaxException { return Response.ok(). - link("http://oracle.com/", "parent"). - link(new URI("http://jersey.java.net/"), "framework"). - links( + link("http://oracle.com/", "parent"). + link(new URI("http://jersey.java.net/"), "framework"). + links( Link.fromUri("test1").rel("test1").build(), Link.fromUri("test2").rel("test2").build(), Link.fromUri("test3").rel("test3").build()).build(); diff --git a/jaxrs/mapping-exceptions/pom.xml b/jaxrs/mapping-exceptions/pom.xml index 926403bc3..850f32659 100644 --- a/jaxrs/mapping-exceptions/pom.xml +++ b/jaxrs/mapping-exceptions/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - mapping-exceptions + org.javaee7 + jaxrs-mapping-exceptions 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - mapping-exceptions diff --git a/jaxrs/mapping-exceptions/src/main/java/org/javaee7/jaxrs/mapping/exceptions/OrderNotFoundExceptionMapper.java b/jaxrs/mapping-exceptions/src/main/java/org/javaee7/jaxrs/mapping/exceptions/OrderNotFoundExceptionMapper.java index 42590b9d9..a586fe0ce 100644 --- a/jaxrs/mapping-exceptions/src/main/java/org/javaee7/jaxrs/mapping/exceptions/OrderNotFoundExceptionMapper.java +++ b/jaxrs/mapping-exceptions/src/main/java/org/javaee7/jaxrs/mapping/exceptions/OrderNotFoundExceptionMapper.java @@ -9,13 +9,13 @@ */ @Provider public class OrderNotFoundExceptionMapper - implements ExceptionMapper { + implements ExceptionMapper { @Override public Response toResponse(OrderNotFoundException exception) { return Response - .status(Response.Status.PRECONDITION_FAILED) - .entity("Response not found") - .build(); + .status(Response.Status.PRECONDITION_FAILED) + .entity("Response not found") + .build(); } } diff --git a/jaxrs/mapping-exceptions/src/test/java/org/javaee7/jaxrs/mapping/exceptions/MyResourceTest.java b/jaxrs/mapping-exceptions/src/test/java/org/javaee7/jaxrs/mapping/exceptions/MyResourceTest.java index 1b6c0f478..a2c28d1f6 100644 --- a/jaxrs/mapping-exceptions/src/test/java/org/javaee7/jaxrs/mapping/exceptions/MyResourceTest.java +++ b/jaxrs/mapping-exceptions/src/test/java/org/javaee7/jaxrs/mapping/exceptions/MyResourceTest.java @@ -30,21 +30,22 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses( - MyApplication.class, MyResource.class, - OrderNotFoundException.class, OrderNotFoundExceptionMapper.class); + return ShrinkWrap.create(WebArchive.class) + .addClasses( + MyApplication.class, MyResource.class, + OrderNotFoundException.class, OrderNotFoundExceptionMapper.class); } + @ArquillianResource private URL base; private WebTarget target; - + @Before public void setUp() throws MalformedURLException { Client client = ClientBuilder.newClient(); target = client - .target(URI.create(new URL(base, "webresources/order").toExternalForm())); + .target(URI.create(new URL(base, "webresources/order").toExternalForm())); } /** @@ -55,7 +56,7 @@ public void testOddOrder() { String response = target.path("1").request().get(String.class); assertEquals("1", response); } - + /** * Test of getOrder method, of class MyResource. */ @@ -68,7 +69,7 @@ public void testEvenOrder() { } catch (Exception e) { fail(e.getMessage()); } - + } - + } diff --git a/jaxrs/moxy/src/main/java/org/javaee7/jaxrs/moxy/TestServlet.java b/jaxrs/moxy/src/main/java/org/javaee7/jaxrs/moxy/TestServlet.java index 52710fcc4..f1ccbb8ad 100644 --- a/jaxrs/moxy/src/main/java/org/javaee7/jaxrs/moxy/TestServlet.java +++ b/jaxrs/moxy/src/main/java/org/javaee7/jaxrs/moxy/TestServlet.java @@ -16,7 +16,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -30,7 +30,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -42,15 +42,15 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re Client client = ClientBuilder.newClient(); WebTarget target = client.target("http://" - + request.getServerName() - + ":" - + request.getServerPort() - + request.getContextPath() - + "/webresources/endpoint"); + + request.getServerName() + + ":" + + request.getServerPort() + + request.getContextPath() + + "/webresources/endpoint"); System.out.println("POST request"); MyObject mo = target - .request() - .post(Entity.entity(new MyObject("Duke", 18), MediaType.APPLICATION_JSON), MyObject.class); + .request() + .post(Entity.entity(new MyObject("Duke", 18), MediaType.APPLICATION_JSON), MyObject.class); out.println("Received response: " + mo.getName() + ", " + mo.getAge() + "

"); out.println("Check server.log for client/server interceptor output."); @@ -70,7 +70,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -85,7 +85,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jaxrs/paramconverter/pom.xml b/jaxrs/paramconverter/pom.xml index 815858725..1d81acd16 100644 --- a/jaxrs/paramconverter/pom.xml +++ b/jaxrs/paramconverter/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - paramconverter + org.javaee7 + jaxrs-paramconverter 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - paramconverter diff --git a/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyBean.java b/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyBean.java index f8928c706..8e3006b09 100644 --- a/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyBean.java +++ b/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyBean.java @@ -5,26 +5,26 @@ * */ public class MyBean { - - private String value; - /** - * @return the value - */ - public String getValue() { - return value; - } + private String value; + + /** + * @return the value + */ + public String getValue() { + return value; + } + + /** + * @param value the value to set + */ + public void setValue(String value) { + this.value = value; + } + + @Override + public String toString() { + return getValue(); + } - /** - * @param value the value to set - */ - public void setValue(String value) { - this.value = value; - } - - @Override - public String toString() { - return getValue(); - } - } diff --git a/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyBeanConverterProvider.java b/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyBeanConverterProvider.java index 82e213b96..451ee67b7 100644 --- a/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyBeanConverterProvider.java +++ b/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyBeanConverterProvider.java @@ -13,28 +13,28 @@ @Provider public class MyBeanConverterProvider implements ParamConverterProvider { - @Override - public ParamConverter getConverter(Class clazz, Type type, Annotation[] annotations) { - if (clazz.getName().equals(MyBean.class.getName())) { - - return new ParamConverter() { - - @SuppressWarnings("unchecked") - @Override - public T fromString(String value) { - MyBean bean = new MyBean(); - bean.setValue(value); - return (T) bean; - } - - @Override - public String toString(T bean) { - return ((MyBean)bean).getValue(); - } - - }; - } - return null; - } + @Override + public ParamConverter getConverter(Class clazz, Type type, Annotation[] annotations) { + if (clazz.getName().equals(MyBean.class.getName())) { + + return new ParamConverter() { + + @SuppressWarnings("unchecked") + @Override + public T fromString(String value) { + MyBean bean = new MyBean(); + bean.setValue(value); + return (T) bean; + } + + @Override + public String toString(T bean) { + return ((MyBean) bean).getValue(); + } + + }; + } + return null; + } } diff --git a/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyConverterProvider.java b/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyConverterProvider.java index 7843a0a58..f2e30ce49 100644 --- a/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyConverterProvider.java +++ b/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyConverterProvider.java @@ -14,29 +14,29 @@ @Provider public class MyConverterProvider implements ParamConverterProvider { - @Override - public ParamConverter getConverter(final Class rawType, final Type genericType, - final Annotation[] annotations) { - if (rawType.getName().equals(MyBean.class.getName())) { - return new ParamConverter() { + @Override + public ParamConverter getConverter(final Class rawType, final Type genericType, + final Annotation[] annotations) { + if (rawType.getName().equals(MyBean.class.getName())) { + return new ParamConverter() { - @Override - public T fromString(String value) { - MyBean myBean = new MyBean(); - myBean.setValue(value); - return rawType.cast(myBean); - } + @Override + public T fromString(String value) { + MyBean myBean = new MyBean(); + myBean.setValue(value); + return rawType.cast(myBean); + } - @Override - public String toString(T myBean) { - if (myBean == null) { - return null; - } - return myBean.toString(); - } - }; - } - return null; - } + @Override + public String toString(T myBean) { + if (myBean == null) { + return null; + } + return myBean.toString(); + } + }; + } + return null; + } } diff --git a/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyResource.java b/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyResource.java index cdb26dd6d..4949972ee 100644 --- a/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyResource.java +++ b/jaxrs/paramconverter/src/main/java/org/javaee7/jaxrs/paramconverter/MyResource.java @@ -20,11 +20,11 @@ public class MyResource { public String getWithQuery(@DefaultValue("bar") @QueryParam("search") MyBean myBean) { return myBean.getValue(); } - + @GET @Path("/{id}") @Produces(MediaType.TEXT_PLAIN) public String getByPath(@PathParam("id") MyBean myBean) { - return myBean.getValue(); + return myBean.getValue(); } } diff --git a/jaxrs/paramconverter/src/test/java/org/javaee7/jaxrs/paramconverter/MyResourceTest.java b/jaxrs/paramconverter/src/test/java/org/javaee7/jaxrs/paramconverter/MyResourceTest.java index 9c5bf56b0..4908af451 100644 --- a/jaxrs/paramconverter/src/test/java/org/javaee7/jaxrs/paramconverter/MyResourceTest.java +++ b/jaxrs/paramconverter/src/test/java/org/javaee7/jaxrs/paramconverter/MyResourceTest.java @@ -28,9 +28,10 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, MyResource.class, MyBeanConverterProvider.class, MyBean.class); + return ShrinkWrap.create(WebArchive.class) + .addClasses(MyApplication.class, MyResource.class, MyBeanConverterProvider.class, MyBean.class); } + private static WebTarget target; @ArquillianResource @@ -50,14 +51,14 @@ public void testRequestWithQueryParam() { @Test public void testRequestWithNoQueryParam() { - String r = target.request().get(String.class); - assertEquals("bar", r); + String r = target.request().get(String.class); + assertEquals("bar", r); } @Test public void testRequestWithPathParam() { - String r = target.path("/foo").request().get(String.class); - assertEquals("foo", r); + String r = target.path("/foo").request().get(String.class); + assertEquals("foo", r); } } diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index e84869882..48bb7b35d 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml @@ -1,18 +1,17 @@ - + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs pom - Java EE 7 JAX-RS Samples + Java EE 7 Sample: jaxrs angularjs @@ -46,6 +45,7 @@ jaxrs-security-declarative db-access + org.javaee7 diff --git a/jaxrs/readerwriter-injection/pom.xml b/jaxrs/readerwriter-injection/pom.xml index 8824cf7b0..c9a2501a3 100644 --- a/jaxrs/readerwriter-injection/pom.xml +++ b/jaxrs/readerwriter-injection/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - readerwriter-injection + jaxrs-readerwriter-injection war + Java EE 7 Sample: jaxrs - readerwriter-injection diff --git a/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/AnotherObject.java b/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/AnotherObject.java index 955fcd5fd..8168832ef 100644 --- a/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/AnotherObject.java +++ b/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/AnotherObject.java @@ -16,5 +16,5 @@ public int getValue() { public void setValue(int value) { this.value = value; } - + } diff --git a/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyReader.java b/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyReader.java index 11c1bfb93..b8cfb7c70 100644 --- a/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyReader.java +++ b/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyReader.java @@ -22,8 +22,9 @@ @Provider @Consumes(MyObject.MIME_TYPE) public class MyReader implements MessageBodyReader { - - @Inject AnotherObject another; + + @Inject + AnotherObject another; @Override public boolean isReadable(Class type, Type type1, Annotation[] antns, MediaType mt) { @@ -33,10 +34,10 @@ public boolean isReadable(Class type, Type type1, Annotation[] antns, MediaTy @Override public MyObject readFrom(Class type, - Type type1, - Annotation[] antns, - MediaType mt, MultivaluedMap mm, - InputStream in) throws IOException, WebApplicationException { + Type type1, + Annotation[] antns, + MediaType mt, MultivaluedMap mm, + InputStream in) throws IOException, WebApplicationException { try { ObjectInputStream ois = new ObjectInputStream(in); MyObject mo = (MyObject) ois.readObject(); diff --git a/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyResource.java b/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyResource.java index 04b521947..20224f08e 100644 --- a/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyResource.java +++ b/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyResource.java @@ -10,15 +10,15 @@ @Path("fruits") public class MyResource { private final String[] RESPONSE = { "apple", "banana", "mango" }; - + @POST @Consumes(MyObject.MIME_TYPE) public String postWithCustomMimeType(MyObject mo) { System.out.println("endpoint invoked (getFruit(" + mo.getIndex() + "))"); - + return RESPONSE[Integer.valueOf(mo.getIndex()) % 3]; } - + @POST @Path("index") @Consumes("text/plain") diff --git a/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyWriter.java b/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyWriter.java index 783270581..3fd19ac0e 100644 --- a/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyWriter.java +++ b/jaxrs/readerwriter-injection/src/main/java/org/javaee7/jaxrs/readerwriter/injection/MyWriter.java @@ -30,18 +30,18 @@ public long getSize(MyObject t, Class type, Type type1, Annotation[] antns, M // value returned by the method is ignored by a JAX-RS runtime. // All MessageBodyWriter implementations are advised to return -1 from // the method. - + return -1; } @Override - public void writeTo(MyObject t, - Class type, - Type type1, - Annotation[] antns, - MediaType mt, - MultivaluedMap mm, - OutputStream out) throws IOException, WebApplicationException { + public void writeTo(MyObject t, + Class type, + Type type1, + Annotation[] antns, + MediaType mt, + MultivaluedMap mm, + OutputStream out) throws IOException, WebApplicationException { ObjectOutputStream oos = new ObjectOutputStream(out); oos.writeObject(t); } diff --git a/jaxrs/readerwriter-injection/src/test/java/org/javaee7/jaxrs/readerwriter/injection/MyResourceTest.java b/jaxrs/readerwriter-injection/src/test/java/org/javaee7/jaxrs/readerwriter/injection/MyResourceTest.java index d16eb8d1f..5b6e4c896 100644 --- a/jaxrs/readerwriter-injection/src/test/java/org/javaee7/jaxrs/readerwriter/injection/MyResourceTest.java +++ b/jaxrs/readerwriter-injection/src/test/java/org/javaee7/jaxrs/readerwriter/injection/MyResourceTest.java @@ -29,7 +29,7 @@ public class MyResourceTest { Client client; WebTarget target; - + @ArquillianResource URL base; @@ -48,14 +48,14 @@ public void tearDown() { @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClasses( - MyApplication.class, - MyResource.class, - MyObject.class, - MyReader.class, - MyWriter.class, - AnotherObject.class); - + .addClasses( + MyApplication.class, + MyResource.class, + MyObject.class, + MyReader.class, + MyWriter.class, + AnotherObject.class); + System.out.println(war.toString(true)); return war; } @@ -63,17 +63,17 @@ public static WebArchive createDeployment() { @Test public void testPostWithCustomMimeTypeAndInjectedBeanInReader() { String fruit = target - .request() - .post(Entity.entity(new MyObject(1), MyObject.MIME_TYPE), String.class); + .request() + .post(Entity.entity(new MyObject(1), MyObject.MIME_TYPE), String.class); assertEquals("mango", fruit); } @Test public void testPostSimple() { String fruit = target - .path("index") - .request() - .post(Entity.text("1"), String.class); + .path("index") + .request() + .post(Entity.text("1"), String.class); assertEquals("banana", fruit); } diff --git a/jaxrs/readerwriter-json/pom.xml b/jaxrs/readerwriter-json/pom.xml index 5eaffc369..41b96f7d1 100644 --- a/jaxrs/readerwriter-json/pom.xml +++ b/jaxrs/readerwriter-json/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - readerwriter-json + org.javaee7 + jaxrs-readerwriter-json 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - readerwriter-json diff --git a/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/MyReader.java b/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/MyReader.java index 8d49cb964..c81a87c1d 100644 --- a/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/MyReader.java +++ b/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/MyReader.java @@ -27,10 +27,10 @@ public boolean isReadable(Class type, Type type1, Annotation[] antns, MediaTy @Override public MyObject readFrom(Class type, - Type type1, - Annotation[] antns, - MediaType mt, MultivaluedMap mm, - InputStream in) throws IOException, WebApplicationException { + Type type1, + Annotation[] antns, + MediaType mt, MultivaluedMap mm, + InputStream in) throws IOException, WebApplicationException { MyObject mo = new MyObject(); JsonParser parser = Json.createParser(in); while (parser.hasNext()) { diff --git a/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/MyWriter.java b/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/MyWriter.java index b16add124..c1dad6d90 100644 --- a/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/MyWriter.java +++ b/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/MyWriter.java @@ -31,23 +31,23 @@ public long getSize(MyObject t, Class type, Type type1, Annotation[] antns, M // value returned by the method is ignored by a JAX-RS runtime. // All MessageBodyWriter implementations are advised to return -1 from // the method. - + return -1; } @Override - public void writeTo(MyObject t, - Class type, - Type type1, - Annotation[] antns, - MediaType mt, - MultivaluedMap mm, - OutputStream out) throws IOException, WebApplicationException { + public void writeTo(MyObject t, + Class type, + Type type1, + Annotation[] antns, + MediaType mt, + MultivaluedMap mm, + OutputStream out) throws IOException, WebApplicationException { JsonGenerator gen = Json.createGenerator(out); gen.writeStartObject() - .write("name", t.getName()) - .write("age", t.getAge()) - .writeEnd(); + .write("name", t.getName()) + .write("age", t.getAge()) + .writeEnd(); gen.flush(); } } diff --git a/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/TestServlet.java b/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/TestServlet.java index fa19f9d29..947e630fe 100644 --- a/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/TestServlet.java +++ b/jaxrs/readerwriter-json/src/main/java/org/javaee7/jaxrs/readerwriter/json/TestServlet.java @@ -16,7 +16,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -30,7 +30,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -41,19 +41,19 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println("

JAX-RS Reader/Writer w/ JSON

"); Client client = ClientBuilder.newClient(); client - .register(MyReader.class) - .register(MyWriter.class); + .register(MyReader.class) + .register(MyWriter.class); WebTarget target = client.target("http://" - + request.getServerName() - + ":" - + request.getServerPort() - + request.getContextPath() - + "/webresources/endpoint"); + + request.getServerName() + + ":" + + request.getServerPort() + + request.getContextPath() + + "/webresources/endpoint"); out.println("POST request"); MyObject mo = target - .request() - .post(Entity.entity(new MyObject("Duke", 18), MediaType.APPLICATION_JSON), MyObject.class); + .request() + .post(Entity.entity(new MyObject("Duke", 18), MediaType.APPLICATION_JSON), MyObject.class); out.println("Received response: " + mo.getName() + ", " + mo.getAge() + "

"); out.println("Message exchanged using application/json type."); out.println(""); @@ -72,7 +72,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -87,7 +87,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jaxrs/readerwriter/pom.xml b/jaxrs/readerwriter/pom.xml index ff89da673..fae49c86b 100644 --- a/jaxrs/readerwriter/pom.xml +++ b/jaxrs/readerwriter/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - readerwriter + jaxrs-readerwriter war + Java EE 7 Sample: jaxrs - readerwriter diff --git a/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyReader.java b/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyReader.java index 2ae94959b..b9f6054f2 100644 --- a/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyReader.java +++ b/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyReader.java @@ -27,14 +27,14 @@ public boolean isReadable(Class type, Type type1, Annotation[] antns, MediaTy } @Override - public MyObject readFrom(Class type, - Type type1, - Annotation[] antns, - MediaType mt, MultivaluedMap mm, - InputStream in) throws IOException, WebApplicationException { + public MyObject readFrom(Class type, + Type type1, + Annotation[] antns, + MediaType mt, MultivaluedMap mm, + InputStream in) throws IOException, WebApplicationException { try { ObjectInputStream ois = new ObjectInputStream(in); - return (MyObject)ois.readObject(); + return (MyObject) ois.readObject(); } catch (ClassNotFoundException ex) { Logger.getLogger(MyReader.class.getName()).log(Level.SEVERE, null, ex); } diff --git a/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyResource.java b/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyResource.java index 78d7e32bd..51539d83c 100644 --- a/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyResource.java +++ b/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyResource.java @@ -10,15 +10,15 @@ @Path("fruits") public class MyResource { private final String[] response = { "apple", "banana", "mango" }; - + @POST @Consumes(MyObject.MIME_TYPE) public String postWithCustomMimeType(MyObject mo) { System.out.println("endpoint invoked (getFruit(" + mo.getIndex() + "))"); - + return response[Integer.valueOf(mo.getIndex()) % 3]; } - + @POST @Path("index") @Consumes("text/plain") diff --git a/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyWriter.java b/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyWriter.java index e04d15add..85b46bb66 100644 --- a/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyWriter.java +++ b/jaxrs/readerwriter/src/main/java/org/javaee7/jaxrs/readerwriter/MyWriter.java @@ -30,18 +30,18 @@ public long getSize(MyObject t, Class type, Type type1, Annotation[] antns, M // value returned by the method is ignored by a JAX-RS runtime. // All MessageBodyWriter implementations are advised to return -1 from // the method. - + return -1; } @Override - public void writeTo(MyObject t, - Class type, - Type type1, - Annotation[] antns, - MediaType mt, - MultivaluedMap mm, - OutputStream out) throws IOException, WebApplicationException { + public void writeTo(MyObject t, + Class type, + Type type1, + Annotation[] antns, + MediaType mt, + MultivaluedMap mm, + OutputStream out) throws IOException, WebApplicationException { ObjectOutputStream oos = new ObjectOutputStream(out); oos.writeObject(t); } diff --git a/jaxrs/readerwriter/src/test/java/org/javaee7/jaxrs/readerwriter/MyResourceTest.java b/jaxrs/readerwriter/src/test/java/org/javaee7/jaxrs/readerwriter/MyResourceTest.java index 91c31af7d..65731b68f 100644 --- a/jaxrs/readerwriter/src/test/java/org/javaee7/jaxrs/readerwriter/MyResourceTest.java +++ b/jaxrs/readerwriter/src/test/java/org/javaee7/jaxrs/readerwriter/MyResourceTest.java @@ -30,7 +30,7 @@ public class MyResourceTest { Client client; WebTarget target; - + @ArquillianResource URL base; @@ -49,13 +49,13 @@ public void tearDown() { @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClasses( - MyApplication.class, - MyResource.class, - MyObject.class, - MyReader.class, - MyWriter.class); - + .addClasses( + MyApplication.class, + MyResource.class, + MyObject.class, + MyReader.class, + MyWriter.class); + System.out.println(war.toString(true)); return war; } @@ -66,8 +66,8 @@ public static WebArchive createDeployment() { @Test public void testPostWithCustomMimeType() { String fruit = target - .request() - .post(Entity.entity(new MyObject(1), MyObject.MIME_TYPE), String.class); + .request() + .post(Entity.entity(new MyObject(1), MyObject.MIME_TYPE), String.class); assertEquals("banana", fruit); } @@ -77,9 +77,9 @@ public void testPostWithCustomMimeType() { @Test public void testPostSimple() { String fruit = target - .path("index") - .request() - .post(Entity.text("1"), String.class); + .path("index") + .request() + .post(Entity.text("1"), String.class); assertEquals("banana", fruit); } diff --git a/jaxrs/request-binding/pom.xml b/jaxrs/request-binding/pom.xml index c575ffd22..fb5b2c4e5 100644 --- a/jaxrs/request-binding/pom.xml +++ b/jaxrs/request-binding/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - request-binding + org.javaee7 + jaxrs-request-binding 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - request-binding diff --git a/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/MyApplication.java b/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/MyApplication.java index 56ca84416..59bf4ed9b 100644 --- a/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/MyApplication.java +++ b/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/MyApplication.java @@ -16,5 +16,5 @@ public Set> getClasses() { resources.add(MyResource.class); return resources; } - + } diff --git a/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/MyResource.java b/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/MyResource.java index d13e8cc72..2e859f125 100644 --- a/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/MyResource.java +++ b/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/MyResource.java @@ -20,23 +20,29 @@ @Path("persons") public class MyResource { - @Context Application app; - @Context UriInfo uri; - @Context HttpHeaders headers; - @Context Request request; - @Context SecurityContext security; - @Context Providers providers; + @Context + Application app; + @Context + UriInfo uri; + @Context + HttpHeaders headers; + @Context + Request request; + @Context + SecurityContext security; + @Context + Providers providers; @GET @Produces("text/plain") public String getList(@CookieParam("JSESSIONID") String sessionId, - @HeaderParam("Accept") String acceptHeader) { + @HeaderParam("Accept") String acceptHeader) { StringBuilder builder = new StringBuilder(); builder - .append("JSESSIONID: ") - .append(sessionId) - .append("
Accept: ") - .append(acceptHeader); + .append("JSESSIONID: ") + .append(sessionId) + .append("
Accept: ") + .append(acceptHeader); return builder.toString(); } @@ -46,34 +52,34 @@ public String getList(@CookieParam("JSESSIONID") String sessionId, public String getList(@MatrixParam("start") int start, @MatrixParam("end") int end) { StringBuilder builder = new StringBuilder(); builder - .append("start: ") - .append(start) - .append("
end: ") - .append(end); + .append("start: ") + .append(start) + .append("
end: ") + .append(end); return builder.toString(); } - + @GET @Path("context") @Produces("text/plain") public String getList() { StringBuilder builder = new StringBuilder(); builder.append("Application.classes: ") - .append(app.getClasses()) - .append("
Path: ") - .append(uri.getPath()); + .append(app.getClasses()) + .append("
Path: ") + .append(uri.getPath()); for (String header : headers.getRequestHeaders().keySet()) { builder - .append("
Http header: ") - .append(headers.getRequestHeader(header)); + .append("
Http header: ") + .append(headers.getRequestHeader(header)); } builder.append("
Headers.cookies: ") - .append(headers.getCookies()) - .append("
Request.method: ") - .append(request.getMethod()) - .append("
Security.isSecure: ") - .append(security.isSecure()); + .append(headers.getCookies()) + .append("
Request.method: ") + .append(request.getMethod()) + .append("
Security.isSecure: ") + .append(security.isSecure()); return builder.toString(); } - + } diff --git a/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/TestServlet.java b/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/TestServlet.java index bf98a6b8c..8e461fd18 100644 --- a/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/TestServlet.java +++ b/jaxrs/request-binding/src/main/java/org/javaee7/jaxrs/request/binding/TestServlet.java @@ -14,7 +14,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -28,7 +28,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -39,24 +39,24 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println("

Request Binding

"); Client client = ClientBuilder.newClient(); WebTarget target = client.target("http://" - + request.getServerName() - + ":" - + request.getServerPort() - + request.getContextPath() - + "/webresources/persons"); + + request.getServerName() + + ":" + + request.getServerPort() + + request.getContextPath() + + "/webresources/persons"); out.print("GETTing @CookieParam ...
"); out.print(target.request().get(String.class)); - + out.print("

GETTing @MatrixParam ...
"); out.print(target.path("matrix") - .matrixParam("start", "5") - .matrixParam("end", "10") - .request().get(String.class)); - + .matrixParam("start", "5") + .matrixParam("end", "10") + .request().get(String.class)); + out.print("

GETTing @Context ...
"); out.print(target.path("context").request().get(String.class)); - + out.println("
... done.
"); out.println(""); @@ -75,7 +75,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -90,7 +90,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jaxrs/resource-validation/pom.xml b/jaxrs/resource-validation/pom.xml index 9cb1d27d4..e4dd5de35 100644 --- a/jaxrs/resource-validation/pom.xml +++ b/jaxrs/resource-validation/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxrs - resource-validation + org.javaee7 + jaxrs-resource-validation 1.0-SNAPSHOT war + Java EE 7 Sample: jaxrs - resource-validation diff --git a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Email.java b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Email.java index 1d61da705..b788f6060 100644 --- a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Email.java +++ b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Email.java @@ -14,11 +14,11 @@ * @author Arun Gupta */ @Documented -@Target({ElementType.ANNOTATION_TYPE, +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, - ElementType.PARAMETER}) + ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) @Constraint(validatedBy = EmailValidator.class) @Size(min = 5, message = "{org.javaee7.jaxrs.resource_validation.min_size}") diff --git a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/EmailValidator.java b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/EmailValidator.java index d6bb04d89..410c02ee4 100644 --- a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/EmailValidator.java +++ b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/EmailValidator.java @@ -7,13 +7,13 @@ * @author Arun Gupta */ public class EmailValidator - implements ConstraintValidator { + implements ConstraintValidator { @Override public void initialize(Email constraintAnnotation) { System.out.println("EmailValidator.initialize"); } - + @Override public boolean isValid(String value, ConstraintValidatorContext context) { System.out.println("EmailValidator.isValid: " + value); diff --git a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Name.java b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Name.java index 5a3f0909b..3bf442487 100644 --- a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Name.java +++ b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/Name.java @@ -1,45 +1,45 @@ -package org.javaee7.jaxrs.resource.validation; - -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * @author Arun Gupta - */ -@XmlRootElement -public class Name { - - @NotNull - @Size(min = 1) - private String firstName; - - @NotNull - @Size(min = 1) - private String lastName; - - @Email - private String email; - - public Name() { - } - - public Name(String firstName, String lastName, String email) { - this.firstName = firstName; - this.lastName = lastName; - this.email = email; - } - - public String getFirstName() { - return firstName; - } - - public String getLastName() { - return lastName; - } - - public String getEmail() { - return email; - } - -} +package org.javaee7.jaxrs.resource.validation; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * @author Arun Gupta + */ +@XmlRootElement +public class Name { + + @NotNull + @Size(min = 1) + private String firstName; + + @NotNull + @Size(min = 1) + private String lastName; + + @Email + private String email; + + public Name() { + } + + public Name(String firstName, String lastName, String email) { + this.firstName = firstName; + this.lastName = lastName; + this.email = email; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public String getEmail() { + return email; + } + +} diff --git a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource1.java b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource1.java index 4e000df38..77c558503 100644 --- a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource1.java +++ b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource1.java @@ -17,12 +17,12 @@ public class NameResource1 { @Size(min = 1) @FormParam("firstName") private String firstName; - + @NotNull @Size(min = 1) @FormParam("lastName") private String lastName; - + private String email; @FormParam("email") @@ -30,15 +30,15 @@ public void setEmail(@Email String email) { this.email = email; } -// @Email + // @Email public String getEmail() { return email; } - + @POST @Consumes("application/x-www-form-urlencoded") public String registerUser() { return firstName + " " + lastName + " with email " + email + " registered"; } - + } diff --git a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource2.java b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource2.java index c520a4ccb..6274d029d 100644 --- a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource2.java +++ b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource2.java @@ -15,8 +15,8 @@ public class NameResource2 { @POST @Consumes("application/x-www-form-urlencoded") public String registerUser(@NotNull @FormParam("firstName") String firstName, - @NotNull @FormParam("lastName") String lastName, - @Email @FormParam("email") String email) { + @NotNull @FormParam("lastName") String lastName, + @Email @FormParam("email") String email) { return firstName + " " + lastName + " with email " + email + " registered"; } diff --git a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource3.java b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource3.java index e5019cb8d..1fbdb42ce 100644 --- a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource3.java +++ b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NameResource3.java @@ -14,10 +14,10 @@ public class NameResource3 { @FormParam("firstName") private String firstName; - + @FormParam("lastName") private String lastName; - + private String email; @FormParam("email") @@ -25,15 +25,15 @@ public void setEmail(@Email String email) { this.email = email; } -// @Email + // @Email public String getEmail() { return email; } - + @POST @Consumes("application/x-www-form-urlencoded") public String registerUser() { return firstName + " " + lastName + " with email " + email + " registered"; } - + } diff --git a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NotNullAndNonEmptyNames.java b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NotNullAndNonEmptyNames.java index 67620c0f6..aa9af7dbb 100644 --- a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NotNullAndNonEmptyNames.java +++ b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/NotNullAndNonEmptyNames.java @@ -14,8 +14,8 @@ * @author Arun Gupta */ @Documented -@Target({ElementType.ANNOTATION_TYPE, - ElementType.TYPE}) +@Target({ ElementType.ANNOTATION_TYPE, + ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) @Constraint(validatedBy = EmailValidator.class) @Size(min = 1, message = "{org.javaee7.jaxrs.resource_validation.min_size}") diff --git a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/TestServlet.java b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/TestServlet.java index e3523e165..aaa1837c8 100644 --- a/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/TestServlet.java +++ b/jaxrs/resource-validation/src/main/java/org/javaee7/jaxrs/resource/validation/TestServlet.java @@ -19,7 +19,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { /** @@ -32,7 +32,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -45,7 +45,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re List targets = new ArrayList<>(); for (int i = 0; i < 3; i++) { targets.add(client - .target("http://" + .target("http://" + request.getServerName() + ":" + request.getServerPort() @@ -91,7 +91,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re } WebTarget target = client - .target("http://" + .target("http://" + request.getServerName() + ":" + request.getServerPort() @@ -100,26 +100,26 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println("

Using target: " + target.getUri() + "

"); out.print("

POSTing using @Valid (all vaild data) ...
"); Response r = target - .request() - .post(Entity.json(new Name("Sheldon", "Cooper", "sheldon@cooper.com"))); + .request() + .post(Entity.json(new Name("Sheldon", "Cooper", "sheldon@cooper.com"))); printResponseStatus(out, r, 200); out.print("

POSTing using @Valid, with invalid (null) \"firstName\" ...
"); r = target - .request() - .post(Entity.json(new Name(null, "Cooper", "sheldon@cooper.com"))); + .request() + .post(Entity.json(new Name(null, "Cooper", "sheldon@cooper.com"))); printResponseStatus(out, r, 400); out.print("

POSTing using @Valid, with invalid (null) \"lastName\" ...
"); r = target - .request() - .post(Entity.json(new Name("Sheldon", null, "sheldon@cooper.com"))); + .request() + .post(Entity.json(new Name("Sheldon", null, "sheldon@cooper.com"))); printResponseStatus(out, r, 400); out.print("

POSTing using @Valid, with invalid (missing @) email \"email\" ...
"); r = target - .request() - .post(Entity.json(new Name("Sheldon", "Cooper", "sheldoncooper.com"))); + .request() + .post(Entity.json(new Name("Sheldon", "Cooper", "sheldoncooper.com"))); printResponseStatus(out, r, 400); out.println("
... done.
"); @@ -144,7 +144,7 @@ private void printResponseStatus(PrintWriter out, Response r, int expected) { */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -158,7 +158,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jaxrs/resource-validation/src/test/java/org/javaee7/jaxrs/resource/validation/NameAddResourceTest.java b/jaxrs/resource-validation/src/test/java/org/javaee7/jaxrs/resource/validation/NameAddResourceTest.java index 696f244a2..280eaa747 100644 --- a/jaxrs/resource-validation/src/test/java/org/javaee7/jaxrs/resource/validation/NameAddResourceTest.java +++ b/jaxrs/resource-validation/src/test/java/org/javaee7/jaxrs/resource/validation/NameAddResourceTest.java @@ -1,148 +1,148 @@ -package org.javaee7.jaxrs.resource.validation; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import java.net.URI; -import java.net.URL; - -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.OK; -import static org.junit.Assert.assertEquals; - -@RunWith(Arquillian.class) -public class NameAddResourceTest { - - @ArquillianResource - private URL base; - private WebTarget target; - - @Deployment(testable = false) - public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, NameAddResource.class, Name.class, Email.class, EmailValidator.class); - } - - @Before - public void setUp() throws Exception { - Client client = ClientBuilder.newClient(); - String resourcePath = MyApplication.PATH + NameAddResource.PATH; - URI resourceUri = new URL(base, resourcePath).toURI(); - target = client.target(resourceUri); - } - - @Test - public void shouldPassNameValidation() throws Exception { - JsonObject name = startValidName() - .build(); - - Response response = postName(name); - - assertStatus(response, OK); - } - - private JsonObjectBuilder startValidName() { - return Json.createObjectBuilder() - .add("firstName", "Sheldon") - .add("lastName", "Cooper") - .add("email", "random@example.com"); - } - - private Response postName(JsonObject name) { - Entity nameEntity = Entity.json(name); - return target - .request() - .post(nameEntity); - } - - private void assertStatus(Response response, Status expectedStatus) { - Response.StatusType actualStatus = response.getStatusInfo(); - assertEquals(actualStatus, expectedStatus); - } - - @Test - public void shouldFailAtFirstNameSizeValidation() throws Exception { - JsonObject name = startValidName() - .add("firstName", "") - .build(); - - Response response = postName(name); - - assertFailedValidation(response); - } - - private void assertFailedValidation(Response response) { - assertStatus(response, BAD_REQUEST); - } - - @Test - public void shouldFailAtFirstNameNullValidation() throws Exception { - JsonObject name = startValidName() - .addNull("firstName") - .build(); - - Response response = postName(name); - - assertFailedValidation(response); - } - - @Test - public void shouldFailAtLastNameSizeValidation() throws Exception { - JsonObject name = startValidName() - .add("lastName", "") - .build(); - - Response response = postName(name); - - assertFailedValidation(response); - } - - @Test - public void shouldFailAtLastNameNullValidation() throws Exception { - JsonObject name = startValidName() - .addNull("lastName") - .build(); - - Response response = postName(name); - - assertFailedValidation(response); - } - - @Test - public void shouldFailAtEmailAtSymbolValidation() throws Exception { - JsonObject name = startValidName() - .add("email", "missing-at-symbol.com") - .build(); - - Response response = postName(name); - - assertFailedValidation(response); - } - - @Test - public void shouldFailAtEmailComDomainValidation() throws Exception { - JsonObject name = startValidName() - .add("email", "other-than-com@domain.pl") - .build(); - - Response response = postName(name); - - assertFailedValidation(response); - } - -} +package org.javaee7.jaxrs.resource.validation; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.json.Json; +import javax.json.JsonObject; +import javax.json.JsonObjectBuilder; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import java.net.URI; +import java.net.URL; + +import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static javax.ws.rs.core.Response.Status.OK; +import static org.junit.Assert.assertEquals; + +@RunWith(Arquillian.class) +public class NameAddResourceTest { + + @ArquillianResource + private URL base; + private WebTarget target; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + return ShrinkWrap.create(WebArchive.class) + .addClasses(MyApplication.class, NameAddResource.class, Name.class, Email.class, EmailValidator.class); + } + + @Before + public void setUp() throws Exception { + Client client = ClientBuilder.newClient(); + String resourcePath = MyApplication.PATH + NameAddResource.PATH; + URI resourceUri = new URL(base, resourcePath).toURI(); + target = client.target(resourceUri); + } + + @Test + public void shouldPassNameValidation() throws Exception { + JsonObject name = startValidName() + .build(); + + Response response = postName(name); + + assertStatus(response, OK); + } + + private JsonObjectBuilder startValidName() { + return Json.createObjectBuilder() + .add("firstName", "Sheldon") + .add("lastName", "Cooper") + .add("email", "random@example.com"); + } + + private Response postName(JsonObject name) { + Entity nameEntity = Entity.json(name); + return target + .request() + .post(nameEntity); + } + + private void assertStatus(Response response, Status expectedStatus) { + Response.StatusType actualStatus = response.getStatusInfo(); + assertEquals(actualStatus, expectedStatus); + } + + @Test + public void shouldFailAtFirstNameSizeValidation() throws Exception { + JsonObject name = startValidName() + .add("firstName", "") + .build(); + + Response response = postName(name); + + assertFailedValidation(response); + } + + private void assertFailedValidation(Response response) { + assertStatus(response, BAD_REQUEST); + } + + @Test + public void shouldFailAtFirstNameNullValidation() throws Exception { + JsonObject name = startValidName() + .addNull("firstName") + .build(); + + Response response = postName(name); + + assertFailedValidation(response); + } + + @Test + public void shouldFailAtLastNameSizeValidation() throws Exception { + JsonObject name = startValidName() + .add("lastName", "") + .build(); + + Response response = postName(name); + + assertFailedValidation(response); + } + + @Test + public void shouldFailAtLastNameNullValidation() throws Exception { + JsonObject name = startValidName() + .addNull("lastName") + .build(); + + Response response = postName(name); + + assertFailedValidation(response); + } + + @Test + public void shouldFailAtEmailAtSymbolValidation() throws Exception { + JsonObject name = startValidName() + .add("email", "missing-at-symbol.com") + .build(); + + Response response = postName(name); + + assertFailedValidation(response); + } + + @Test + public void shouldFailAtEmailComDomainValidation() throws Exception { + JsonObject name = startValidName() + .add("email", "other-than-com@domain.pl") + .build(); + + Response response = postName(name); + + assertFailedValidation(response); + } + +} diff --git a/jaxrs/server-negotiation/pom.xml b/jaxrs/server-negotiation/pom.xml index 1cdd637a1..788e4f328 100644 --- a/jaxrs/server-negotiation/pom.xml +++ b/jaxrs/server-negotiation/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jaxrs - jaxrs-samples + org.javaee7 + jaxrs 1.0-SNAPSHOT ../pom.xml - - server-negotiation + jaxrs-server-negotiation war + Java EE 7 Sample: jaxrs - server-negotiation diff --git a/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/MyApplication.java b/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/MyApplication.java index 2849ca5e2..e4f840936 100644 --- a/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/MyApplication.java +++ b/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/MyApplication.java @@ -16,5 +16,5 @@ public Set> getClasses() { resources.add(MyResource.class); return resources; } - + } diff --git a/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/MyResource.java b/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/MyResource.java index 3fcb55875..31e6a4725 100644 --- a/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/MyResource.java +++ b/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/MyResource.java @@ -12,14 +12,15 @@ @Path("persons") public class MyResource { @GET - @Produces({"application/xml; qs=0.75", "application/json; qs=1.0"}) -// @Produces({"application/xml", "application/json"}) - public List getList() { + @Produces({ "application/xml; qs=0.75", "application/json; qs=1.0" }) + // @Produces({"application/xml", "application/json"}) + public + List getList() { People list = new People(); list.add(new Person("Penny", 1)); list.add(new Person("Leonard", 2)); list.add(new Person("Sheldon", 3)); - + return list; } } diff --git a/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/People.java b/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/People.java index ca87e5bd6..279dfc7af 100644 --- a/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/People.java +++ b/jaxrs/server-negotiation/src/main/java/org/javaee7/jaxrs/server/negotiation/People.java @@ -6,13 +6,13 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -@XmlRootElement +@XmlRootElement public class People extends ArrayList { - private static final long serialVersionUID = 1L; - - @XmlElement(name = "person") - public List getPeople() { - return this; - } + private static final long serialVersionUID = 1L; + + @XmlElement(name = "person") + public List getPeople() { + return this; + } } diff --git a/jaxrs/server-negotiation/src/test/java/org/javaee7/jaxrs/server/negotiation/MyResourceTest.java b/jaxrs/server-negotiation/src/test/java/org/javaee7/jaxrs/server/negotiation/MyResourceTest.java index ee966e738..258990dac 100644 --- a/jaxrs/server-negotiation/src/test/java/org/javaee7/jaxrs/server/negotiation/MyResourceTest.java +++ b/jaxrs/server-negotiation/src/test/java/org/javaee7/jaxrs/server/negotiation/MyResourceTest.java @@ -31,8 +31,8 @@ public class MyResourceTest { @Deployment(testable = false) public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class) - .addClasses(MyApplication.class, MyResource.class, People.class, Person.class); + return ShrinkWrap.create(WebArchive.class) + .addClasses(MyApplication.class, MyResource.class, People.class, Person.class); } @ArquillianResource @@ -49,24 +49,25 @@ public void setUp() throws MalformedURLException { @Test public void testJson() throws JSONException { String response = target.request().accept("application/*").get(String.class); - JSONAssert.assertEquals("[{\"name\":\"Penny\",\"age\":1},{\"name\":\"Leonard\",\"age\":2},{\"name\":\"Sheldon\",\"age\":3}]", - response, - JSONCompareMode.STRICT); + JSONAssert.assertEquals("[{\"name\":\"Penny\",\"age\":1},{\"name\":\"Leonard\",\"age\":2},{\"name\":\"Sheldon\",\"age\":3}]", + response, + JSONCompareMode.STRICT); } - + @Test public void testJson2() throws JSONException { String response = target.request().get(String.class); - JSONAssert.assertEquals("[{\"name\":\"Penny\",\"age\":1},{\"name\":\"Leonard\",\"age\":2},{\"name\":\"Sheldon\",\"age\":3}]", - response, - JSONCompareMode.STRICT); + JSONAssert.assertEquals("[{\"name\":\"Penny\",\"age\":1},{\"name\":\"Leonard\",\"age\":2},{\"name\":\"Sheldon\",\"age\":3}]", + response, + JSONCompareMode.STRICT); } - + @Test public void testXml() throws JSONException, SAXException, IOException { String response = target.request().accept("application/xml").get(String.class); - XMLAssert.assertXMLEqual("1Penny2Leonard3Sheldon", - response); + XMLAssert.assertXMLEqual( + "1Penny2Leonard3Sheldon", + response); } - + } diff --git a/jaxrs/singleton/pom.xml b/jaxrs/singleton/pom.xml index e11c5a51f..ce4cc64b8 100644 --- a/jaxrs/singleton/pom.xml +++ b/jaxrs/singleton/pom.xml @@ -1,14 +1,14 @@ - - - 4.0.0 - - jaxrs-samples - org.javaee7.jaxrs - 1.0-SNAPSHOT - ../pom.xml - - - singleton - war - singleton - + + + 4.0.0 + + + jaxrs + org.javaee7 + 1.0-SNAPSHOT + ../pom.xml + + jaxrs-singleton + war + Java EE 7 Sample: jaxrs - singleton + diff --git a/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResource.java b/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResource.java index 04ae18f52..2ca993547 100644 --- a/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResource.java +++ b/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResource.java @@ -22,7 +22,7 @@ public class AnnotatedSingletonResource { // Ideally this state should be stored in a database // But this is a singleton resource and so state can be saved here too private List strings; - + public AnnotatedSingletonResource() { strings = new ArrayList<>(); } @@ -32,11 +32,11 @@ public AnnotatedSingletonResource() { public String getAll() { return strings.toString(); } - + @GET @Produces(MediaType.TEXT_PLAIN) @Path("{id}") - public String getString(@PathParam("id")int id) { + public String getString(@PathParam("id") int id) { return strings.get(id); } diff --git a/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResource.java b/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResource.java index 32f226d7f..2773744ed 100644 --- a/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResource.java +++ b/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResource.java @@ -13,7 +13,7 @@ public class ApplicationSingletonResource { // Ideally this state should be stored in a database // But this is a singleton resource and so state can be saved here too private List strings; - + public ApplicationSingletonResource() { strings = new ArrayList<>(); } @@ -23,11 +23,11 @@ public ApplicationSingletonResource() { public String getAll() { return strings.toString(); } - + @GET @Produces(MediaType.TEXT_PLAIN) @Path("{id}") - public String getString(@PathParam("id")int id) { + public String getString(@PathParam("id") int id) { return strings.get(id); } diff --git a/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyAnnotatedApplication.java b/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyAnnotatedApplication.java index 187a23404..2d2941ce1 100644 --- a/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyAnnotatedApplication.java +++ b/jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyAnnotatedApplication.java @@ -7,4 +7,5 @@ * @author Arun Gupta */ @ApplicationPath("webresources") -public class MyAnnotatedApplication extends Application {} +public class MyAnnotatedApplication extends Application { +} diff --git a/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java b/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java index 01ae70985..5fe73a1c4 100644 --- a/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java +++ b/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java @@ -47,9 +47,9 @@ public void tearDown() { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses( - MyAnnotatedApplication.class, - AnnotatedSingletonResource.class); + .addClasses( + MyAnnotatedApplication.class, + AnnotatedSingletonResource.class); } @Test diff --git a/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResourceTest.java b/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResourceTest.java index ee56075b0..327db8806 100644 --- a/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResourceTest.java +++ b/jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResourceTest.java @@ -47,9 +47,9 @@ public void tearDown() { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses( - MyApplication.class, - ApplicationSingletonResource.class); + .addClasses( + MyApplication.class, + ApplicationSingletonResource.class); } @Test diff --git a/jaxws/README.md b/jaxws/README.md new file mode 100644 index 000000000..e2744c6b7 --- /dev/null +++ b/jaxws/README.md @@ -0,0 +1,14 @@ +# Java EE 7 Samples: JAX-WS 2.2# + +The [JSR 224](https://jcp.org/en/jsr/detail?id=224) specification is the next generation web services API replacing JAX-RPC 1.0. + +## Samples ## + + - jaxws-endpoint + - jaxws-client + +## How to run + +More information on how to run can be found at: + + diff --git a/jaxws/jaxws-client/pom.xml b/jaxws/jaxws-client/pom.xml index bbdbbc5f8..8865e592b 100644 --- a/jaxws/jaxws-client/pom.xml +++ b/jaxws/jaxws-client/pom.xml @@ -1,14 +1,17 @@ - + + 4.0.0 + - org.javaee7.jaxws - jaxws-samples + org.javaee7 + jaxws 1.0-SNAPSHOT ../pom.xml - jaxws-client + jaxws-jaxws-client war + Java EE 7 Sample: jaxws - jaxws-client + jaxws-client diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/AddAppendix.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/AddAppendix.java new file mode 100644 index 000000000..ced1b707e --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/AddAppendix.java @@ -0,0 +1,77 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for addAppendix complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="addAppendix">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="arg0" type="{http://endpoint.jaxws.javaee7.org/}eBook" minOccurs="0"/>
+ *         <element name="arg1" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addAppendix", propOrder = { + "arg0", + "arg1" +}) +public class AddAppendix { + + protected EBook arg0; + protected int arg1; + + /** + * Gets the value of the arg0 property. + * + * @return + * possible object is + * {@link EBook } + * + */ + public EBook getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + * @param value + * allowed object is + * {@link EBook } + * + */ + public void setArg0(EBook value) { + this.arg0 = value; + } + + /** + * Gets the value of the arg1 property. + * + */ + public int getArg1() { + return arg1; + } + + /** + * Sets the value of the arg1 property. + * + */ + public void setArg1(int value) { + this.arg1 = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/AddAppendixResponse.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/AddAppendixResponse.java new file mode 100644 index 000000000..c57f1cbd2 --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/AddAppendixResponse.java @@ -0,0 +1,60 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for addAppendixResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="addAppendixResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://endpoint.jaxws.javaee7.org/}eBook" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "addAppendixResponse", propOrder = { + "_return" +}) +public class AddAppendixResponse { + + @XmlElement(name = "return") + protected EBook _return; + + /** + * Gets the value of the return property. + * + * @return + * possible object is + * {@link EBook } + * + */ + public EBook getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + * @param value + * allowed object is + * {@link EBook } + * + */ + public void setReturn(EBook value) { + this._return = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBook.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBook.java new file mode 100644 index 000000000..77a3d0314 --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBook.java @@ -0,0 +1,132 @@ +package org.javaee7.jaxws.client.gen; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for eBook complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="eBook">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="notes" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="numPages" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ *         <element name="price" type="{http://www.w3.org/2001/XMLSchema}double"/>
+ *         <element name="title" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "eBook", propOrder = { + "notes", + "numPages", + "price", + "title" +}) +public class EBook { + + @XmlElement(nillable = true) + protected List notes; + protected int numPages; + protected double price; + protected String title; + + /** + * Gets the value of the notes property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the notes property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getNotes().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getNotes() { + if (notes == null) { + notes = new ArrayList(); + } + return this.notes; + } + + /** + * Gets the value of the numPages property. + * + */ + public int getNumPages() { + return numPages; + } + + /** + * Sets the value of the numPages property. + * + */ + public void setNumPages(int value) { + this.numPages = value; + } + + /** + * Gets the value of the price property. + * + */ + public double getPrice() { + return price; + } + + /** + * Sets the value of the price property. + * + */ + public void setPrice(double value) { + this.price = value; + } + + /** + * Gets the value of the title property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTitle() { + return title; + } + + /** + * Sets the value of the title property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTitle(String value) { + this.title = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBookStore.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBookStore.java new file mode 100644 index 000000000..125017ea7 --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBookStore.java @@ -0,0 +1,89 @@ +package org.javaee7.jaxws.client.gen; + +import java.util.List; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.5-b03- + * Generated source version: 2.1 + * + */ +@WebService(name = "EBookStore", targetNamespace = "http://endpoint.jaxws.javaee7.org/") +@XmlSeeAlso({ + ObjectFactory.class +}) +public interface EBookStore { + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "welcomeMessage", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.WelcomeMessage") + @ResponseWrapper(localName = "welcomeMessageResponse", targetNamespace = "http://endpoint.jaxws.javaee7.org/", + className = "org.javaee7.jaxws.client.gen.WelcomeMessageResponse") + public String welcomeMessage( + @WebParam(name = "arg0", targetNamespace = "") String arg0); + + /** + * + * @param arg0 + * @return + * returns java.util.List + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "findEBooks", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.FindEBooks") + @ResponseWrapper(localName = "findEBooksResponse", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.FindEBooksResponse") + public List findEBooks( + @WebParam(name = "arg0", targetNamespace = "") String arg0); + + /** + * + * @param arg0 + * @return + * returns org.javaee7.jaxws.client.gen.EBook + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "takeBook", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.TakeBook") + @ResponseWrapper(localName = "takeBookResponse", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.TakeBookResponse") + public EBook takeBook( + @WebParam(name = "arg0", targetNamespace = "") String arg0); + + /** + * + * @param arg0 + */ + @WebMethod + @RequestWrapper(localName = "saveBook", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.SaveBook") + @ResponseWrapper(localName = "saveBookResponse", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.SaveBookResponse") + public void saveBook( + @WebParam(name = "arg0", targetNamespace = "") EBook arg0); + + /** + * + * @param arg1 + * @param arg0 + * @return + * returns org.javaee7.jaxws.client.gen.EBook + */ + @WebMethod + @WebResult(targetNamespace = "") + @RequestWrapper(localName = "addAppendix", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.AddAppendix") + @ResponseWrapper(localName = "addAppendixResponse", targetNamespace = "http://endpoint.jaxws.javaee7.org/", className = "org.javaee7.jaxws.client.gen.AddAppendixResponse") + public EBook addAppendix( + @WebParam(name = "arg0", targetNamespace = "") EBook arg0, + @WebParam(name = "arg1", targetNamespace = "") int arg1); + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBookStoreImplService.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBookStoreImplService.java new file mode 100644 index 000000000..aa8c6e18e --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/EBookStoreImplService.java @@ -0,0 +1,70 @@ +package org.javaee7.jaxws.client.gen; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.logging.Logger; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceFeature; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.5-b03- + * Generated source version: 2.1 + * + */ +@WebServiceClient(name = "EBookStoreImplService", targetNamespace = "http://endpoint.jaxws.javaee7.org/", + wsdlLocation = "http://localhost:8080/jaxws-endpoint/EBookStoreImplService?wsdl") +public class EBookStoreImplService + extends Service +{ + + private final static URL EBOOKSTOREIMPLSERVICE_WSDL_LOCATION; + private final static Logger logger = Logger.getLogger(org.javaee7.jaxws.client.gen.EBookStoreImplService.class.getName()); + + static { + URL url = null; + try { + URL baseUrl; + baseUrl = org.javaee7.jaxws.client.gen.EBookStoreImplService.class.getResource("."); + url = new URL(baseUrl, "http://localhost:8080/jaxws-endpoint/EBookStoreImplService?wsdl"); + } catch (MalformedURLException e) { + logger.warning("Failed to create URL for the wsdl Location: 'http://localhost:8080/jaxws-endpoint/EBookStoreImplService?wsdl', retrying as a local file"); + logger.warning(e.getMessage()); + } + EBOOKSTOREIMPLSERVICE_WSDL_LOCATION = url; + } + + public EBookStoreImplService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public EBookStoreImplService() { + super(EBOOKSTOREIMPLSERVICE_WSDL_LOCATION, new QName("http://endpoint.jaxws.javaee7.org/", "EBookStoreImplService")); + } + + /** + * + * @return + * returns EBookStore + */ + @WebEndpoint(name = "EBookStoreImplPort") + public EBookStore getEBookStoreImplPort() { + return super.getPort(new QName("http://endpoint.jaxws.javaee7.org/", "EBookStoreImplPort"), EBookStore.class); + } + + /** + * + * @param features + * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * @return + * returns EBookStore + */ + @WebEndpoint(name = "EBookStoreImplPort") + public EBookStore getEBookStoreImplPort(WebServiceFeature... features) { + return super.getPort(new QName("http://endpoint.jaxws.javaee7.org/", "EBookStoreImplPort"), EBookStore.class, features); + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/FindEBooks.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/FindEBooks.java new file mode 100644 index 000000000..e34f1b14d --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/FindEBooks.java @@ -0,0 +1,58 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for findEBooks complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="findEBooks">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "findEBooks", propOrder = { + "arg0" +}) +public class FindEBooks { + + protected String arg0; + + /** + * Gets the value of the arg0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArg0(String value) { + this.arg0 = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/FindEBooksResponse.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/FindEBooksResponse.java new file mode 100644 index 000000000..ab6ad21a9 --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/FindEBooksResponse.java @@ -0,0 +1,67 @@ +package org.javaee7.jaxws.client.gen; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for findEBooksResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="findEBooksResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "findEBooksResponse", propOrder = { + "_return" +}) +public class FindEBooksResponse { + + @XmlElement(name = "return") + protected List _return; + + /** + * Gets the value of the return property. + * + *

+ * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a set method for the return property. + * + *

+ * For example, to add a new item, do as follows: + * 

+     *    getReturn().add(newItem);
+     *
+ * + * + *

+ * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List getReturn() { + if (_return == null) { + _return = new ArrayList(); + } + return this._return; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/ObjectFactory.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/ObjectFactory.java new file mode 100644 index 000000000..3706755f2 --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/ObjectFactory.java @@ -0,0 +1,221 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.javaee7.jaxws.client.gen package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _FindEBooks_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "findEBooks"); + private final static QName _SaveBookResponse_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "saveBookResponse"); + private final static QName _WelcomeMessage_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "welcomeMessage"); + private final static QName _FindEBooksResponse_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "findEBooksResponse"); + private final static QName _AddAppendix_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "addAppendix"); + private final static QName _AddAppendixResponse_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "addAppendixResponse"); + private final static QName _TakeBook_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "takeBook"); + private final static QName _WelcomeMessageResponse_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "welcomeMessageResponse"); + private final static QName _TakeBookResponse_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "takeBookResponse"); + private final static QName _SaveBook_QNAME = new QName("http://endpoint.jaxws.javaee7.org/", "saveBook"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.javaee7.jaxws.client.gen + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link EBook } + * + */ + public EBook createEBook() { + return new EBook(); + } + + /** + * Create an instance of {@link TakeBookResponse } + * + */ + public TakeBookResponse createTakeBookResponse() { + return new TakeBookResponse(); + } + + /** + * Create an instance of {@link FindEBooksResponse } + * + */ + public FindEBooksResponse createFindEBooksResponse() { + return new FindEBooksResponse(); + } + + /** + * Create an instance of {@link AddAppendix } + * + */ + public AddAppendix createAddAppendix() { + return new AddAppendix(); + } + + /** + * Create an instance of {@link FindEBooks } + * + */ + public FindEBooks createFindEBooks() { + return new FindEBooks(); + } + + /** + * Create an instance of {@link AddAppendixResponse } + * + */ + public AddAppendixResponse createAddAppendixResponse() { + return new AddAppendixResponse(); + } + + /** + * Create an instance of {@link WelcomeMessage } + * + */ + public WelcomeMessage createWelcomeMessage() { + return new WelcomeMessage(); + } + + /** + * Create an instance of {@link TakeBook } + * + */ + public TakeBook createTakeBook() { + return new TakeBook(); + } + + /** + * Create an instance of {@link WelcomeMessageResponse } + * + */ + public WelcomeMessageResponse createWelcomeMessageResponse() { + return new WelcomeMessageResponse(); + } + + /** + * Create an instance of {@link SaveBookResponse } + * + */ + public SaveBookResponse createSaveBookResponse() { + return new SaveBookResponse(); + } + + /** + * Create an instance of {@link SaveBook } + * + */ + public SaveBook createSaveBook() { + return new SaveBook(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link FindEBooks }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "findEBooks") + public JAXBElement createFindEBooks(FindEBooks value) { + return new JAXBElement(_FindEBooks_QNAME, FindEBooks.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SaveBookResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "saveBookResponse") + public JAXBElement createSaveBookResponse(SaveBookResponse value) { + return new JAXBElement(_SaveBookResponse_QNAME, SaveBookResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link WelcomeMessage }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "welcomeMessage") + public JAXBElement createWelcomeMessage(WelcomeMessage value) { + return new JAXBElement(_WelcomeMessage_QNAME, WelcomeMessage.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link FindEBooksResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "findEBooksResponse") + public JAXBElement createFindEBooksResponse(FindEBooksResponse value) { + return new JAXBElement(_FindEBooksResponse_QNAME, FindEBooksResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AddAppendix }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "addAppendix") + public JAXBElement createAddAppendix(AddAppendix value) { + return new JAXBElement(_AddAppendix_QNAME, AddAppendix.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AddAppendixResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "addAppendixResponse") + public JAXBElement createAddAppendixResponse(AddAppendixResponse value) { + return new JAXBElement(_AddAppendixResponse_QNAME, AddAppendixResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TakeBook }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "takeBook") + public JAXBElement createTakeBook(TakeBook value) { + return new JAXBElement(_TakeBook_QNAME, TakeBook.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link WelcomeMessageResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "welcomeMessageResponse") + public JAXBElement createWelcomeMessageResponse(WelcomeMessageResponse value) { + return new JAXBElement(_WelcomeMessageResponse_QNAME, WelcomeMessageResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link TakeBookResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "takeBookResponse") + public JAXBElement createTakeBookResponse(TakeBookResponse value) { + return new JAXBElement(_TakeBookResponse_QNAME, TakeBookResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link SaveBook }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://endpoint.jaxws.javaee7.org/", name = "saveBook") + public JAXBElement createSaveBook(SaveBook value) { + return new JAXBElement(_SaveBook_QNAME, SaveBook.class, null, value); + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/SaveBook.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/SaveBook.java new file mode 100644 index 000000000..f948ae34b --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/SaveBook.java @@ -0,0 +1,58 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for saveBook complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="saveBook">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="arg0" type="{http://endpoint.jaxws.javaee7.org/}eBook" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "saveBook", propOrder = { + "arg0" +}) +public class SaveBook { + + protected EBook arg0; + + /** + * Gets the value of the arg0 property. + * + * @return + * possible object is + * {@link EBook } + * + */ + public EBook getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + * @param value + * allowed object is + * {@link EBook } + * + */ + public void setArg0(EBook value) { + this.arg0 = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/SaveBookResponse.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/SaveBookResponse.java new file mode 100644 index 000000000..f2418c407 --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/SaveBookResponse.java @@ -0,0 +1,29 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for saveBookResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="saveBookResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "saveBookResponse") +public class SaveBookResponse { + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/TakeBook.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/TakeBook.java new file mode 100644 index 000000000..64173ea6b --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/TakeBook.java @@ -0,0 +1,58 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for takeBook complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="takeBook">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "takeBook", propOrder = { + "arg0" +}) +public class TakeBook { + + protected String arg0; + + /** + * Gets the value of the arg0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArg0(String value) { + this.arg0 = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/TakeBookResponse.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/TakeBookResponse.java new file mode 100644 index 000000000..2bdc942c4 --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/TakeBookResponse.java @@ -0,0 +1,60 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for takeBookResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="takeBookResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://endpoint.jaxws.javaee7.org/}eBook" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "takeBookResponse", propOrder = { + "_return" +}) +public class TakeBookResponse { + + @XmlElement(name = "return") + protected EBook _return; + + /** + * Gets the value of the return property. + * + * @return + * possible object is + * {@link EBook } + * + */ + public EBook getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + * @param value + * allowed object is + * {@link EBook } + * + */ + public void setReturn(EBook value) { + this._return = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/WelcomeMessage.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/WelcomeMessage.java new file mode 100644 index 000000000..a0a7caadb --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/WelcomeMessage.java @@ -0,0 +1,58 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for welcomeMessage complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="welcomeMessage">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "welcomeMessage", propOrder = { + "arg0" +}) +public class WelcomeMessage { + + protected String arg0; + + /** + * Gets the value of the arg0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArg0(String value) { + this.arg0 = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/WelcomeMessageResponse.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/WelcomeMessageResponse.java new file mode 100644 index 000000000..99c1a5abf --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/WelcomeMessageResponse.java @@ -0,0 +1,60 @@ +package org.javaee7.jaxws.client.gen; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + +/** + *

Java class for welcomeMessageResponse complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="welcomeMessageResponse">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "welcomeMessageResponse", propOrder = { + "_return" +}) +public class WelcomeMessageResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * Gets the value of the return property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} diff --git a/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/package-info.java b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/package-info.java new file mode 100644 index 000000000..759d75dcf --- /dev/null +++ b/jaxws/jaxws-client/src/main/java/org/javaee7/jaxws/client/gen/package-info.java @@ -0,0 +1,3 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = "http://endpoint.jaxws.javaee7.org/") +package org.javaee7.jaxws.client.gen; + diff --git a/jaxws/jaxws-client/src/test/java/org/javaee7/jaxws/client/EBookStoreClientSampleTest.java b/jaxws/jaxws-client/src/test/java/org/javaee7/jaxws/client/EBookStoreClientSampleTest.java index 47ac84b7a..471fe053a 100644 --- a/jaxws/jaxws-client/src/test/java/org/javaee7/jaxws/client/EBookStoreClientSampleTest.java +++ b/jaxws/jaxws-client/src/test/java/org/javaee7/jaxws/client/EBookStoreClientSampleTest.java @@ -1,93 +1,95 @@ -package org.javaee7.jaxws.client; - -import static org.junit.Assert.*; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Arrays; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.javaee7.jaxws.client.gen.EBook; -import org.javaee7.jaxws.client.gen.EBookStore; -import org.javaee7.jaxws.client.gen.EBookStoreImplService; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.resolver.api.maven.archive.importer.MavenImporter; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.ShrinkWrap; - -import org.junit.Before; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; -/** - * @author Fermin Gallego - */ -@RunWith(Arquillian.class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class EBookStoreClientSampleTest { - private static EBookStoreImplService eBookStoreService; - - /** - * Method for creating and deploying the war file from 'jaxws-endpoint' project, - * which contains the web service to be tested. - * - * @return a war file - */ - @Deployment(testable = false) - public static WebArchive createDeployment() { - return ShrinkWrap.create(MavenImporter.class) - .loadPomFromFile("../jaxws-endpoint/pom.xml") - .importBuildOutput() - .as(WebArchive.class); - } - - @ArquillianResource - private URL url; - - @Before - public void setUp() throws Exception { - eBookStoreService = new EBookStoreImplService( - new URL(url, "EBookStoreImplService?wsdl"), - new QName("http://endpoint.jaxws.javaee7.org/", "EBookStoreImplService")); - } - - @Test - public void test1WelcomeMessage() throws MalformedURLException { - EBookStore eBookStore = eBookStoreService.getEBookStoreImplPort(); - String response=eBookStore.welcomeMessage("Jackson"); - assertEquals("Welcome to EBookStore WebService, Mr/Mrs Jackson", response); - } - @Test - public void test2SaveAndTakeBook() throws MalformedURLException { - EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); - - EBook eBook=new EBook(); - eBook.setTitle("The Jungle Book"); - eBook.setNumPages(225); - eBook.setPrice(17.9); - eBookStore.saveBook(eBook); - eBook=new EBook(); - - eBook.setTitle("Animal Farm"); - eBook.setNumPages(113); - eBook.setPrice(22.5); - List notes= Arrays.asList(new String[]{"Great book","Not too bad"}); - eBook.getNotes().addAll(notes); - eBookStore.saveBook(eBook); - - EBook response=eBookStore.takeBook("Animal Farm"); - assertEquals(eBook.getNumPages(),response.getNumPages()); - assertEquals(eBook.getPrice(),response.getPrice(),0); - assertEquals(eBook.getTitle(),response.getTitle()); - assertEquals(notes,response.getNotes()); - - } - -} +package org.javaee7.jaxws.client; + +import static org.junit.Assert.*; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Arrays; +import java.util.List; + +import javax.xml.namespace.QName; + +import org.javaee7.jaxws.client.gen.EBook; +import org.javaee7.jaxws.client.gen.EBookStore; +import org.javaee7.jaxws.client.gen.EBookStoreImplService; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.resolver.api.maven.archive.importer.MavenImporter; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.api.ArchivePaths; +import org.jboss.shrinkwrap.api.ShrinkWrap; + +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; + +/** + * @author Fermin Gallego + */ +@RunWith(Arquillian.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class EBookStoreClientSampleTest { + private static EBookStoreImplService eBookStoreService; + + /** + * Method for creating and deploying the war file from 'jaxws-endpoint' project, + * which contains the web service to be tested. + * + * @return a war file + */ + @Deployment(testable = false) + public static WebArchive createDeployment() { + return ShrinkWrap.create(MavenImporter.class) + .loadPomFromFile("../jaxws-endpoint/pom.xml") + .importBuildOutput() + .as(WebArchive.class); + } + + @ArquillianResource + private URL url; + + @Before + public void setUp() throws Exception { + eBookStoreService = new EBookStoreImplService( + new URL(url, "EBookStoreImplService?wsdl"), + new QName("http://endpoint.jaxws.javaee7.org/", "EBookStoreImplService")); + } + + @Test + public void test1WelcomeMessage() throws MalformedURLException { + EBookStore eBookStore = eBookStoreService.getEBookStoreImplPort(); + String response = eBookStore.welcomeMessage("Jackson"); + assertEquals("Welcome to EBookStore WebService, Mr/Mrs Jackson", response); + } + + @Test + public void test2SaveAndTakeBook() throws MalformedURLException { + EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); + + EBook eBook = new EBook(); + eBook.setTitle("The Jungle Book"); + eBook.setNumPages(225); + eBook.setPrice(17.9); + eBookStore.saveBook(eBook); + eBook = new EBook(); + + eBook.setTitle("Animal Farm"); + eBook.setNumPages(113); + eBook.setPrice(22.5); + List notes = Arrays.asList(new String[] { "Great book", "Not too bad" }); + eBook.getNotes().addAll(notes); + eBookStore.saveBook(eBook); + + EBook response = eBookStore.takeBook("Animal Farm"); + assertEquals(eBook.getNumPages(), response.getNumPages()); + assertEquals(eBook.getPrice(), response.getPrice(), 0); + assertEquals(eBook.getTitle(), response.getTitle()); + assertEquals(notes, response.getNotes()); + + } + +} diff --git a/jaxws/jaxws-endpoint/pom.xml b/jaxws/jaxws-endpoint/pom.xml index 116891dc6..3067161f3 100644 --- a/jaxws/jaxws-endpoint/pom.xml +++ b/jaxws/jaxws-endpoint/pom.xml @@ -1,14 +1,17 @@ - + + 4.0.0 + - org.javaee7.jaxws - jaxws-samples + org.javaee7 + jaxws 1.0-SNAPSHOT ../pom.xml - jaxws-endpoint + jaxws-jaxws-endpoint war + Java EE 7 Sample: jaxws - jaxws-endpoint + jaxws-endpoint diff --git a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBook.java b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBook.java index 817a04084..a21d22f84 100644 --- a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBook.java +++ b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBook.java @@ -1,48 +1,56 @@ -package org.javaee7.jaxws.endpoint; - -import java.util.ArrayList; -import java.util.List; - -/** - * - * @author Fermin Gallego - * - */ -public class EBook { - private String title; - private int numPages; - private double price; - private List notes; - - public EBook() { - super(); - } - public String getTitle() { - return title; - } - public void setTitle(String title) { - this.title = title; - } - public int getNumPages() { - return numPages; - } - public void setNumPages(int numPages) { - this.numPages = numPages; - } - public double getPrice() { - return price; - } - public void setPrice(double price) { - this.price = price; - } - public List getNotes() { - if (notes == null) { - notes = new ArrayList(); - } - return notes; - } - public void setNotes(List notes) { - this.notes = notes; - } - -} +package org.javaee7.jaxws.endpoint; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * @author Fermin Gallego + * + */ +public class EBook { + private String title; + private int numPages; + private double price; + private List notes; + + public EBook() { + super(); + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public int getNumPages() { + return numPages; + } + + public void setNumPages(int numPages) { + this.numPages = numPages; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } + + public List getNotes() { + if (notes == null) { + notes = new ArrayList(); + } + return notes; + } + + public void setNotes(List notes) { + this.notes = notes; + } + +} diff --git a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java index 7aaf6161d..e0f3643cb 100644 --- a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java +++ b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStore.java @@ -1,25 +1,29 @@ -package org.javaee7.jaxws.endpoint; - -import java.util.List; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -/** - * - * @author Fermin Gallego - * - */ -@WebService -public interface EBookStore { - @WebMethod - public String welcomeMessage(String name); - @WebMethod - public List findEBooks(String text); - @WebMethod - public EBook takeBook(String title); - @WebMethod - public void saveBook(EBook eBook); - @WebMethod - public EBook addAppendix(EBook eBook,int appendixPages); -} +package org.javaee7.jaxws.endpoint; + +import java.util.List; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * + * @author Fermin Gallego + * + */ +@WebService +public interface EBookStore { + @WebMethod + public String welcomeMessage(String name); + + @WebMethod + public List findEBooks(String text); + + @WebMethod + public EBook takeBook(String title); + + @WebMethod + public void saveBook(EBook eBook); + + @WebMethod + public EBook addAppendix(EBook eBook, int appendixPages); +} diff --git a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java index 128843a97..a33494c67 100644 --- a/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java +++ b/jaxws/jaxws-endpoint/src/main/java/org/javaee7/jaxws/endpoint/EBookStoreImpl.java @@ -1,54 +1,54 @@ -package org.javaee7.jaxws.endpoint; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import javax.jws.WebService; - -/** - * - * @author Fermin Gallego - * - */ -@WebService(endpointInterface = "org.javaee7.jaxws.endpoint.EBookStore", -serviceName="EBookStoreImplService") -public class EBookStoreImpl implements EBookStore{ - - private HashMap eBookCollection=new HashMap(); - - @Override - public String welcomeMessage(String name) { - return "Welcome to EBookStore WebService, Mr/Mrs "+name; - } - - @Override - public List findEBooks(String text) { - List foundTitles=new ArrayList(); - for(String title:eBookCollection.keySet()){ - if(title.contains(text)){ - foundTitles.add(title); - } - } - return foundTitles; - } - - @Override - public EBook takeBook(String title) { - return eBookCollection.get(title); - } - - @Override - public void saveBook(EBook eBook) { - eBookCollection.put(eBook.getTitle(), eBook); - - } - - @Override - public EBook addAppendix(EBook eBook,int appendixPages) { - eBook.setNumPages((eBook.getNumPages()+appendixPages)); - eBookCollection.put(eBook.getTitle(), eBook); - return eBook; - } - -} +package org.javaee7.jaxws.endpoint; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import javax.jws.WebService; + +/** + * + * @author Fermin Gallego + * + */ +@WebService(endpointInterface = "org.javaee7.jaxws.endpoint.EBookStore", + serviceName = "EBookStoreImplService") +public class EBookStoreImpl implements EBookStore { + + private HashMap eBookCollection = new HashMap(); + + @Override + public String welcomeMessage(String name) { + return "Welcome to EBookStore WebService, Mr/Mrs " + name; + } + + @Override + public List findEBooks(String text) { + List foundTitles = new ArrayList(); + for (String title : eBookCollection.keySet()) { + if (title.contains(text)) { + foundTitles.add(title); + } + } + return foundTitles; + } + + @Override + public EBook takeBook(String title) { + return eBookCollection.get(title); + } + + @Override + public void saveBook(EBook eBook) { + eBookCollection.put(eBook.getTitle(), eBook); + + } + + @Override + public EBook addAppendix(EBook eBook, int appendixPages) { + eBook.setNumPages((eBook.getNumPages() + appendixPages)); + eBookCollection.put(eBook.getTitle(), eBook); + return eBook; + } + +} diff --git a/jaxws/jaxws-endpoint/src/test/java/org/javaee7/jaxws/endpoint/EBookStoreTest.java b/jaxws/jaxws-endpoint/src/test/java/org/javaee7/jaxws/endpoint/EBookStoreTest.java index c98251bae..ac383c12f 100644 --- a/jaxws/jaxws-endpoint/src/test/java/org/javaee7/jaxws/endpoint/EBookStoreTest.java +++ b/jaxws/jaxws-endpoint/src/test/java/org/javaee7/jaxws/endpoint/EBookStoreTest.java @@ -1,101 +1,103 @@ -package org.javaee7.jaxws.endpoint; - -import static org.junit.Assert.*; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.javaee7.jaxws.endpoint.EBook; -import org.javaee7.jaxws.endpoint.EBookStore; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Before; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; - -/** - * @author Fermin Gallego - */ -@RunWith(Arquillian.class) -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class EBookStoreTest { - - private static Service eBookStoreService; - - /** - * Arquillian specific method for creating a file which can be deployed - * while executing the test. - * - * @return a war file - */ - @Deployment(testable = false) - public static WebArchive createDeployment() { - return ShrinkWrap.create(WebArchive.class). - addPackage("org.javaee7.jaxws.endpoint"); - } - - @ArquillianResource - private URL url; - - @Before - public void setupClass() throws MalformedURLException { - eBookStoreService = Service.create( - new URL(url, "EBookStoreImplService?wsdl"), - new QName("http://endpoint.jaxws.javaee7.org/", "EBookStoreImplService")); - } - - @Test - public void test1WelcomeMessage() throws MalformedURLException { - EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); - String response=eBookStore.welcomeMessage("Johnson"); - assertEquals("Welcome to EBookStore WebService, Mr/Mrs Johnson", response); - } - - @Test - public void test2SaveAndTakeBook() throws MalformedURLException { - EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); - EBook eBook=new EBook(); - eBook.setTitle("The Lord of the Rings"); - eBook.setNumPages(1178); - eBook.setPrice(21.8); - eBookStore.saveBook(eBook); - eBook=new EBook(); - - eBook.setTitle("Oliver Twist"); - eBook.setNumPages(268); - eBook.setPrice(7.45); - eBookStore.saveBook(eBook); - EBook response=eBookStore.takeBook("Oliver Twist"); - - assertEquals(eBook.getNumPages(),response.getNumPages()); - } - @Test - public void test3FindEbooks(){ - EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); - List titleList=eBookStore.findEBooks("Rings"); - - assertNotNull(titleList); - assertEquals(1, titleList.size()); - assertEquals("The Lord of the Rings",titleList.get(0)); - } - @Test - public void test4AddAppendix(){ - EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); - EBook eBook=eBookStore.takeBook("Oliver Twist"); - - assertEquals(268,eBook.getNumPages()); - EBook eBookResponse=eBookStore.addAppendix(eBook, 5); - - assertEquals(268,eBook.getNumPages()); - assertEquals(273,eBookResponse.getNumPages()); - } -} +package org.javaee7.jaxws.endpoint; + +import static org.junit.Assert.*; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.javaee7.jaxws.endpoint.EBook; +import org.javaee7.jaxws.endpoint.EBookStore; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; + +/** + * @author Fermin Gallego + */ +@RunWith(Arquillian.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class EBookStoreTest { + + private static Service eBookStoreService; + + /** + * Arquillian specific method for creating a file which can be deployed + * while executing the test. + * + * @return a war file + */ + @Deployment(testable = false) + public static WebArchive createDeployment() { + return ShrinkWrap.create(WebArchive.class). + addPackage("org.javaee7.jaxws.endpoint"); + } + + @ArquillianResource + private URL url; + + @Before + public void setupClass() throws MalformedURLException { + eBookStoreService = Service.create( + new URL(url, "EBookStoreImplService?wsdl"), + new QName("http://endpoint.jaxws.javaee7.org/", "EBookStoreImplService")); + } + + @Test + public void test1WelcomeMessage() throws MalformedURLException { + EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); + String response = eBookStore.welcomeMessage("Johnson"); + assertEquals("Welcome to EBookStore WebService, Mr/Mrs Johnson", response); + } + + @Test + public void test2SaveAndTakeBook() throws MalformedURLException { + EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); + EBook eBook = new EBook(); + eBook.setTitle("The Lord of the Rings"); + eBook.setNumPages(1178); + eBook.setPrice(21.8); + eBookStore.saveBook(eBook); + eBook = new EBook(); + + eBook.setTitle("Oliver Twist"); + eBook.setNumPages(268); + eBook.setPrice(7.45); + eBookStore.saveBook(eBook); + EBook response = eBookStore.takeBook("Oliver Twist"); + + assertEquals(eBook.getNumPages(), response.getNumPages()); + } + + @Test + public void test3FindEbooks() { + EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); + List titleList = eBookStore.findEBooks("Rings"); + + assertNotNull(titleList); + assertEquals(1, titleList.size()); + assertEquals("The Lord of the Rings", titleList.get(0)); + } + + @Test + public void test4AddAppendix() { + EBookStore eBookStore = eBookStoreService.getPort(EBookStore.class); + EBook eBook = eBookStore.takeBook("Oliver Twist"); + + assertEquals(268, eBook.getNumPages()); + EBook eBookResponse = eBookStore.addAppendix(eBook, 5); + + assertEquals(268, eBook.getNumPages()); + assertEquals(273, eBookResponse.getNumPages()); + } +} diff --git a/jaxws/pom.xml b/jaxws/pom.xml index a07067356..e4a744df1 100644 --- a/jaxws/pom.xml +++ b/jaxws/pom.xml @@ -1,23 +1,23 @@ - + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jaxws - jaxws-samples + org.javaee7 + jaxws pom - Java EE 7 JAX-WS Samples + Java EE 7 Sample: jaxws jaxws-endpoint jaxws-client + org.javaee7 diff --git a/jca/README.md b/jca/README.md new file mode 100644 index 000000000..51a881afc --- /dev/null +++ b/jca/README.md @@ -0,0 +1,13 @@ +# Java EE 7 Samples: JCA 1.7# + +The [JSR 322](https://jcp.org/en/jsr/detail?id=322) defines a standard architecture for connecting to Enterprise Information Systems. This JSR will enhance the existing specification with features requested by experts and community. + +## Samples ## + + - connector-simple + +## How to run + +More information on how to run can be found at: + + diff --git a/jca/connector-simple/connector/pom.xml b/jca/connector-simple/connector/pom.xml index 91bd80104..4f2edd7fa 100644 --- a/jca/connector-simple/connector/pom.xml +++ b/jca/connector-simple/connector/pom.xml @@ -1,15 +1,14 @@ - - + + 4.0.0 org.javaee7 - connector-simple + jca-connector-simple 1.0-SNAPSHOT org.javaee7 - connector + jca-connector-simple-connector 1.0-SNAPSHOT - connector + Java EE 7 Sample: connector http://maven.apache.org diff --git a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/MyResoureAdapter.java b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/MyResoureAdapter.java index 3680b85c8..b050701cb 100644 --- a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/MyResoureAdapter.java +++ b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/MyResoureAdapter.java @@ -14,7 +14,7 @@ * @author arungup */ public class MyResoureAdapter implements ResourceAdapter { - + private static final Logger LOGGER = Logger.getLogger("MyResourceAdapter"); @Override @@ -41,5 +41,5 @@ public void endpointDeactivation(MessageEndpointFactory endpointFactory, Activat public XAResource[] getXAResources(ActivationSpec[] specs) throws ResourceException { return null; } - + } diff --git a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/cci/MyOrderRecord.java b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/cci/MyOrderRecord.java index 8c707aa9b..10a98903d 100644 --- a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/cci/MyOrderRecord.java +++ b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/cci/MyOrderRecord.java @@ -7,7 +7,7 @@ * @author arungup */ public class MyOrderRecord implements Record { - + private String data; private String name; private String description; @@ -19,7 +19,7 @@ public String getData() { public void setData(String data) { this.data = data; } - + @Override public String getRecordName() { return name; @@ -39,16 +39,16 @@ public void setRecordShortDescription(String description) { public String getRecordShortDescription() { return description; } - + @Override public Object clone() throws CloneNotSupportedException { super.clone(); - + MyOrderRecord record = new MyOrderRecord(); record.setData(this.data); record.setRecordName(this.name); record.setRecordShortDescription(this.description); return record; } - + } diff --git a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/cci/MyResponseRecord.java b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/cci/MyResponseRecord.java index 6b9703612..2523b0102 100644 --- a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/cci/MyResponseRecord.java +++ b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/cci/MyResponseRecord.java @@ -19,7 +19,7 @@ public String getData() { public void setData(String data) { this.data = data; } - + @Override public String getRecordName() { return name; @@ -39,16 +39,16 @@ public void setRecordShortDescription(String description) { public String getRecordShortDescription() { return description; } - + @Override public Object clone() throws CloneNotSupportedException { super.clone(); - + MyOrderRecord record = new MyOrderRecord(); record.setData(this.data); record.setRecordName(this.name); record.setRecordShortDescription(this.description); return record; } - + } diff --git a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyConnectionFactory.java b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyConnectionFactory.java index f8be068ae..ac739495f 100644 --- a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyConnectionFactory.java +++ b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyConnectionFactory.java @@ -5,5 +5,5 @@ * @author arungup */ public class MyConnectionFactory { - + } diff --git a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyInteraction.java b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyInteraction.java index 505c39cdc..3ae0f9d5f 100644 --- a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyInteraction.java +++ b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyInteraction.java @@ -5,5 +5,5 @@ * @author arungup */ public class MyInteraction { - + } diff --git a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyManagedConnection.java b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyManagedConnection.java index 9ab807ee3..8a07e159a 100644 --- a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyManagedConnection.java +++ b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyManagedConnection.java @@ -20,13 +20,13 @@ * @author arungup */ public class MyManagedConnection implements ManagedConnection { - + private static final Logger LOGGER = Logger.getLogger("MyManagedConnection"); - + private MyConnection connection; - + FileOutputStream fos; - + public MyManagedConnection(String file) { try { fos = new FileOutputStream(file); @@ -95,5 +95,5 @@ public void setLogWriter(PrintWriter out) throws ResourceException { public PrintWriter getLogWriter() throws ResourceException { throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. } - + } diff --git a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyManagedConnectionFactory.java b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyManagedConnectionFactory.java index b4c53ae2a..4e94fb4fc 100644 --- a/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyManagedConnectionFactory.java +++ b/jca/connector-simple/connector/src/main/java/org/javaee7/jca/connector/simple/connector/outbound/MyManagedConnectionFactory.java @@ -5,5 +5,5 @@ * @author arungup */ public class MyManagedConnectionFactory { - + } diff --git a/jca/connector-simple/connector/src/test/java/org/javaee7/jca/connector/simple/connector/AppTest.java b/jca/connector-simple/connector/src/test/java/org/javaee7/jca/connector/simple/connector/AppTest.java index 4b0426297..8a36c64fd 100644 --- a/jca/connector-simple/connector/src/test/java/org/javaee7/jca/connector/simple/connector/AppTest.java +++ b/jca/connector-simple/connector/src/test/java/org/javaee7/jca/connector/simple/connector/AppTest.java @@ -7,7 +7,7 @@ /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** @@ -15,9 +15,9 @@ public class AppTest * * @param testName name of the test case */ - public AppTest( String testName ) + public AppTest(String testName) { - super( testName ); + super(testName); } /** @@ -25,7 +25,7 @@ public AppTest( String testName ) */ public static Test suite() { - return new TestSuite( AppTest.class ); + return new TestSuite(AppTest.class); } /** @@ -33,6 +33,6 @@ public static Test suite() */ public void testApp() { - assertTrue( true ); + assertTrue(true); } } diff --git a/jca/connector-simple/pom.xml b/jca/connector-simple/pom.xml index 2a74ae1ea..d092c34f3 100644 --- a/jca/connector-simple/pom.xml +++ b/jca/connector-simple/pom.xml @@ -1,19 +1,20 @@ 4.0.0 + - jca-samples - org.javaee7.jca + jca + org.javaee7 1.0-SNAPSHOT ../pom.xml - org.javaee7 - connector-simple + jca-connector-simple 1.0-SNAPSHOT pom - connector-simple - + Java EE 7 Sample: jca - connector-simple + + connector - \ No newline at end of file + diff --git a/jca/mdb-filewatcher/pom.xml b/jca/mdb-filewatcher/pom.xml index a13cea992..445542812 100644 --- a/jca/mdb-filewatcher/pom.xml +++ b/jca/mdb-filewatcher/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - jca-samples - org.javaee7.jca + jca + org.javaee7 1.0-SNAPSHOT ../pom.xml @@ -11,4 +11,5 @@ org.javaee7 mdb-filewatcher 1.0-SNAPSHOT - \ No newline at end of file + Java EE 7 Sample: mdb-filewatcher + diff --git a/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/FileSystemWatcherActivationSpec.java b/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/FileSystemWatcherActivationSpec.java index 7accb7cc5..f13c14558 100644 --- a/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/FileSystemWatcherActivationSpec.java +++ b/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/FileSystemWatcherActivationSpec.java @@ -39,7 +39,7 @@ public ResourceAdapter getResourceAdapter() { @Override public void setResourceAdapter(ResourceAdapter resourceAdapter) - throws ResourceException { + throws ResourceException { this.resourceAdapter = resourceAdapter; } diff --git a/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/FileSystemWatcherResourceAdapter.java b/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/FileSystemWatcherResourceAdapter.java index fc410efa6..2f5acb11b 100644 --- a/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/FileSystemWatcherResourceAdapter.java +++ b/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/FileSystemWatcherResourceAdapter.java @@ -48,9 +48,9 @@ public void endpointActivation(MessageEndpointFactory endpointFactory, Activatio try { WatchKey watchKey = fileSystem.getPath(fsWatcherAS.getDir()) - .register(watchService, StandardWatchEventKinds.ENTRY_CREATE, - StandardWatchEventKinds.ENTRY_DELETE, - StandardWatchEventKinds.ENTRY_MODIFY); + .register(watchService, StandardWatchEventKinds.ENTRY_CREATE, + StandardWatchEventKinds.ENTRY_DELETE, + StandardWatchEventKinds.ENTRY_MODIFY); listeners.put(watchKey, endpointFactory); @@ -62,7 +62,7 @@ public void endpointActivation(MessageEndpointFactory endpointFactory, Activatio @Override public void endpointDeactivation(MessageEndpointFactory endpointFactory, ActivationSpec activationSpec) { - for (WatchKey watchKey: listeners.keySet()) { + for (WatchKey watchKey : listeners.keySet()) { if (listeners.get(watchKey) == endpointFactory) { listeners.remove(watchKey); break; diff --git a/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/WatchingThread.java b/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/WatchingThread.java index eb8a02494..3646b49e5 100644 --- a/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/WatchingThread.java +++ b/jca/mdb-filewatcher/src/main/java/org/javaee7/jca/filewatch/adapter/WatchingThread.java @@ -37,7 +37,7 @@ final class WatchingThread extends Thread { private FileSystemWatcherResourceAdapter resourceAdapter; WatchingThread(WatchService watchService, - FileSystemWatcherResourceAdapter ra) { + FileSystemWatcherResourceAdapter ra) { this.watchService = watchService; this.resourceAdapter = ra; } @@ -59,24 +59,24 @@ public void run() { } private void dispatchEvents(List> events, MessageEndpointFactory messageEndpointFactory) { - for (WatchEvent event: events) { + for (WatchEvent event : events) { Path path = (Path) event.context(); try { MessageEndpoint endpoint = messageEndpointFactory.createEndpoint(null); Class beanClass = resourceAdapter.getBeanClass(messageEndpointFactory); - for (Method m: beanClass.getMethods()) { + for (Method m : beanClass.getMethods()) { if (StandardWatchEventKinds.ENTRY_CREATE.equals(event.kind()) - && m.isAnnotationPresent(Created.class) - && path.toString().matches(m.getAnnotation(Created.class).value())) { + && m.isAnnotationPresent(Created.class) + && path.toString().matches(m.getAnnotation(Created.class).value())) { invoke(endpoint, m, path); } else if (StandardWatchEventKinds.ENTRY_DELETE.equals(event.kind()) - && m.isAnnotationPresent(Deleted.class) - && path.toString().matches(m.getAnnotation(Deleted.class).value())) { + && m.isAnnotationPresent(Deleted.class) + && path.toString().matches(m.getAnnotation(Deleted.class).value())) { invoke(endpoint, m, path); } else if (StandardWatchEventKinds.ENTRY_MODIFY.equals(event.kind()) - && m.isAnnotationPresent(Modified.class) - && path.toString().matches(m.getAnnotation(Modified.class).value())) { + && m.isAnnotationPresent(Modified.class) + && path.toString().matches(m.getAnnotation(Modified.class).value())) { invoke(endpoint, m, path); } } @@ -104,7 +104,8 @@ public void run() { } @Override - public void release() {} + public void release() { + } }); } } \ No newline at end of file diff --git a/jca/mdb-filewatcher/src/test/java/org/javaee7/jca/filewatch/FileWatcherTest.java b/jca/mdb-filewatcher/src/test/java/org/javaee7/jca/filewatch/FileWatcherTest.java index 10d76e8d1..7c3a02f9a 100644 --- a/jca/mdb-filewatcher/src/test/java/org/javaee7/jca/filewatch/FileWatcherTest.java +++ b/jca/mdb-filewatcher/src/test/java/org/javaee7/jca/filewatch/FileWatcherTest.java @@ -51,33 +51,32 @@ public class FileWatcherTest { public static EnterpriseArchive deploy() throws Exception { final JavaArchive fsWatcherFileAdapter = ShrinkWrap.create(JavaArchive.class, "rar.jar") - .addPackages(true, Created.class.getPackage(), FileSystemWatcher.class.getPackage()); + .addPackages(true, Created.class.getPackage(), FileSystemWatcher.class.getPackage()); final ResourceAdapterArchive rar = ShrinkWrap.create(ResourceAdapterArchive.class, "fswatcher.rar") - .addAsLibrary(fsWatcherFileAdapter); + .addAsLibrary(fsWatcherFileAdapter); final JavaArchive fileWatcher = ShrinkWrap.create(JavaArchive.class, "mdb.jar") - .addClasses(FileEvent.class, FileWatchingMDB.class) - // appropriate descriptor will be only picked up by the target container - .addAsManifestResource("glassfish-ejb-jar.xml") - .addAsManifestResource("jboss-ejb3.xml") - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + .addClasses(FileEvent.class, FileWatchingMDB.class) + // appropriate descriptor will be only picked up by the target container + .addAsManifestResource("glassfish-ejb-jar.xml") + .addAsManifestResource("jboss-ejb3.xml") + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); final JavaArchive test = ShrinkWrap.create(JavaArchive.class, "test.jar") - .addClasses(FileWatcherTest.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - + .addClasses(FileWatcherTest.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); final JavaArchive[] testArchives = Maven.resolver() - .loadPomFromFile("pom.xml") - .resolve("org.assertj:assertj-core", "com.jayway.awaitility:awaitility") - .withTransitivity() - .as(JavaArchive.class); + .loadPomFromFile("pom.xml") + .resolve("org.assertj:assertj-core", "com.jayway.awaitility:awaitility") + .withTransitivity() + .as(JavaArchive.class); return ShrinkWrap.create(EnterpriseArchive.class, "test.ear") - .addAsModules(rar, fileWatcher) - .addAsLibraries(testArchives) - .addAsLibrary(test); + .addAsModules(rar, fileWatcher) + .addAsLibraries(testArchives) + .addAsLibrary(test); } @@ -98,7 +97,7 @@ public void should_react_on_new_text_file_arriving_in_the_folder() throws Except // when await().atMost(TEN_SECONDS).with().pollInterval(FIVE_HUNDRED_MILLISECONDS) - .until(fileEventObserved()); + .until(fileEventObserved()); // then assertThat(tempFile.getName()).isEqualTo(observedFileEvent.getFile().getName()); @@ -115,7 +114,7 @@ public void should_react_on_new_pdf_file_arriving_in_the_folder() throws Excepti // when await().atMost(TEN_SECONDS).with().pollInterval(FIVE_HUNDRED_MILLISECONDS) - .until(fileEventObserved()); + .until(fileEventObserved()); // then assertThat(tempFile.getName()).isEqualTo(observedFileEvent.getFile().getName()); @@ -131,7 +130,7 @@ public void should_react_on_deletion_of_existing_text_file() throws Exception { // when await().atMost(TEN_SECONDS).with().pollInterval(FIVE_HUNDRED_MILLISECONDS) - .until(fileEventObserved()); + .until(fileEventObserved()); // then assertThat(tempFile.getName()).isEqualTo(observedFileEvent.getFile().getName()); assertThat(DELETED).isEqualTo(observedFileEvent.getType()); diff --git a/jca/mdb-filewatcher/src/test/java/org/javaee7/jca/filewatch/FileWatchingMDB.java b/jca/mdb-filewatcher/src/test/java/org/javaee7/jca/filewatch/FileWatchingMDB.java index 51525387f..a01589f48 100644 --- a/jca/mdb-filewatcher/src/test/java/org/javaee7/jca/filewatch/FileWatchingMDB.java +++ b/jca/mdb-filewatcher/src/test/java/org/javaee7/jca/filewatch/FileWatchingMDB.java @@ -16,7 +16,6 @@ */ package org.javaee7.jca.filewatch; - import org.javaee7.jca.filewatch.adapter.FileSystemWatcher; import org.javaee7.jca.filewatch.event.Created; import org.javaee7.jca.filewatch.event.Deleted; diff --git a/jca/mdb-filewatcher/src/test/resources-jbosseap-remote/arquillian.xml b/jca/mdb-filewatcher/src/test/resources-jbosseap-remote/arquillian.xml index 0f43e23e7..e1a314092 100644 --- a/jca/mdb-filewatcher/src/test/resources-jbosseap-remote/arquillian.xml +++ b/jca/mdb-filewatcher/src/test/resources-jbosseap-remote/arquillian.xml @@ -1,18 +1,18 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/schema/arquillian%20http://www.jboss.org/schema/arquillian/arquillian_1_0.xsd"> - - target/deployments - + + target/deployments + - - - ${jboss.server.config.file.name:standalone-full.xml} - - - + + + ${jboss.server.config.file.name:standalone-full.xml} + + + diff --git a/jca/mdb-filewatcher/src/test/resources-wildfly-managed/arquillian.xml b/jca/mdb-filewatcher/src/test/resources-wildfly-managed/arquillian.xml index 603f482d6..2c6f54a70 100644 --- a/jca/mdb-filewatcher/src/test/resources-wildfly-managed/arquillian.xml +++ b/jca/mdb-filewatcher/src/test/resources-wildfly-managed/arquillian.xml @@ -1,18 +1,18 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/schema/arquillian%20http://www.jboss.org/schema/arquillian/arquillian_1_0.xsd"> - - target/deployments - + + target/deployments + - - - ${jboss.server.config.file.name:standalone-full.xml} - - - + + + ${jboss.server.config.file.name:standalone-full.xml} + + + diff --git a/jca/mdb-filewatcher/src/test/resources-wildfly-remote/arquillian.xml b/jca/mdb-filewatcher/src/test/resources-wildfly-remote/arquillian.xml index 603f482d6..2c6f54a70 100644 --- a/jca/mdb-filewatcher/src/test/resources-wildfly-remote/arquillian.xml +++ b/jca/mdb-filewatcher/src/test/resources-wildfly-remote/arquillian.xml @@ -1,18 +1,18 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/schema/arquillian%20http://www.jboss.org/schema/arquillian/arquillian_1_0.xsd"> - - target/deployments - + + target/deployments + - - - ${jboss.server.config.file.name:standalone-full.xml} - - - + + + ${jboss.server.config.file.name:standalone-full.xml} + + + diff --git a/jca/mdb-filewatcher/src/test/resources/jboss-ejb3.xml b/jca/mdb-filewatcher/src/test/resources/jboss-ejb3.xml index 4c7acce90..fefe3d6ef 100644 --- a/jca/mdb-filewatcher/src/test/resources/jboss-ejb3.xml +++ b/jca/mdb-filewatcher/src/test/resources/jboss-ejb3.xml @@ -1,11 +1,11 @@ + xmlns:mdb="urn:resource-adapter-binding" xmlns:security="urn:security"> - - - FileWatchingMDB - test.ear#fswatcher.rar - - + + + FileWatchingMDB + test.ear#fswatcher.rar + + \ No newline at end of file diff --git a/jca/pom.xml b/jca/pom.xml index 57bb29a62..d6a13cdd4 100644 --- a/jca/pom.xml +++ b/jca/pom.xml @@ -1,23 +1,24 @@ 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jca - jca-samples + org.javaee7 + jca 1.0-SNAPSHOT pom - Java EE 7 JCA Samples + Java EE 7 Sample: jca - + connector-simple mdb-filewatcher + org.javaee7 diff --git a/jms/README.md b/jms/README.md new file mode 100644 index 000000000..9632a35ca --- /dev/null +++ b/jms/README.md @@ -0,0 +1,16 @@ +# Java EE 7 Samples: JMS 2.0# + +The [JSR 343](https://jcp.org/en/jsr/detail?id=343) is an update to the Java Message Service API, an existing API for accessing enterprise messaging systems from Java programs. + +## Samples ## + + - jms-xa + - send-receive + - temp-destination + - jms-batch + +## How to run + +More information on how to run can be found at: + + diff --git a/jms/jms-batch/pom.xml b/jms/jms-batch/pom.xml index fe88c2463..424ce35ef 100644 --- a/jms/jms-batch/pom.xml +++ b/jms/jms-batch/pom.xml @@ -1,24 +1,20 @@ - + 4.0.0 - org.javaee7.jms - jms-samples + org.javaee7 + jms 1.0-SNAPSHOT - - jms-batch - - Batch JMS processing + jms-jms-batch + Java EE 7 Sample: jms - jms-batch ItemReader reading from durable subscription org.javaee7 - util-samples + util - \ No newline at end of file + diff --git a/jms/jms-batch/src/main/java/org/javaee7/jms/batch/JmsItemReader.java b/jms/jms-batch/src/main/java/org/javaee7/jms/batch/JmsItemReader.java index 9d2d1fb73..4affc0e32 100644 --- a/jms/jms-batch/src/main/java/org/javaee7/jms/batch/JmsItemReader.java +++ b/jms/jms-batch/src/main/java/org/javaee7/jms/batch/JmsItemReader.java @@ -43,5 +43,4 @@ public void close() throws Exception { jms.close(); } - } diff --git a/jms/jms-batch/src/main/java/org/javaee7/jms/batch/Resources.java b/jms/jms-batch/src/main/java/org/javaee7/jms/batch/Resources.java index 41186b79e..5aee42d46 100644 --- a/jms/jms-batch/src/main/java/org/javaee7/jms/batch/Resources.java +++ b/jms/jms-batch/src/main/java/org/javaee7/jms/batch/Resources.java @@ -7,17 +7,16 @@ * @author Patrik Dudits */ @JMSDestinationDefinition( - name = Resources.TOPIC, - resourceAdapter = "jmsra", - interfaceName = "javax.jms.Topic", - destinationName="batch.topic", - description="Batch processing topic") + name = Resources.TOPIC, + resourceAdapter = "jmsra", + interfaceName = "javax.jms.Topic", + destinationName = "batch.topic", + description = "Batch processing topic") @JMSConnectionFactoryDefinition( // <1> WildFly appears to require user and password to be set for connection factories - name = Resources.CONNECTION_FACTORY, - resourceAdapter = "jmsra", - clientId = "batchJob", // <2> It is not allowed to call +setClientId+ on +Connection+ or +JMSContext+ in Java EE container. - description = "Connection factory with clientId of the durable subscription" -) + name = Resources.CONNECTION_FACTORY, + resourceAdapter = "jmsra", + clientId = "batchJob", // <2> It is not allowed to call +setClientId+ on +Connection+ or +JMSContext+ in Java EE container. + description = "Connection factory with clientId of the durable subscription") public class Resources { public static final String SUBSCRIPTION = "BatchJob"; // <3> Durable consumer is uniquely identified with its +clientId+ and +subscriptionName+. public static final String TOPIC = "java:app/batch/topic"; diff --git a/jms/jms-batch/src/main/java/org/javaee7/jms/batch/SummingItemWriter.java b/jms/jms-batch/src/main/java/org/javaee7/jms/batch/SummingItemWriter.java index 05a24f4f1..51645fbcb 100644 --- a/jms/jms-batch/src/main/java/org/javaee7/jms/batch/SummingItemWriter.java +++ b/jms/jms-batch/src/main/java/org/javaee7/jms/batch/SummingItemWriter.java @@ -37,7 +37,7 @@ public void close() throws Exception { private int computeSum(List objects) { int subTotal = 0; for (Object o : objects) { - subTotal += (Integer)o; + subTotal += (Integer) o; } return subTotal; } diff --git a/jms/jms-batch/src/test/java/org/javaee7/jms/batch/JmsItemReaderTest.java b/jms/jms-batch/src/test/java/org/javaee7/jms/batch/JmsItemReaderTest.java index 6af7750da..8fb5df945 100644 --- a/jms/jms-batch/src/test/java/org/javaee7/jms/batch/JmsItemReaderTest.java +++ b/jms/jms-batch/src/test/java/org/javaee7/jms/batch/JmsItemReaderTest.java @@ -54,10 +54,10 @@ public class JmsItemReaderTest { @Deployment public static WebArchive deployment() { return ShrinkWrap.create(WebArchive.class) - .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) - .addClass(BatchTestHelper.class) - .addPackage(JmsItemReader.class.getPackage()) - .addAsResource("META-INF/batch-jobs/jms-job.xml"); + .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")) + .addClass(BatchTestHelper.class) + .addPackage(JmsItemReader.class.getPackage()) + .addAsResource("META-INF/batch-jobs/jms-job.xml"); } @Resource(lookup = "java:comp/DefaultJMSConnectionFactory") @@ -128,7 +128,7 @@ private int sendMessages(int count) { Random r = new Random(); try (JMSContext jms = factory.createContext(Session.AUTO_ACKNOWLEDGE)) { JMSProducer producer = jms.createProducer(); - for (int i=0; i< count; i++) { + for (int i = 0; i < count; i++) { int payload = r.nextInt(); producer.send(topic, payload); sum += payload; diff --git a/jms/jms-xa/pom.xml b/jms/jms-xa/pom.xml index 97b023642..fc1ac25cd 100644 --- a/jms/jms-xa/pom.xml +++ b/jms/jms-xa/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - jms-samples - org.javaee7.jms + jms + org.javaee7 1.0-SNAPSHOT - 4.0.0 - jms-xa + jms-jms-xa war + Java EE 7 Sample: jms - jms-xa Arquillian test for JMS XA - \ No newline at end of file + diff --git a/jms/jms-xa/src/main/java/org/javaee7/jms/xa/JMSMailman.java b/jms/jms-xa/src/main/java/org/javaee7/jms/xa/JMSMailman.java index 981cfc818..15043e528 100644 --- a/jms/jms-xa/src/main/java/org/javaee7/jms/xa/JMSMailman.java +++ b/jms/jms-xa/src/main/java/org/javaee7/jms/xa/JMSMailman.java @@ -9,9 +9,9 @@ import java.util.logging.Level; import java.util.logging.Logger; -@MessageDriven(activationConfig = {@ActivationConfigProperty(propertyName = "destinationLookup", +@MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationLookup", propertyValue = Mailman.CLASSIC_QUEUE), @ActivationConfigProperty(propertyName = "destinationType", - propertyValue = "javax.jms.Queue"),}) + propertyValue = "javax.jms.Queue"), }) public class JMSMailman implements MessageListener { private static final Logger logger = Logger.getLogger(JMSMailman.class.getName()); diff --git a/jms/jms-xa/src/main/java/org/javaee7/jms/xa/Mailman.java b/jms/jms-xa/src/main/java/org/javaee7/jms/xa/Mailman.java index d852805e7..fb86f7d83 100644 --- a/jms/jms-xa/src/main/java/org/javaee7/jms/xa/Mailman.java +++ b/jms/jms-xa/src/main/java/org/javaee7/jms/xa/Mailman.java @@ -29,7 +29,7 @@ public class Mailman { public void sendMessage(String payload) { try (JMSContext context = connectionFactory.createContext()) { - context.createProducer().send(demoQueue,payload); + context.createProducer().send(demoQueue, payload); } } } diff --git a/jms/pom.xml b/jms/pom.xml index fe7bce5be..c6a99d4bc 100644 --- a/jms/pom.xml +++ b/jms/pom.xml @@ -1,19 +1,18 @@ - + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jms - jms-samples + org.javaee7 + jms 1.0-SNAPSHOT pom - Java EE 7 JMS Samples + Java EE 7 Sample: jms jms-xa @@ -21,6 +20,7 @@ temp-destination jms-batch + org.javaee7 diff --git a/jms/send-receive/pom.xml b/jms/send-receive/pom.xml index 8112535ea..d38d5ab43 100644 --- a/jms/send-receive/pom.xml +++ b/jms/send-receive/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jms - jms-samples + org.javaee7 + jms 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jms - send-receive + org.javaee7 + jms-send-receive 1.0-SNAPSHOT war + Java EE 7 Sample: jms - send-receive diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/Resources.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/Resources.java index 49f885333..418cb9339 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/Resources.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/Resources.java @@ -12,23 +12,23 @@ name = Resources.CLASSIC_QUEUE, resourceAdapter = "jmsra", interfaceName = "javax.jms.Queue", - destinationName="classicQueue", - description="My Sync Queue"), + destinationName = "classicQueue", + description = "My Sync Queue"), @JMSDestinationDefinition(name = Resources.ASYNC_QUEUE, resourceAdapter = "jmsra", interfaceName = "javax.jms.Queue", - destinationName="asyncQueue", - description="My Async Queue"), + destinationName = "asyncQueue", + description = "My Async Queue"), @JMSDestinationDefinition(name = Resources.SYNC_APP_MANAGED_QUEUE, resourceAdapter = "jmsra", interfaceName = "javax.jms.Queue", - destinationName="syncAppQueue", - description="My Sync Queue for App-managed JMSContext") , + destinationName = "syncAppQueue", + description = "My Sync Queue for App-managed JMSContext"), @JMSDestinationDefinition(name = Resources.SYNC_CONTAINER_MANAGED_QUEUE, resourceAdapter = "jmsra", interfaceName = "javax.jms.Queue", - destinationName="syncContainerQueue", - description="My Sync Queue for Container-managed JMSContext") + destinationName = "syncContainerQueue", + description = "My Sync Queue for Container-managed JMSContext") }) public class Resources { public static final String SYNC_APP_MANAGED_QUEUE = "java:global/jms/mySyncAppQueue"; diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/classic/ClassicMessageReceiver.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/classic/ClassicMessageReceiver.java index 589d07b82..b58c2f924 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/classic/ClassicMessageReceiver.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/classic/ClassicMessageReceiver.java @@ -21,7 +21,7 @@ public class ClassicMessageReceiver { @Resource(lookup = "java:comp/DefaultJMSConnectionFactory") ConnectionFactory connectionFactory; - + @Resource(mappedName = Resources.CLASSIC_QUEUE) Queue demoQueue; diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/classic/ClassicMessageSender.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/classic/ClassicMessageSender.java index f8e2e968a..f4b95dbef 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/classic/ClassicMessageSender.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/classic/ClassicMessageSender.java @@ -21,7 +21,7 @@ public class ClassicMessageSender { @Resource(lookup = "java:comp/DefaultJMSConnectionFactory") ConnectionFactory connectionFactory; - + @Resource(mappedName = Resources.CLASSIC_QUEUE) Queue demoQueue; diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/mdb/MessageReceiverAsync.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/mdb/MessageReceiverAsync.java index 40ef1697a..6fe0b390c 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/mdb/MessageReceiverAsync.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/mdb/MessageReceiverAsync.java @@ -17,9 +17,9 @@ */ @MessageDriven(activationConfig = { @ActivationConfigProperty(propertyName = "destinationLookup", - propertyValue = Resources.ASYNC_QUEUE), + propertyValue = Resources.ASYNC_QUEUE), @ActivationConfigProperty(propertyName = "destinationType", - propertyValue = "javax.jms.Queue"), + propertyValue = "javax.jms.Queue"), }) public class MessageReceiverAsync implements MessageListener { diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageReceiverSync.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageReceiverSync.java index 3abe74073..58b6d5225 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageReceiverSync.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageReceiverSync.java @@ -21,14 +21,14 @@ public class MessageReceiverSync { @Inject private JMSContext context; - - @Resource(mappedName=Resources.SYNC_CONTAINER_MANAGED_QUEUE) + + @Resource(mappedName = Resources.SYNC_CONTAINER_MANAGED_QUEUE) Queue myQueue; public String receiveMessage() { return context.createConsumer(myQueue).receiveBody(String.class, 1000); } - + public void receiveAll() { System.out.println("--> Receiving redundant messages ..."); try { diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageSenderAsync.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageSenderAsync.java index 5d2b2e356..5f8198b65 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageSenderAsync.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageSenderAsync.java @@ -21,9 +21,9 @@ public class MessageSenderAsync { @Inject -// @JMSConnectionFactory("java:comp/DefaultJMSConnectionFactory") + // @JMSConnectionFactory("java:comp/DefaultJMSConnectionFactory") JMSContext context; - + @Resource(lookup = Resources.ASYNC_QUEUE) Queue asyncQueue; @@ -52,7 +52,6 @@ public void onException(Message msg, Exception e) { System.out.println("Caught RuntimeException trying to invoke setAsync - not permitted in Java EE"); } - context.createProducer().send(asyncQueue, message); } } diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageSenderSync.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageSenderSync.java index 6aa5eae97..f23278b90 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageSenderSync.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/MessageSenderSync.java @@ -16,10 +16,10 @@ public class MessageSenderSync { @Inject -// @JMSConnectionFactory("java:comp/DefaultJMSConnectionFactory") + // @JMSConnectionFactory("java:comp/DefaultJMSConnectionFactory") JMSContext context; - - @Resource(mappedName=Resources.SYNC_CONTAINER_MANAGED_QUEUE) + + @Resource(mappedName = Resources.SYNC_CONTAINER_MANAGED_QUEUE) Queue syncQueue; public void sendMessage(String message) { diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/appmanaged/MessageReceiverAppManaged.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/appmanaged/MessageReceiverAppManaged.java index 68cf8b043..031880e3a 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/appmanaged/MessageReceiverAppManaged.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/appmanaged/MessageReceiverAppManaged.java @@ -15,8 +15,8 @@ public class MessageReceiverAppManaged { @Resource private ConnectionFactory factory; - - @Resource(mappedName=Resources.SYNC_APP_MANAGED_QUEUE) + + @Resource(mappedName = Resources.SYNC_APP_MANAGED_QUEUE) Queue myQueue; public String receiveMessage() { diff --git a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/appmanaged/MessageSenderAppManaged.java b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/appmanaged/MessageSenderAppManaged.java index 69b32807a..a58693002 100644 --- a/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/appmanaged/MessageSenderAppManaged.java +++ b/jms/send-receive/src/main/java/org/javaee7/jms/send/receive/simple/appmanaged/MessageSenderAppManaged.java @@ -18,8 +18,8 @@ public class MessageSenderAppManaged { @Resource private ConnectionFactory factory; - - @Resource(mappedName=Resources.SYNC_APP_MANAGED_QUEUE) + + @Resource(mappedName = Resources.SYNC_APP_MANAGED_QUEUE) Queue myQueue; public void sendMessage(String message) { diff --git a/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/SyncTest.java b/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/SyncTest.java index c13e9289b..77aadae2f 100644 --- a/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/SyncTest.java +++ b/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/SyncTest.java @@ -42,7 +42,7 @@ public class SyncTest { @EJB MessageReceiverAppManaged appManagedReceiver; - + @Test public void testClassicApi() { String message = "The test message over JMS 1.1 API"; @@ -84,13 +84,13 @@ public void testMultipleSendAndReceive() { @Deployment public static WebArchive deploy() { return ShrinkWrap.create(WebArchive.class) - .addClasses(MessageSenderSync.class, - MessageReceiverSync.class, - ClassicMessageSender.class, - ClassicMessageReceiver.class, - MessageSenderAppManaged.class, - MessageReceiverAppManaged.class, - Resources.class); + .addClasses(MessageSenderSync.class, + MessageReceiverSync.class, + ClassicMessageSender.class, + ClassicMessageReceiver.class, + MessageSenderAppManaged.class, + MessageReceiverAppManaged.class, + Resources.class); } } diff --git a/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/AsyncTest.java b/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/AsyncTest.java index 3f178c51b..e7aae55f2 100644 --- a/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/AsyncTest.java +++ b/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/AsyncTest.java @@ -24,26 +24,25 @@ */ @RunWith(Arquillian.class) public class AsyncTest { - + @EJB MessageSenderAsync asyncSender; - - + @Test public void testAsync() throws Exception { asyncSender.sendMessage("Fire!"); ReceptionSynchronizer.waitFor(MessageReceiverAsync.class, "onMessage"); // unless we timed out, the test passes } - + @Deployment public static WebArchive deploy() { return ShrinkWrap.create(WebArchive.class) - .addClass(MessageSenderAsync.class) - .addClass(Resources.class) - .addClass(MessageReceiverAsync.class) - .addClass(ReceptionSynchronizer.class) - .addAsWebInfResource(new File("src/test/resources/WEB-INF/ejb-jar.xml")); + .addClass(MessageSenderAsync.class) + .addClass(Resources.class) + .addClass(MessageReceiverAsync.class) + .addClass(ReceptionSynchronizer.class) + .addAsWebInfResource(new File("src/test/resources/WEB-INF/ejb-jar.xml")); } - + } diff --git a/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizer.java b/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizer.java index 335aef3f3..23554fb00 100644 --- a/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizer.java +++ b/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizer.java @@ -28,7 +28,7 @@ public class ReceptionSynchronizer { public Object invoke(final InvocationContext ctx) throws Exception { boolean transactional = false; try { - System.out.println("Intercepting "+ctx.getMethod().toGenericString()); + System.out.println("Intercepting " + ctx.getMethod().toGenericString()); transactional = txRegistry != null && txRegistry.getTransactionStatus() != Status.STATUS_NO_TRANSACTION; if (transactional) { txRegistry.registerInterposedSynchronization(new Synchronization() { diff --git a/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizerTest.java b/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizerTest.java index 7f0abf9d9..33cc45800 100644 --- a/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizerTest.java +++ b/jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizerTest.java @@ -7,6 +7,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; + /** * * @author Patrik Dudits @@ -24,9 +25,9 @@ public void testWaiting() throws NoSuchMethodException, InterruptedException { public void run() { cut.registerInvocation(method); } - }, 1, TimeUnit.SECONDS); + }, 1, TimeUnit.SECONDS); ReceptionSynchronizer.waitFor(ReceptionSynchronizerTest.class, "testWaiting"); - long waitTime = System.currentTimeMillis()-startTime; + long waitTime = System.currentTimeMillis() - startTime; assertTrue("Waited more than 950ms", waitTime > 950); assertTrue("Waited no longer than 1050ms", waitTime < 1050); } diff --git a/jms/temp-destination/pom.xml b/jms/temp-destination/pom.xml index da40d2eaa..4613ce2fd 100644 --- a/jms/temp-destination/pom.xml +++ b/jms/temp-destination/pom.xml @@ -1,15 +1,14 @@ - - - 4.0.0 - - org.javaee7.jms - jms-samples - 1.0-SNAPSHOT - - - temp-destination - war - - Temporary destinations - Request/Response over JMS - + + + 4.0.0 + + + org.javaee7 + jms + 1.0-SNAPSHOT + + jms-temp-destination + war + Java EE 7 Sample: jms - temp-destination + Request/Response over JMS + diff --git a/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/JmsClient.java b/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/JmsClient.java index 29ae31050..43a9a46c4 100644 --- a/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/JmsClient.java +++ b/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/JmsClient.java @@ -23,20 +23,22 @@ public class JmsClient { @Inject JMSContext jms; - @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) // <1> we need to send message in the middle of the method, therefore we cannot be transactional - public String process(String request) { + @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED) + // <1> we need to send message in the middle of the method, therefore we cannot be transactional + public + String process(String request) { TextMessage requestMessage = jms.createTextMessage(request); TemporaryQueue responseQueue = jms.createTemporaryQueue(); jms.createProducer() - .setJMSReplyTo(responseQueue) // <2> set the temporary queue as replyToDestination - .send(requestQueue, requestMessage); // <3> immediately send the request message + .setJMSReplyTo(responseQueue) // <2> set the temporary queue as replyToDestination + .send(requestQueue, requestMessage); // <3> immediately send the request message try (JMSConsumer consumer = jms.createConsumer(responseQueue)) { // <4> listen on the temporary queue - String response = consumer.receiveBody(String.class, 2000); // <5> wait for a +TextMessage+ to arrive + String response = consumer.receiveBody(String.class, 2000); // <5> wait for a +TextMessage+ to arrive - if (response == null) { // <6> +receiveBody+ returns +null+ in case of timeout + if (response == null) { // <6> +receiveBody+ returns +null+ in case of timeout throw new IllegalStateException("Message processing timed out"); } else { return response; diff --git a/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/RequestResponseOverJMS.java b/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/RequestResponseOverJMS.java index c4cf92a7c..252474ac7 100644 --- a/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/RequestResponseOverJMS.java +++ b/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/RequestResponseOverJMS.java @@ -9,10 +9,10 @@ * @author Patrik Dudits */ @MessageDriven(activationConfig = { - @ActivationConfigProperty(propertyName = "destinationLookup", - propertyValue = Resources.REQUEST_QUEUE), - @ActivationConfigProperty(propertyName = "destinationType", - propertyValue = "javax.jms.Queue"), + @ActivationConfigProperty(propertyName = "destinationLookup", + propertyValue = Resources.REQUEST_QUEUE), + @ActivationConfigProperty(propertyName = "destinationType", + propertyValue = "javax.jms.Queue"), }) public class RequestResponseOverJMS implements MessageListener { @@ -27,12 +27,12 @@ public void onMessage(Message message) { return; } TextMessage request = (TextMessage) message; - String payload = request.getText(); // <2> read the payload + String payload = request.getText(); // <2> read the payload - System.out.println("Got request: "+payload); + System.out.println("Got request: " + payload); - String response = "Processed: "+payload; // <3> process the request - jms.createProducer().send(replyTo, response); // <4> send the response + String response = "Processed: " + payload; // <3> process the request + jms.createProducer().send(replyTo, response); // <4> send the response } catch (JMSException e) { e.printStackTrace(); } diff --git a/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/Resources.java b/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/Resources.java index 56033a1d4..c0ae9c1ef 100644 --- a/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/Resources.java +++ b/jms/temp-destination/src/main/java/org/javaee7/jms/temp/destination/Resources.java @@ -12,8 +12,8 @@ name = Resources.REQUEST_QUEUE, resourceAdapter = "jmsra", interfaceName = "javax.jms.Queue", - destinationName="requestQueue", - description="Queue for service requests"), + destinationName = "requestQueue", + description = "Queue for service requests"), }) public class Resources { public static final String REQUEST_QUEUE = "java:global/jms/requestQueue"; diff --git a/jms/temp-destination/src/test/java/org/javaee7/jms/temp/destination/TempQueueTest.java b/jms/temp-destination/src/test/java/org/javaee7/jms/temp/destination/TempQueueTest.java index 639b994a5..26b73ad25 100644 --- a/jms/temp-destination/src/test/java/org/javaee7/jms/temp/destination/TempQueueTest.java +++ b/jms/temp-destination/src/test/java/org/javaee7/jms/temp/destination/TempQueueTest.java @@ -40,7 +40,7 @@ public class TempQueueTest { @Deployment public static WebArchive deployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(RequestResponseOverJMS.class, JmsClient.class, Resources.class); + .addClasses(RequestResponseOverJMS.class, JmsClient.class, Resources.class); } @EJB diff --git a/jpa/README.md b/jpa/README.md new file mode 100644 index 000000000..c9d4af696 --- /dev/null +++ b/jpa/README.md @@ -0,0 +1,39 @@ +# Java EE 7 Samples: JPA 2.1# + +The [JSR 338](https://jcp.org/en/jsr/detail?id=338) specifies the Java API for the management of persistence and object/relational mapping in Java EE and Java SE environments. + +## Samples ## + + - criteria + - datasourcedefinition + - datasourcedefinition-webxml-pu + - datasourcedefinition-annotation-pu + - datasourcedefinition-applicationxml-pu + - dynamic-named-query + - entitygraph + - listeners + - listeners-injection + - multiple-pu + - storedprocedure + - jndi-context + - locking-optimistic + - locking-pessimistic + - ordercolumn + - pu-typesafe + - schema-gen-metadata + - schema-gen-scripts + - schema-gen-scripts-external + - schema-gen-scripts-generate + - schema-gen-index + - native-sql + - native-sql-resultset-mapping + - unsynchronized-pc + - extended-pc + - jpa-converter + - default-datasource + +## How to run + +More information on how to run can be found at: + + diff --git a/jpa/criteria/pom.xml b/jpa/criteria/pom.xml index dc376e8da..a388af895 100644 --- a/jpa/criteria/pom.xml +++ b/jpa/criteria/pom.xml @@ -1,15 +1,15 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - criteria + jpa-criteria war - JPA Criteria API + Java EE 7 Sample: jpa - criteria Using the Criteria API to create queries diff --git a/jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie.java b/jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie.java index 51aff7ed9..bf9084598 100644 --- a/jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie.java +++ b/jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie.java @@ -20,21 +20,21 @@ @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"), @NamedQuery(name = "Movie.findById", query = "SELECT m FROM Movie m WHERE m.id = :id"), @NamedQuery(name = "Movie.findByName", query = "SELECT m FROM Movie m WHERE m.name = :name"), - @NamedQuery(name = "Movie.findByActors", query = "SELECT m FROM Movie m WHERE m.actors = :actors")}) + @NamedQuery(name = "Movie.findByActors", query = "SELECT m FROM Movie m WHERE m.actors = :actors") }) public class Movie implements Serializable { private static final long serialVersionUID = 1L; @Id @NotNull private Integer id; - + @NotNull @Size(min = 1, max = 50) private String name; - + @NotNull @Size(min = 1, max = 200) private String actors; - + public Movie() { } @@ -74,8 +74,12 @@ public void setActors(String actors) { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Movie movie = (Movie) o; @@ -91,5 +95,5 @@ public int hashCode() { public String toString() { return name; } - + } diff --git a/jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie_.java b/jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie_.java index 8baa63714..45d102ecc 100644 --- a/jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie_.java +++ b/jpa/criteria/src/main/java/org/javaee7/jpa/criteria/Movie_.java @@ -7,7 +7,7 @@ * @author Arun Gupta */ @StaticMetamodel(Movie.class) -public class Movie_ { +public class Movie_ { public static volatile SingularAttribute id; public static volatile SingularAttribute name; diff --git a/jpa/criteria/src/test/java/org/javaee7/jpa/criteria/JpaCriteriaTest.java b/jpa/criteria/src/test/java/org/javaee7/jpa/criteria/JpaCriteriaTest.java index fb46a9017..d2e2bed3d 100644 --- a/jpa/criteria/src/test/java/org/javaee7/jpa/criteria/JpaCriteriaTest.java +++ b/jpa/criteria/src/test/java/org/javaee7/jpa/criteria/JpaCriteriaTest.java @@ -56,11 +56,11 @@ public class JpaCriteriaTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.criteria") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.criteria") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } @@ -71,22 +71,22 @@ public static WebArchive createDeployment() { */ @Test public void testCriteria() { - List movies = movieBean.listMovies(); // <1> Get a list of all the movies in the database. - assertEquals(4, movies.size()); // <2> 4 movies loaded on the db, so the size shoud be 4. + List movies = movieBean.listMovies(); // <1> Get a list of all the movies in the database. + assertEquals(4, movies.size()); // <2> 4 movies loaded on the db, so the size shoud be 4. assertTrue(movies.contains(new Movie(1))); assertTrue(movies.contains(new Movie(2))); assertTrue(movies.contains(new Movie(3))); assertTrue(movies.contains(new Movie(4))); - movieBean.updateMovie(); // <3> Update name to "INCEPTION" where name is "Inception" + movieBean.updateMovie(); // <3> Update name to "INCEPTION" where name is "Inception" movies = movieBean.listMovies(); - assertEquals(4, movies.size()); // <4> Size of movies should still be 4. + assertEquals(4, movies.size()); // <4> Size of movies should still be 4. assertEquals("INCEPTION", movies.get(2).getName()); // <5> Verify the movie name change. - movieBean.deleteMovie(); // <6> Now delete the movie "Matrix" + movieBean.deleteMovie(); // <6> Now delete the movie "Matrix" movies = movieBean.listMovies(); assertFalse(movies.isEmpty()); - assertEquals(3, movies.size()); // <7> Size of movies should be 3 now. - assertFalse(movies.contains(new Movie(1))); // <8> Check if the movie "Matrix" is not on the list. + assertEquals(3, movies.size()); // <7> Size of movies should be 3 now. + assertFalse(movies.contains(new Movie(1))); // <8> Check if the movie "Matrix" is not on the list. } } diff --git a/jpa/datasourcedefinition-annotation-pu/pom.xml b/jpa/datasourcedefinition-annotation-pu/pom.xml index 68bdb154a..43c340ed8 100644 --- a/jpa/datasourcedefinition-annotation-pu/pom.xml +++ b/jpa/datasourcedefinition-annotation-pu/pom.xml @@ -1,16 +1,15 @@ - + 4.0.0 - + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT - - datasourcedefinition-annotation-pu + jpa-datasourcedefinition-annotation-pu war + Java EE 7 Sample: jpa - datasourcedefinition-annotation-pu @@ -19,5 +18,4 @@ 1.3.173 - diff --git a/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/config/DataSourceDefinitionConfig.java b/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/config/DataSourceDefinitionConfig.java index aa8ead4d7..67b367874 100644 --- a/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/config/DataSourceDefinitionConfig.java +++ b/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/config/DataSourceDefinitionConfig.java @@ -4,10 +4,9 @@ import javax.ejb.Stateless; @DataSourceDefinition( - name = "java:app/MyApp/MyDS", - className = "org.h2.jdbcx.JdbcDataSource", - url = "jdbc:h2:mem:test" -) + name = "java:app/MyApp/MyDS", + className = "org.h2.jdbcx.JdbcDataSource", + url = "jdbc:h2:mem:test") @Stateless public class DataSourceDefinitionConfig { } diff --git a/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/entity/TestEntity.java b/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/entity/TestEntity.java index 1a4f44d6e..1868272fe 100644 --- a/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/entity/TestEntity.java +++ b/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/entity/TestEntity.java @@ -19,7 +19,7 @@ public class TestEntity { @GeneratedValue(strategy = IDENTITY) private Long id; private String value; - + public Long getId() { return id; } @@ -35,5 +35,5 @@ public String getValue() { public void setValue(String value) { this.value = value; } - + } diff --git a/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/service/TestService.java b/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/service/TestService.java index 0327d2999..20d2554e7 100644 --- a/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/service/TestService.java +++ b/jpa/datasourcedefinition-annotation-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/service/TestService.java @@ -23,18 +23,16 @@ public class TestService { private EntityManager entityManager; public void saveNewEntity() { - + TestEntity testEntity = new TestEntity(); testEntity.setValue("mytest"); - + entityManager.persist(testEntity); } - + public List getAllEntities() { return entityManager.createQuery("SELECT _testEntity FROM TestEntity _testEntity", TestEntity.class) - .getResultList(); + .getResultList(); } - - } diff --git a/jpa/datasourcedefinition-annotation-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/DataSourceDefinitionAnnotationPuTest.java b/jpa/datasourcedefinition-annotation-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/DataSourceDefinitionAnnotationPuTest.java index 572471714..78d573490 100644 --- a/jpa/datasourcedefinition-annotation-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/DataSourceDefinitionAnnotationPuTest.java +++ b/jpa/datasourcedefinition-annotation-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_annotation_pu/DataSourceDefinitionAnnotationPuTest.java @@ -31,27 +31,26 @@ public class DataSourceDefinitionAnnotationPuTest { @Inject private TestService testService; - + @Deployment public static Archive deploy() { return ShrinkWrap.create(WebArchive.class) - .addPackages(true, DataSourceDefinitionAnnotationPuTest.class.getPackage()) - .addAsResource("META-INF/persistence.xml") - .addAsLibraries(Maven.resolver() - .loadPomFromFile("pom.xml") - .resolve("com.h2database:h2") - .withoutTransitivity() - .asSingleFile()) - ; + .addPackages(true, DataSourceDefinitionAnnotationPuTest.class.getPackage()) + .addAsResource("META-INF/persistence.xml") + .addAsLibraries(Maven.resolver() + .loadPomFromFile("pom.xml") + .resolve("com.h2database:h2") + .withoutTransitivity() + .asSingleFile()); } @Test public void insertAndQueryEntity() throws Exception { - + testService.saveNewEntity(); - + List testEntities = testService.getAllEntities(); - + assertTrue(testEntities.size() == 1); assertTrue(testEntities.get(0).getValue().equals("mytest")); } diff --git a/jpa/datasourcedefinition-applicationxml-pu/pom.xml b/jpa/datasourcedefinition-applicationxml-pu/pom.xml index cf6909162..00dcc6883 100644 --- a/jpa/datasourcedefinition-applicationxml-pu/pom.xml +++ b/jpa/datasourcedefinition-applicationxml-pu/pom.xml @@ -1,16 +1,15 @@ - + 4.0.0 - + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT - - datasourcedefinition-applicationxml-pu + jpa-datasourcedefinition-applicationxml-pu war + Java EE 7 Sample: jpa - datasourcedefinition-applicationxml-pu @@ -19,5 +18,4 @@ 1.3.173 - diff --git a/jpa/datasourcedefinition-applicationxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/entity/TestEntity.java b/jpa/datasourcedefinition-applicationxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/entity/TestEntity.java index 89456b44d..2f8442b63 100644 --- a/jpa/datasourcedefinition-applicationxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/entity/TestEntity.java +++ b/jpa/datasourcedefinition-applicationxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/entity/TestEntity.java @@ -19,7 +19,7 @@ public class TestEntity { @GeneratedValue(strategy = IDENTITY) private Long id; private String value; - + public Long getId() { return id; } @@ -35,5 +35,5 @@ public String getValue() { public void setValue(String value) { this.value = value; } - + } diff --git a/jpa/datasourcedefinition-applicationxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/service/TestService.java b/jpa/datasourcedefinition-applicationxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/service/TestService.java index 7ed6645d4..b7fa0af02 100644 --- a/jpa/datasourcedefinition-applicationxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/service/TestService.java +++ b/jpa/datasourcedefinition-applicationxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/service/TestService.java @@ -23,18 +23,16 @@ public class TestService { private EntityManager entityManager; public void saveNewEntity() { - + TestEntity testEntity = new TestEntity(); testEntity.setValue("mytest"); - + entityManager.persist(testEntity); } - + public List getAllEntities() { return entityManager.createQuery("SELECT _testEntity FROM TestEntity _testEntity", TestEntity.class) - .getResultList(); + .getResultList(); } - - } diff --git a/jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuEJBTest.java b/jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuEJBTest.java index 2f40ce73a..52a8e66ca 100644 --- a/jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuEJBTest.java +++ b/jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuEJBTest.java @@ -18,6 +18,7 @@ import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.junit.Test; import org.junit.runner.RunWith; + /** * This tests that a data source defined via the data-source element in an EAR's application.xml can be used by JPA. *

@@ -34,53 +35,53 @@ public class DataSourceDefinitionApplicationXMLPuEJBTest { @Inject private TestService testService; - + @Deployment public static Archive deploy() { - return - // EAR archive - create(EnterpriseArchive.class, "test.ear") - - // Data-source is defined here - .setApplicationXML("application-ejb.xml") - - // JDBC driver for data source - .addAsLibraries(Maven.resolver() - .loadPomFromFile("pom.xml") - .resolve("com.h2database:h2") - .withoutTransitivity() - .asSingleFile()) - - // EJB module - .addAsModule( - create(JavaArchive.class, "test.jar") - - // Persistence unit is defined here, references data source - .addAsResource("META-INF/persistence.xml") - - // Service class that uses persistence unit - .addClasses(TestEntity.class, TestService.class) - ) - - // Web module - // This is needed to prevent Arquillian generating an illegal application.xml - .addAsModule( - create(WebArchive.class, "test.war") - // This class containing the test - .addClass(DataSourceDefinitionApplicationXMLPuEJBTest.class) - - ); + return + // EAR archive + create(EnterpriseArchive.class, "test.ear") + + // Data-source is defined here + .setApplicationXML("application-ejb.xml") + + // JDBC driver for data source + .addAsLibraries(Maven.resolver() + .loadPomFromFile("pom.xml") + .resolve("com.h2database:h2") + .withoutTransitivity() + .asSingleFile()) + + // EJB module + .addAsModule( + create(JavaArchive.class, "test.jar") + + // Persistence unit is defined here, references data source + .addAsResource("META-INF/persistence.xml") + + // Service class that uses persistence unit + .addClasses(TestEntity.class, TestService.class) + ) + + // Web module + // This is needed to prevent Arquillian generating an illegal application.xml + .addAsModule( + create(WebArchive.class, "test.war") + // This class containing the test + .addClass(DataSourceDefinitionApplicationXMLPuEJBTest.class) + + ); } @Test public void insertAndQueryEntity() throws Exception { - + testService.saveNewEntity(); - + List testEntities = testService.getAllEntities(); - + assertTrue(testEntities.size() == 1); assertTrue(testEntities.get(0).getValue().equals("mytest")); } - + } diff --git a/jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuWebTest.java b/jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuWebTest.java index 51ad39028..9cd175582 100644 --- a/jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuWebTest.java +++ b/jpa/datasourcedefinition-applicationxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_applicationxml_pu/DataSourceDefinitionApplicationXMLPuWebTest.java @@ -17,6 +17,7 @@ import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.junit.Test; import org.junit.runner.RunWith; + /** * This tests that a data source defined via the data-source element in an EAR's application.xml can be used by JPA. *

@@ -33,44 +34,44 @@ public class DataSourceDefinitionApplicationXMLPuWebTest { @Inject private TestService testService; - + @Deployment public static Archive deploy() { - return - // EAR archive - create(EnterpriseArchive.class, "test.ear") - - // Data-source is defined here - .setApplicationXML("application-web.xml") - - // JDBC driver for data source - .addAsLibraries(Maven.resolver() - .loadPomFromFile("pom.xml") - .resolve("com.h2database:h2") - .withoutTransitivity() - .asSingleFile()) - - // WAR module - .addAsModule( - create(WebArchive.class, "test.war") - - // Persistence unit is defined here, references data source - .addAsResource("META-INF/persistence.xml") - - // Service class that uses persistence unit - .addPackages(true, DataSourceDefinitionApplicationXMLPuWebTest.class.getPackage()) + return + // EAR archive + create(EnterpriseArchive.class, "test.ear") + + // Data-source is defined here + .setApplicationXML("application-web.xml") + + // JDBC driver for data source + .addAsLibraries(Maven.resolver() + .loadPomFromFile("pom.xml") + .resolve("com.h2database:h2") + .withoutTransitivity() + .asSingleFile()) + + // WAR module + .addAsModule( + create(WebArchive.class, "test.war") + + // Persistence unit is defined here, references data source + .addAsResource("META-INF/persistence.xml") + + // Service class that uses persistence unit + .addPackages(true, DataSourceDefinitionApplicationXMLPuWebTest.class.getPackage()) ); } @Test public void insertAndQueryEntity() throws Exception { - + testService.saveNewEntity(); - + List testEntities = testService.getAllEntities(); - + assertTrue(testEntities.size() == 1); assertTrue(testEntities.get(0).getValue().equals("mytest")); } - + } diff --git a/jpa/datasourcedefinition-webxml-pu/pom.xml b/jpa/datasourcedefinition-webxml-pu/pom.xml index 66e77a31d..e46b376ef 100644 --- a/jpa/datasourcedefinition-webxml-pu/pom.xml +++ b/jpa/datasourcedefinition-webxml-pu/pom.xml @@ -1,16 +1,15 @@ - + 4.0.0 - + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT - - datasourcedefinition-webxml-pu + jpa-datasourcedefinition-webxml-pu war + Java EE 7 Sample: jpa - datasourcedefinition-webxml-pu @@ -19,5 +18,4 @@ 1.3.173 - diff --git a/jpa/datasourcedefinition-webxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/entity/TestEntity.java b/jpa/datasourcedefinition-webxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/entity/TestEntity.java index c1c10a627..c3008f725 100644 --- a/jpa/datasourcedefinition-webxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/entity/TestEntity.java +++ b/jpa/datasourcedefinition-webxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/entity/TestEntity.java @@ -19,7 +19,7 @@ public class TestEntity { @GeneratedValue(strategy = IDENTITY) private Long id; private String value; - + public Long getId() { return id; } @@ -35,5 +35,5 @@ public String getValue() { public void setValue(String value) { this.value = value; } - + } diff --git a/jpa/datasourcedefinition-webxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/service/TestService.java b/jpa/datasourcedefinition-webxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/service/TestService.java index 676cc67b3..d263a03f3 100644 --- a/jpa/datasourcedefinition-webxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/service/TestService.java +++ b/jpa/datasourcedefinition-webxml-pu/src/main/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/service/TestService.java @@ -23,18 +23,16 @@ public class TestService { private EntityManager entityManager; public void saveNewEntity() { - + TestEntity testEntity = new TestEntity(); testEntity.setValue("mytest"); - + entityManager.persist(testEntity); } - + public List getAllEntities() { return entityManager.createQuery("SELECT _testEntity FROM TestEntity _testEntity", TestEntity.class) - .getResultList(); + .getResultList(); } - - } diff --git a/jpa/datasourcedefinition-webxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/DataSourceDefinitionWebxmlPuTest.java b/jpa/datasourcedefinition-webxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/DataSourceDefinitionWebxmlPuTest.java index a3b0e608f..626e65f1e 100644 --- a/jpa/datasourcedefinition-webxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/DataSourceDefinitionWebxmlPuTest.java +++ b/jpa/datasourcedefinition-webxml-pu/src/test/java/org/javaee7/jpa/datasourcedefinition_webxml_pu/DataSourceDefinitionWebxmlPuTest.java @@ -28,37 +28,36 @@ */ @RunWith(Arquillian.class) public class DataSourceDefinitionWebxmlPuTest { - + private static final String WEBAPP_SRC = "src/main/webapp"; @Inject private TestService testService; - + @Deployment public static Archive deploy() { return ShrinkWrap.create(WebArchive.class) - .addPackages(true, DataSourceDefinitionWebxmlPuTest.class.getPackage()) - .addAsResource("META-INF/persistence.xml") - .addAsWebInfResource(resource("web.xml")) - .addAsLibraries(Maven.resolver() - .loadPomFromFile("pom.xml") - .resolve("com.h2database:h2") - .withoutTransitivity() - .asSingleFile()) - ; + .addPackages(true, DataSourceDefinitionWebxmlPuTest.class.getPackage()) + .addAsResource("META-INF/persistence.xml") + .addAsWebInfResource(resource("web.xml")) + .addAsLibraries(Maven.resolver() + .loadPomFromFile("pom.xml") + .resolve("com.h2database:h2") + .withoutTransitivity() + .asSingleFile()); } @Test public void insertAndQueryEntity() throws Exception { - + testService.saveNewEntity(); - + List testEntities = testService.getAllEntities(); - + assertTrue(testEntities.size() == 1); assertTrue(testEntities.get(0).getValue().equals("mytest")); } - + private static File resource(String name) { return new File(WEBAPP_SRC + "/WEB-INF", name); } diff --git a/jpa/datasourcedefinition/pom.xml b/jpa/datasourcedefinition/pom.xml index 6323eaa8b..76b6a7f75 100644 --- a/jpa/datasourcedefinition/pom.xml +++ b/jpa/datasourcedefinition/pom.xml @@ -1,15 +1,14 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT - 4.0.0 - - datasourcedefinition + jpa-datasourcedefinition + Java EE 7 Sample: jpa - datasourcedefinition diff --git a/jpa/datasourcedefinition/src/main/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionHolder.java b/jpa/datasourcedefinition/src/main/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionHolder.java index 909890254..2f307d0da 100644 --- a/jpa/datasourcedefinition/src/main/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionHolder.java +++ b/jpa/datasourcedefinition/src/main/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionHolder.java @@ -7,8 +7,8 @@ * @author Alexis Hassler */ @DataSourceDefinition(name = "java:global/MyApp/MyDataSource", - className = "org.h2.jdbcx.JdbcDataSource", - url = "jdbc:h2:mem:test") + className = "org.h2.jdbcx.JdbcDataSource", + url = "jdbc:h2:mem:test") @Stateless public class DataSourceDefinitionHolder { } diff --git a/jpa/datasourcedefinition/src/test/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionTest.java b/jpa/datasourcedefinition/src/test/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionTest.java index 994449995..e60f64bd8 100644 --- a/jpa/datasourcedefinition/src/test/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionTest.java +++ b/jpa/datasourcedefinition/src/test/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionTest.java @@ -26,15 +26,16 @@ public class DataSourceDefinitionTest { @Deployment public static Archive deploy() { File h2Library = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("com.h2database:h2").withoutTransitivity() - .asSingleFile(); + .resolve("com.h2database:h2").withoutTransitivity() + .asSingleFile(); return ShrinkWrap.create(WebArchive.class) - .addClasses(DataSourceDefinitionHolder.class) - .addAsLibraries(h2Library); + .addClasses(DataSourceDefinitionHolder.class) + .addAsLibraries(h2Library); } - @Resource(lookup = "java:global/MyApp/MyDataSource") DataSource dataSource; + @Resource(lookup = "java:global/MyApp/MyDataSource") + DataSource dataSource; @Test public void should_bean_be_injected() throws Exception { diff --git a/jpa/default-datasource/pom.xml b/jpa/default-datasource/pom.xml index 58f5083c3..ebfeff100 100644 --- a/jpa/default-datasource/pom.xml +++ b/jpa/default-datasource/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - - default-datasource + + jpa-default-datasource war + Java EE 7 Sample: jpa - default-datasource diff --git a/jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/Employee.java b/jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/Employee.java index eb3fcc258..488e3b508 100644 --- a/jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/Employee.java +++ b/jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/Employee.java @@ -23,16 +23,17 @@ public class Employee implements Serializable { @Id @GeneratedValue(strategy = GenerationType.AUTO) private int id; - - @Column(length=40) + + @Column(length = 40) private String name; - - public Employee() { } - + + public Employee() { + } + public Employee(String name) { this.name = name; } - + public int getId() { return id; } diff --git a/jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/EmployeeBean.java b/jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/EmployeeBean.java index 62528aaae..ce9484389 100644 --- a/jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/EmployeeBean.java +++ b/jpa/default-datasource/src/main/java/org/javaee7/jpa/defaultdatasource/EmployeeBean.java @@ -13,11 +13,11 @@ public class EmployeeBean { @PersistenceContext EntityManager em; - + public void persist(Employee e) { em.persist(e); } - + public List get() { return em.createNamedQuery("Employee.findAll", Employee.class).getResultList(); } diff --git a/jpa/default-datasource/src/test/java/org/javaee7/jpa/defaultdatasource/EmployeeBeanTest.java b/jpa/default-datasource/src/test/java/org/javaee7/jpa/defaultdatasource/EmployeeBeanTest.java index c4a1707b2..500e9a271 100644 --- a/jpa/default-datasource/src/test/java/org/javaee7/jpa/defaultdatasource/EmployeeBeanTest.java +++ b/jpa/default-datasource/src/test/java/org/javaee7/jpa/defaultdatasource/EmployeeBeanTest.java @@ -24,10 +24,10 @@ public class EmployeeBeanTest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(Employee.class, - EmployeeBean.class) - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/load.sql"); + .addClasses(Employee.class, + EmployeeBean.class) + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/load.sql"); } @Test diff --git a/jpa/dynamic-named-query/pom.xml b/jpa/dynamic-named-query/pom.xml index 9324fe825..96eed2504 100644 --- a/jpa/dynamic-named-query/pom.xml +++ b/jpa/dynamic-named-query/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jpa - dynamic-named-query + org.javaee7 + jpa-dynamic-named-query 1.0-SNAPSHOT war + Java EE 7 Sample: jpa - dynamic-named-query diff --git a/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/entity/TestEntity.java b/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/entity/TestEntity.java index 5ad33cf85..707c7339b 100644 --- a/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/entity/TestEntity.java +++ b/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/entity/TestEntity.java @@ -19,7 +19,7 @@ public class TestEntity { @GeneratedValue(strategy = IDENTITY) private Long id; private String value; - + public Long getId() { return id; } @@ -35,5 +35,5 @@ public String getValue() { public void setValue(String value) { this.value = value; } - + } diff --git a/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/entity/TestEntity_.java b/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/entity/TestEntity_.java index 9f16ba10c..b34fb76bf 100644 --- a/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/entity/TestEntity_.java +++ b/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/entity/TestEntity_.java @@ -12,7 +12,7 @@ */ @StaticMetamodel(TestEntity.class) public class TestEntity_ { - + public static volatile SingularAttribute id; public static volatile SingularAttribute value; diff --git a/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/service/QueryRepository.java b/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/service/QueryRepository.java index 9dd3e4531..886a89310 100644 --- a/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/service/QueryRepository.java +++ b/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/service/QueryRepository.java @@ -33,7 +33,8 @@ public class QueryRepository { public enum Queries { - TEST_ENTITY_GET_ALL, TEST_ENTITY_GET_BY_VALUE + TEST_ENTITY_GET_ALL, + TEST_ENTITY_GET_BY_VALUE } @PersistenceUnit @@ -44,13 +45,13 @@ public enum Queries { @PostConstruct public void init() { - + // Stores queries that were created via the Criteria API as named queries. - + // This is the Criteria alternative for the feature where JPQL queries can // be placed in orm.xml files or annotations. (but note that JPQL queries can also // be added here programmatically). - + entityManagerFactory.addNamedQuery(TEST_ENTITY_GET_ALL.name(), buildGetAll()); entityManagerFactory.addNamedQuery(TEST_ENTITY_GET_BY_VALUE.name(), buildGetByValue()); } @@ -67,12 +68,12 @@ private TypedQuery buildGetAll() { CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(TestEntity.class); Root root = criteriaQuery.from(TestEntity.class); - + criteriaQuery.select(root); return entityManager.createQuery(criteriaQuery); } - + /** * Builds a criteria query equal to the JPQL * @@ -86,12 +87,12 @@ private TypedQuery buildGetByValue() { CriteriaQuery criteriaQuery = criteriaBuilder.createQuery(TestEntity.class); Root root = criteriaQuery.from(TestEntity.class); ParameterExpression valueParameter = criteriaBuilder.parameter(String.class, TestEntity_.value.getName()); - + criteriaQuery.select(root) - .where( - criteriaBuilder.equal( - root.get(TestEntity_.value), valueParameter) - ); + .where( + criteriaBuilder.equal( + root.get(TestEntity_.value), valueParameter) + ); return entityManager.createQuery(criteriaQuery); } diff --git a/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/service/TestService.java b/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/service/TestService.java index 36e733010..dc06009c0 100644 --- a/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/service/TestService.java +++ b/jpa/dynamic-named-query/src/main/java/org/javaee7/jpa/dynamicnamedquery/service/TestService.java @@ -45,7 +45,7 @@ public List getAll() { */ public List getByValue(String value) { return entityManager.createNamedQuery(TEST_ENTITY_GET_BY_VALUE.name(), TestEntity.class) - .setParameter(TestEntity_.value.getName(), value).getResultList(); + .setParameter(TestEntity_.value.getName(), value).getResultList(); } } diff --git a/jpa/dynamic-named-query/src/test/java/org/javaee7/jpa/dynamicnamedquery/DynamicNamedQueryTest.java b/jpa/dynamic-named-query/src/test/java/org/javaee7/jpa/dynamicnamedquery/DynamicNamedQueryTest.java index d5d0053ce..e7dd931f6 100644 --- a/jpa/dynamic-named-query/src/test/java/org/javaee7/jpa/dynamicnamedquery/DynamicNamedQueryTest.java +++ b/jpa/dynamic-named-query/src/test/java/org/javaee7/jpa/dynamicnamedquery/DynamicNamedQueryTest.java @@ -32,7 +32,7 @@ public class DynamicNamedQueryTest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class).addPackages(true, "org.javaee7.jpa.dynamicnamedquery") - .addAsResource("META-INF/persistence.xml"); + .addAsResource("META-INF/persistence.xml"); } @Test diff --git a/jpa/entitygraph/pom.xml b/jpa/entitygraph/pom.xml index 41afc7ca5..f6b060959 100644 --- a/jpa/entitygraph/pom.xml +++ b/jpa/entitygraph/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - entitygraph + jpa-entitygraph war + Java EE 7 Sample: jpa - entitygraph diff --git a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/Movie.java b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/Movie.java index e45595849..1e426593c 100644 --- a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/Movie.java +++ b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/Movie.java @@ -31,10 +31,10 @@ }, subgraphs = { @NamedSubgraph( - name = "movieActorsGraph", - attributeNodes = { - @NamedAttributeNode("movieActorAwards") - } + name = "movieActorsGraph", + attributeNodes = { + @NamedAttributeNode("movieActorAwards") + } ) } ) @@ -69,8 +69,10 @@ public Set getMovieActors() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; Movie movie = (Movie) o; diff --git a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieActor.java b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieActor.java index c76d29863..a5739b1d1 100644 --- a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieActor.java +++ b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieActor.java @@ -25,8 +25,12 @@ public class MovieActor implements Serializable { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } MovieActor that = (MovieActor) o; diff --git a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieActorAward.java b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieActorAward.java index 8c50cb024..3633de88f 100644 --- a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieActorAward.java +++ b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieActorAward.java @@ -21,8 +21,10 @@ public class MovieActorAward { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; MovieActorAward that = (MovieActorAward) o; diff --git a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieAward.java b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieAward.java index afa64bde5..0a05e7809 100644 --- a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieAward.java +++ b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieAward.java @@ -22,8 +22,10 @@ public class MovieAward implements Serializable { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; MovieAward that = (MovieAward) o; diff --git a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieBean.java b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieBean.java index be07de51a..953966099 100644 --- a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieBean.java +++ b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieBean.java @@ -17,32 +17,32 @@ public class MovieBean { public List listMovies() { return entityManager.createNamedQuery("Movie.findAll") - .getResultList(); + .getResultList(); } public List listMovies(String hint, String graphName) { return entityManager.createNamedQuery("Movie.findAll") - .setHint(hint, entityManager.getEntityGraph(graphName)) - .getResultList(); + .setHint(hint, entityManager.getEntityGraph(graphName)) + .getResultList(); } public List listMovies(String hint, EntityGraph entityGraph) { return entityManager.createNamedQuery("Movie.findAll") - .setHint(hint, entityGraph) - .getResultList(); + .setHint(hint, entityGraph) + .getResultList(); } public List listMoviesById(Integer movieId, String hint, String graphName) { return entityManager.createNamedQuery("Movie.findAllById") - .setParameter("movieId", movieId) - .setHint(hint, entityManager.getEntityGraph(graphName)) - .getResultList(); + .setParameter("movieId", movieId) + .setHint(hint, entityManager.getEntityGraph(graphName)) + .getResultList(); } public List listMoviesByIds(List movieIds, String hint, String graphName) { return entityManager.createNamedQuery("Movie.findAllByIds") - .setParameter("movieIds", movieIds) - .setHint(hint, entityManager.getEntityGraph(graphName)) - .getResultList(); + .setParameter("movieIds", movieIds) + .setHint(hint, entityManager.getEntityGraph(graphName)) + .getResultList(); } } diff --git a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieDirector.java b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieDirector.java index 4518c68a7..8d6e5d702 100644 --- a/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieDirector.java +++ b/jpa/entitygraph/src/main/java/org/javaee7/jpa/entitygraph/MovieDirector.java @@ -19,8 +19,12 @@ public class MovieDirector { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } MovieDirector that = (MovieDirector) o; diff --git a/jpa/entitygraph/src/test/java/org/javaee7/jpa/entitygraph/EntityGraphTest.java b/jpa/entitygraph/src/test/java/org/javaee7/jpa/entitygraph/EntityGraphTest.java index a2844a17d..875c6d42d 100644 --- a/jpa/entitygraph/src/test/java/org/javaee7/jpa/entitygraph/EntityGraphTest.java +++ b/jpa/entitygraph/src/test/java/org/javaee7/jpa/entitygraph/EntityGraphTest.java @@ -35,11 +35,11 @@ public class EntityGraphTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.entitygraph") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.entitygraph") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } @@ -71,7 +71,7 @@ public void testEntityGraphMovieWithActors() throws Exception { // EAGER (movieDirectors), but specification also states that the persistence provider is allowed to fetch // additional state. assertTrue(persistenceUnitUtil.isLoaded(movie, "movieDirectors") || - !persistenceUnitUtil.isLoaded(movie, "movieDirectors")); + !persistenceUnitUtil.isLoaded(movie, "movieDirectors")); assertFalse(persistenceUnitUtil.isLoaded(movie, "movieAwards")); } @@ -94,13 +94,13 @@ public void testEntityGraphMovieWithActors() throws Exception { public void testEntityGraphMovieWithActorsAndAwards() throws Exception { PersistenceUnitUtil persistenceUnitUtil = entityManager.getEntityManagerFactory().getPersistenceUnitUtil(); List listMoviesWithActorsFetch = - movieBean.listMovies("javax.persistence.fetchgraph", "movieWithActorsAndAwards"); + movieBean.listMovies("javax.persistence.fetchgraph", "movieWithActorsAndAwards"); for (Movie movie : listMoviesWithActorsFetch) { assertTrue(persistenceUnitUtil.isLoaded(movie, "movieActors")); assertFalse(movie.getMovieActors().isEmpty()); for (MovieActor movieActor : movie.getMovieActors()) { assertTrue(persistenceUnitUtil.isLoaded(movieActor, "movieActorAwards") || - !persistenceUnitUtil.isLoaded(movieActor, "movieActorAwards")); + !persistenceUnitUtil.isLoaded(movieActor, "movieActorAwards")); } // https://hibernate.atlassian.net/browse/HHH-8776 @@ -108,12 +108,12 @@ public void testEntityGraphMovieWithActorsAndAwards() throws Exception { // EAGER (movieDirectors), but specification also states that the persistence provider is allowed to fetch // additional state. assertTrue(persistenceUnitUtil.isLoaded(movie, "movieDirectors") || - !persistenceUnitUtil.isLoaded(movie, "movieDirectors")); + !persistenceUnitUtil.isLoaded(movie, "movieDirectors")); assertFalse(persistenceUnitUtil.isLoaded(movie, "movieAwards")); } List listMoviesWithActorsLoad = - movieBean.listMovies("javax.persistence.loadgraph", "movieWithActorsAndAwards"); + movieBean.listMovies("javax.persistence.loadgraph", "movieWithActorsAndAwards"); for (Movie movie : listMoviesWithActorsLoad) { // https://java.net/jira/browse/GLASSFISH-21200 // Glassfish is not processing "javax.persistence.loadgraph". @@ -165,7 +165,7 @@ public void testEntityGraphWithNamedParameters() throws Exception { // EAGER (movieDirectors), but specification also states that the persistence provider is allowed to fetch // additional state. assertTrue(persistenceUnitUtil.isLoaded(movie, "movieDirectors") || - !persistenceUnitUtil.isLoaded(movie, "movieDirectors")); + !persistenceUnitUtil.isLoaded(movie, "movieDirectors")); assertFalse(persistenceUnitUtil.isLoaded(movie, "movieAwards")); } } @@ -175,7 +175,7 @@ public void testEntityGraphWithNamedParametersList() throws Exception { PersistenceUnitUtil persistenceUnitUtil = entityManager.getEntityManagerFactory().getPersistenceUnitUtil(); // Hibernate fails mixing Entity Graphs and Named Parameters with "IN". Throws NPE List listMoviesByIds = - movieBean.listMoviesByIds(Arrays.asList(1, 2), "javax.persistence.fetchgraph", "movieWithActors"); + movieBean.listMoviesByIds(Arrays.asList(1, 2), "javax.persistence.fetchgraph", "movieWithActors"); assertFalse(listMoviesByIds.isEmpty()); assertEquals(2, listMoviesByIds.size()); @@ -193,7 +193,7 @@ public void testEntityGraphWithNamedParametersList() throws Exception { // EAGER (movieDirectors), but specification also states that the persistence provider is allowed to fetch // additional state. assertTrue(persistenceUnitUtil.isLoaded(movie, "movieDirectors") || - !persistenceUnitUtil.isLoaded(movie, "movieDirectors")); + !persistenceUnitUtil.isLoaded(movie, "movieDirectors")); assertFalse(persistenceUnitUtil.isLoaded(movie, "movieAwards")); } } diff --git a/jpa/extended-pc/pom.xml b/jpa/extended-pc/pom.xml index 5deef5bdb..e31d93c53 100644 --- a/jpa/extended-pc/pom.xml +++ b/jpa/extended-pc/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - extended-pc - war - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + jpa-extended-pc + war + Java EE 7 Sample: jpa - extended-pc + diff --git a/jpa/extended-pc/src/main/java/org/javaee7/jpa/extended/pc/Character.java b/jpa/extended-pc/src/main/java/org/javaee7/jpa/extended/pc/Character.java index 9e7b6287d..d9572c613 100644 --- a/jpa/extended-pc/src/main/java/org/javaee7/jpa/extended/pc/Character.java +++ b/jpa/extended-pc/src/main/java/org/javaee7/jpa/extended/pc/Character.java @@ -12,7 +12,7 @@ * @author Arun Gupta */ @Entity -@Table(name="CHARACTERS") +@Table(name = "CHARACTERS") @NamedQueries({ @NamedQuery(name = Character.FIND_ALL, query = "SELECT c FROM Character c") }) @@ -24,11 +24,12 @@ public class Character implements Serializable { @Id private int id; - - @Column(length=50) + + @Column(length = 50) private String name; - - public Character() { } + + public Character() { + } public Character(int id, String name) { this.id = id; @@ -38,7 +39,7 @@ public Character(int id, String name) { public Character(String name) { this.name = name; } - + public int getId() { return id; } diff --git a/jpa/extended-pc/src/main/java/org/javaee7/jpa/extended/pc/CharactersBean.java b/jpa/extended-pc/src/main/java/org/javaee7/jpa/extended/pc/CharactersBean.java index 7a3141874..f18780cec 100644 --- a/jpa/extended-pc/src/main/java/org/javaee7/jpa/extended/pc/CharactersBean.java +++ b/jpa/extended-pc/src/main/java/org/javaee7/jpa/extended/pc/CharactersBean.java @@ -18,16 +18,16 @@ public class CharactersBean implements Serializable { @PersistenceContext(type = PersistenceContextType.EXTENDED) EntityManager em; - + public void save(Character e) { em.persist(e); } - + @TransactionAttribute(TransactionAttributeType.REQUIRED) public void commitChanges() { } - + public List get() { return em.createNamedQuery(Character.FIND_ALL, Character.class).getResultList(); } diff --git a/jpa/jndi-context/pom.xml b/jpa/jndi-context/pom.xml index 5c6e1ca7e..f68778c5a 100644 --- a/jpa/jndi-context/pom.xml +++ b/jpa/jndi-context/pom.xml @@ -1,15 +1,15 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - jndi-context - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + jpa-jndi-context + 1.0-SNAPSHOT + war + Java EE 7 Sample: jpa - jndi-context + diff --git a/jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/Employee.java b/jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/Employee.java index 3ac0aa6f2..ed09b19f4 100644 --- a/jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/Employee.java +++ b/jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/Employee.java @@ -23,16 +23,17 @@ public class Employee implements Serializable { @Id @GeneratedValue(strategy = GenerationType.AUTO) private int id; - - @Column(length=40) + + @Column(length = 40) private String name; - - public Employee() { } - + + public Employee() { + } + public Employee(String name) { this.name = name; } - + public int getId() { return id; } diff --git a/jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/EmployeeBean.java b/jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/EmployeeBean.java index f6f093272..233e17a8a 100644 --- a/jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/EmployeeBean.java +++ b/jpa/jndi-context/src/main/java/org/javaee7/jpa/jndi/context/EmployeeBean.java @@ -18,7 +18,7 @@ @Stateless public class EmployeeBean { private EntityManager em; - + @PostConstruct public void postConstruct() { try { @@ -28,7 +28,7 @@ public void postConstruct() { Logger.getLogger(EmployeeBean.class.getName()).log(Level.SEVERE, null, ex); } } - + public List get() { return em.createNamedQuery("Employee.findAll", Employee.class).getResultList(); } diff --git a/jpa/jndi-context/src/test/java/org/javaee7/jpa/jndi/context/EntityManagerJndiContextTest.java b/jpa/jndi-context/src/test/java/org/javaee7/jpa/jndi/context/EntityManagerJndiContextTest.java index bf2d26caf..7c931e7b9 100644 --- a/jpa/jndi-context/src/test/java/org/javaee7/jpa/jndi/context/EntityManagerJndiContextTest.java +++ b/jpa/jndi-context/src/test/java/org/javaee7/jpa/jndi/context/EntityManagerJndiContextTest.java @@ -25,9 +25,9 @@ public class EntityManagerJndiContextTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.jndi.context") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.jndi.context") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } diff --git a/jpa/jpa-converter/pom.xml b/jpa/jpa-converter/pom.xml index 1500d1889..3fedaf826 100644 --- a/jpa/jpa-converter/pom.xml +++ b/jpa/jpa-converter/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - jpa-converter - jar - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + jpa-jpa-converter + jar + Java EE 7 Sample: jpa-converter + diff --git a/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCard.java b/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCard.java index a65c92d4d..aabebb52b 100644 --- a/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCard.java +++ b/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCard.java @@ -40,7 +40,8 @@ public boolean equals(Object o) { final CreditCard that = (CreditCard) o; - if (cardNumber != null ? !cardNumber.equals(that.cardNumber) : that.cardNumber != null) return false; + if (cardNumber != null ? !cardNumber.equals(that.cardNumber) : that.cardNumber != null) + return false; return true; } diff --git a/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCardConverter.java b/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCardConverter.java index abb800f47..2754addcb 100644 --- a/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCardConverter.java +++ b/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/CreditCardConverter.java @@ -18,5 +18,5 @@ public String convertToDatabaseColumn(CreditCard attribute) { public CreditCard convertToEntityAttribute(String card) { return new CreditCard(card); } - + } diff --git a/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/Employee.java b/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/Employee.java index c1e151dbb..466893114 100644 --- a/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/Employee.java +++ b/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/Employee.java @@ -14,7 +14,7 @@ * @author Arun Gupta */ @Entity -@Table(name="EMPLOYEE_SCHEMA_CONVERTER") +@Table(name = "EMPLOYEE_SCHEMA_CONVERTER") @NamedQueries({ @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e") }) @@ -23,15 +23,16 @@ public class Employee implements Serializable { @Id private int id; - - @Column(length=50) + + @Column(length = 50) private String name; - + @Convert(converter = CreditCardConverter.class) private CreditCard card; - - public Employee() { } - + + public Employee() { + } + public Employee(String name) { this.name = name; } @@ -40,7 +41,7 @@ public Employee(String name, CreditCard card) { this.name = name; this.card = card; } - + public int getId() { return id; } @@ -77,8 +78,10 @@ public boolean equals(Object o) { final Employee employee = (Employee) o; - if (card != null ? !card.equals(employee.getCard()) : employee.getCard() != null) return false; - if (!name.equals(employee.getName())) return false; + if (card != null ? !card.equals(employee.getCard()) : employee.getCard() != null) + return false; + if (!name.equals(employee.getName())) + return false; return true; } diff --git a/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/EmployeeRepository.java b/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/EmployeeRepository.java index 6310a73e4..9b0dbf0fd 100644 --- a/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/EmployeeRepository.java +++ b/jpa/jpa-converter/src/main/java/org/javaee7/jpa/converter/EmployeeRepository.java @@ -13,11 +13,11 @@ public class EmployeeRepository { @PersistenceContext private EntityManager em; - + public void persist(Employee e) { em.persist(e); } - + public List all() { return em.createNamedQuery("Employee.findAll", Employee.class).getResultList(); } diff --git a/jpa/jpa-converter/src/test/java/org/javaee7/jpa/converter/EmployeeRepositoryTest.java b/jpa/jpa-converter/src/test/java/org/javaee7/jpa/converter/EmployeeRepositoryTest.java index ef045909e..c3f874363 100644 --- a/jpa/jpa-converter/src/test/java/org/javaee7/jpa/converter/EmployeeRepositoryTest.java +++ b/jpa/jpa-converter/src/test/java/org/javaee7/jpa/converter/EmployeeRepositoryTest.java @@ -25,14 +25,14 @@ public class EmployeeRepositoryTest { @Deployment public static Archive createDeployment() { final File[] assertJ = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("org.assertj:assertj-core") - .withTransitivity() - .asFile(); + .resolve("org.assertj:assertj-core") + .withTransitivity() + .asFile(); final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "employee-card-converter-sample.jar") - .addPackage(Employee.class.getPackage()) - .addAsManifestResource("test-persistence.xml", "persistence.xml") - .merge(metaInfFolder(), "/META-INF", Filters.include(".*\\.sql")); + .addPackage(Employee.class.getPackage()) + .addAsManifestResource("test-persistence.xml", "persistence.xml") + .merge(metaInfFolder(), "/META-INF", Filters.include(".*\\.sql")); mergeDependencies(archive, assertJ); return archive; @@ -49,9 +49,9 @@ public void should_return_all_employee_records() throws Exception { // then assertThat(employees).hasSize(6) - .contains(employee("Leonard", "11-22-33-44"), employee("Sheldon", "22-33-44-55"), - employee("Penny", "33-44-55-66"), employee("Raj", "44-55-66-77"), - employee("Howard", "55-66-77-88"), employee("Bernadette", "66-77-88-99")); + .contains(employee("Leonard", "11-22-33-44"), employee("Sheldon", "22-33-44-55"), + employee("Penny", "33-44-55-66"), employee("Raj", "44-55-66-77"), + employee("Howard", "55-66-77-88"), employee("Bernadette", "66-77-88-99")); } // -- Test utility methods @@ -61,7 +61,7 @@ private static Employee employee(String name, String creditCardNumber) { return new Employee(name, creditCard); } - private static void mergeDependencies(JavaArchive archive, File ... dependencies) { + private static void mergeDependencies(JavaArchive archive, File... dependencies) { for (File file : dependencies) { archive.merge(ShrinkWrap.createFromZipFile(JavaArchive.class, file)); } @@ -69,8 +69,8 @@ private static void mergeDependencies(JavaArchive archive, File ... dependencies private static GenericArchive metaInfFolder() { return ShrinkWrap.create(GenericArchive.class) - .as(ExplodedImporter.class) - .importDirectory("src/main/resources/META-INF") - .as(GenericArchive.class); + .as(ExplodedImporter.class) + .importDirectory("src/main/resources/META-INF") + .as(GenericArchive.class); } } diff --git a/jpa/listeners-injection/pom.xml b/jpa/listeners-injection/pom.xml index 21abb15eb..5473c3ab7 100644 --- a/jpa/listeners-injection/pom.xml +++ b/jpa/listeners-injection/pom.xml @@ -1,15 +1,15 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - listeners-injection + jpa-listeners-injection war - JPA Listeners Injection + Java EE 7 Sample: jpa - listeners-injection JPA 2.1 Entity Listeners injection diff --git a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java index 578fd0df5..b3b7e5d7d 100644 --- a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java +++ b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Movie.java @@ -29,11 +29,11 @@ public class Movie implements Serializable { @Id @NotNull private Integer id; - + @NotNull @Size(min = 1, max = 50) private String name; - + @NotNull @Size(min = 1, max = 200) private String actors; @@ -88,8 +88,12 @@ public void setRating(Integer rating) { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Movie movie = (Movie) o; diff --git a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/MovieBean.java b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/MovieBean.java index 131fdf2c6..e68da1a07 100644 --- a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/MovieBean.java +++ b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/MovieBean.java @@ -14,8 +14,8 @@ public class MovieBean { public Movie getMovieByName(String name) { return em.createNamedQuery(Movie.FIND_BY_NAME, Movie.class) - .setParameter("name", name) - .getSingleResult(); + .setParameter("name", name) + .getSingleResult(); } } diff --git a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Rating.java b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Rating.java index 120394fe6..d69345d14 100644 --- a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Rating.java +++ b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/Rating.java @@ -15,7 +15,7 @@ @Entity @Table(name = "MOVIE_RATINGS") @NamedQueries({ - @NamedQuery(name = Rating.FIND_BY_NAME, query = "SELECT r FROM Rating r WHERE r.name = :name") + @NamedQuery(name = Rating.FIND_BY_NAME, query = "SELECT r FROM Rating r WHERE r.name = :name") }) public class Rating implements Serializable { @@ -59,8 +59,10 @@ public void setRating(Integer rating) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Rating)) return false; + if (this == o) + return true; + if (!(o instanceof Rating)) + return false; Rating ratings = (Rating) o; diff --git a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/RatingService.java b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/RatingService.java index 468fb50e8..6ac91a7fc 100644 --- a/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/RatingService.java +++ b/jpa/listeners-injection/src/main/java/org/javaee7/jpa/listeners/RatingService.java @@ -15,9 +15,9 @@ public class RatingService { public Integer movieRating(String name) { return em.createNamedQuery(Rating.FIND_BY_NAME, Rating.class) - .setParameter("name", name) - .getSingleResult() - .getRating(); + .setParameter("name", name) + .getSingleResult() + .getRating(); } } diff --git a/jpa/listeners/pom.xml b/jpa/listeners/pom.xml index 020c0a9b3..191990bec 100644 --- a/jpa/listeners/pom.xml +++ b/jpa/listeners/pom.xml @@ -1,15 +1,15 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - jpa-listeners war - JPA Listeners + Java EE 7 Sample: jpa - listeners Invocation examples of all the available Entity Listeners diff --git a/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/Movie.java b/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/Movie.java index de4b086e2..34b18d9c3 100644 --- a/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/Movie.java +++ b/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/Movie.java @@ -21,7 +21,7 @@ @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"), @NamedQuery(name = "Movie.findById", query = "SELECT m FROM Movie m WHERE m.id = :id"), @NamedQuery(name = "Movie.findByName", query = "SELECT m FROM Movie m WHERE m.name = :name"), - @NamedQuery(name = "Movie.findByActors", query = "SELECT m FROM Movie m WHERE m.actors = :actors")}) + @NamedQuery(name = "Movie.findByActors", query = "SELECT m FROM Movie m WHERE m.actors = :actors") }) @EntityListeners(MovieListener.class) public class Movie implements Serializable { @@ -29,11 +29,11 @@ public class Movie implements Serializable { @Id @NotNull private Integer id; - + @NotNull @Size(min = 1, max = 50) private String name; - + @NotNull @Size(min = 1, max = 200) private String actors; @@ -77,8 +77,12 @@ public void setActors(String actors) { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Movie movie = (Movie) o; diff --git a/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/MovieBean.java b/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/MovieBean.java index a1756de32..290a91238 100644 --- a/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/MovieBean.java +++ b/jpa/listeners/src/main/java/org/javaee7/jpa/listeners/MovieBean.java @@ -25,8 +25,8 @@ public void createMovie() { public void updateMovie() { Movie m = em.createNamedQuery("Movie.findByName", Movie.class) - .setParameter("name", "Inception") - .getSingleResult(); + .setParameter("name", "Inception") + .getSingleResult(); m.setName("Inception2"); em.merge(m); em.flush(); @@ -34,8 +34,8 @@ public void updateMovie() { public void deleteMovie() { Movie m = em.createNamedQuery("Movie.findByName", Movie.class) - .setParameter("name", "Inception2") - .getSingleResult(); + .setParameter("name", "Inception2") + .getSingleResult(); em.remove(m); em.flush(); } diff --git a/jpa/listeners/src/test/java/org/javaee7/jpa/listeners/JpaListenersTest.java b/jpa/listeners/src/test/java/org/javaee7/jpa/listeners/JpaListenersTest.java index b27d83934..346ce9d66 100644 --- a/jpa/listeners/src/test/java/org/javaee7/jpa/listeners/JpaListenersTest.java +++ b/jpa/listeners/src/test/java/org/javaee7/jpa/listeners/JpaListenersTest.java @@ -52,11 +52,11 @@ public class JpaListenersTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.listeners") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.listeners") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } @@ -67,37 +67,36 @@ public static WebArchive createDeployment() { */ @Test public void testListeners() throws Exception { - List movies = movieBean.listMovies(); // <1> 4 movies in the database, so +@PostLoad+ method called 4x + List movies = movieBean.listMovies(); // <1> 4 movies in the database, so +@PostLoad+ method called 4x assertEquals(4, movies.size()); assertFalse(prePersistInvoked); assertFalse(postPersistInvoked); - movieBean.createMovie(); // <2> On persist both +@PrePersist+ and +@PostPersist+ are called + movieBean.createMovie(); // <2> On persist both +@PrePersist+ and +@PostPersist+ are called assertTrue(prePersistInvoked); assertTrue(postPersistInvoked); - movies = movieBean.listMovies(); // <3> 5 movies now, so +@PostLoad+ method called 5x + movies = movieBean.listMovies(); // <3> 5 movies now, so +@PostLoad+ method called 5x assertEquals(5, movies.size()); assertTrue(movies.contains(new Movie(5))); - assertFalse(preUpdateInvoked); assertFalse(postUpdateInvoked); - movieBean.updateMovie(); // <4> On merge both +@PreUpdate+ and +@PostUpdate+ are called + movieBean.updateMovie(); // <4> On merge both +@PreUpdate+ and +@PostUpdate+ are called assertTrue(preUpdateInvoked); assertTrue(postUpdateInvoked); - movies = movieBean.listMovies(); // <5> Still 5 mpvies, so +@PostLoad+ method called again 5x + movies = movieBean.listMovies(); // <5> Still 5 mpvies, so +@PostLoad+ method called again 5x assertEquals(5, movies.size()); assertEquals("Inception2", movies.get(2).getName()); assertFalse(preRemoveInvoked); assertFalse(postRemoveInvoked); - movieBean.deleteMovie(); // <6> On remove both +@PreRemove+ and +@PostRemove+ are called + movieBean.deleteMovie(); // <6> On remove both +@PreRemove+ and +@PostRemove+ are called assertTrue(preRemoveInvoked); assertTrue(postRemoveInvoked); - movies = movieBean.listMovies(); // <7> 4 movies now, so +@PostLoad+ method called 4x + movies = movieBean.listMovies(); // <7> 4 movies now, so +@PostLoad+ method called 4x assertFalse(movies.isEmpty()); assertEquals(4, movies.size()); assertFalse(movies.contains(new Movie(3))); diff --git a/jpa/locking-optimistic/pom.xml b/jpa/locking-optimistic/pom.xml index e939d5948..e5383fb80 100644 --- a/jpa/locking-optimistic/pom.xml +++ b/jpa/locking-optimistic/pom.xml @@ -1,22 +1,22 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - locking-optimistic - 1.0-SNAPSHOT - war - - - - org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl-javaee - - - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + jpa-locking-optimistic + 1.0-SNAPSHOT + war + Java EE 7 Sample: jpa - locking-optimistic + + + + org.jboss.shrinkwrap.descriptors + shrinkwrap-descriptors-impl-javaee + + + diff --git a/jpa/locking-optimistic/src/main/java/org/javaee7/jpa/locking/optimistic/Movie.java b/jpa/locking-optimistic/src/main/java/org/javaee7/jpa/locking/optimistic/Movie.java index b9e73c82e..614d4c035 100644 --- a/jpa/locking-optimistic/src/main/java/org/javaee7/jpa/locking/optimistic/Movie.java +++ b/jpa/locking-optimistic/src/main/java/org/javaee7/jpa/locking/optimistic/Movie.java @@ -11,7 +11,7 @@ @Entity @Table(name = "MOVIE_OPTIMISTIC") @NamedQueries({ - @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"), + @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"), }) public class Movie implements Serializable { @Id @@ -63,8 +63,12 @@ public void setActors(String actors) { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Movie movie = (Movie) o; @@ -81,15 +85,15 @@ public int hashCode() { @Override public String toString() { return "Movie{id=" + - id + - ", version=" + - version + - ", name='" + - name + - '\'' + - ", actors='" + - actors + - '\'' + - '}'; + id + + ", version=" + + version + + ", name='" + + name + + '\'' + + ", actors='" + + actors + + '\'' + + '}'; } } diff --git a/jpa/locking-optimistic/src/test/java/org/javaee7/jpa/locking/optimistic/LockingOptimisticTest.java b/jpa/locking-optimistic/src/test/java/org/javaee7/jpa/locking/optimistic/LockingOptimisticTest.java index 60c1b1752..47befacb3 100644 --- a/jpa/locking-optimistic/src/test/java/org/javaee7/jpa/locking/optimistic/LockingOptimisticTest.java +++ b/jpa/locking-optimistic/src/test/java/org/javaee7/jpa/locking/optimistic/LockingOptimisticTest.java @@ -35,13 +35,13 @@ public static WebArchive createDeployment() { BeansDescriptor beansXml = Descriptors.create(BeansDescriptor.class); WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.locking.optimistic") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/load.sql") - .addAsWebInfResource( - new StringAsset(beansXml.createAlternatives() - .clazz(MovieBeanAlternative.class.getName()).up().exportAsString()), - beansXml.getDescriptorName()); + .addPackage("org.javaee7.jpa.locking.optimistic") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/load.sql") + .addAsWebInfResource( + new StringAsset(beansXml.createAlternatives() + .clazz(MovieBeanAlternative.class.getName()).up().exportAsString()), + beansXml.getDescriptorName()); System.out.println(war.toString(true)); return war; } diff --git a/jpa/locking-pessimistic/pom.xml b/jpa/locking-pessimistic/pom.xml index 5b782abbf..1052fb1b4 100644 --- a/jpa/locking-pessimistic/pom.xml +++ b/jpa/locking-pessimistic/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jpa - locking-pessimistic - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jpa-locking-pessimistic + 1.0-SNAPSHOT + war + Java EE 7 Sample: jpa - locking-pessimistic + diff --git a/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/Movie.java b/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/Movie.java index 417d268c1..5da5f84fd 100644 --- a/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/Movie.java +++ b/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/Movie.java @@ -20,7 +20,7 @@ @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"), @NamedQuery(name = "Movie.findById", query = "SELECT m FROM Movie m WHERE m.id = :id"), @NamedQuery(name = "Movie.findByName", query = "SELECT m FROM Movie m WHERE m.name = :name"), - @NamedQuery(name = "Movie.findByActors", query = "SELECT m FROM Movie m WHERE m.actors = :actors")}) + @NamedQuery(name = "Movie.findByActors", query = "SELECT m FROM Movie m WHERE m.actors = :actors") }) public class Movie implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -30,11 +30,11 @@ public class Movie implements Serializable { @NotNull @Size(min = 1, max = 50) private String name; - + @NotNull @Size(min = 1, max = 200) private String actors; - + public Movie() { } @@ -76,5 +76,5 @@ public void setActors(String actors) { public String toString() { return name; } - + } diff --git a/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/MovieBean.java b/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/MovieBean.java index c5dd8e9f1..22cdc046c 100644 --- a/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/MovieBean.java +++ b/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/MovieBean.java @@ -26,11 +26,11 @@ public void updateMovie() { em.merge(m); em.flush(); } - + public void deleteMovie() { Movie m = em.find(Movie.class, 1, LockModeType.PESSIMISTIC_WRITE); em.remove(m); em.flush(); } - + } diff --git a/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/TestServlet.java b/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/TestServlet.java index f13d740d7..87b181183 100644 --- a/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/TestServlet.java +++ b/jpa/locking-pessimistic/src/main/java/org/javaee7/jpa/locking/pessimistic/TestServlet.java @@ -12,10 +12,11 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { - - @EJB MovieBean bean; + + @EJB + MovieBean bean; /** * Processes requests for both HTTP @@ -28,7 +29,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -43,7 +44,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re for (Movie m : bean.listMovies()) { out.println(m.getName() + "
"); } - + out.println("

Updating a movie
"); bean.updateMovie(); out.println("Listing movies"); @@ -56,7 +57,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re for (Movie m : bean.listMovies()) { out.println(m.getName() + "
"); } - + out.println(""); out.println(""); } @@ -73,7 +74,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re * @throws IOException if an I/O error occurs */ protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -87,7 +88,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) * @throws IOException if an I/O error occurs */ protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jpa/multiple-pu/pom.xml b/jpa/multiple-pu/pom.xml index 046d86418..66c65eb8e 100644 --- a/jpa/multiple-pu/pom.xml +++ b/jpa/multiple-pu/pom.xml @@ -1,14 +1,15 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - multiple-pu + jpa-multiple-pu 1.0-SNAPSHOT war + Java EE 7 Sample: jpa - multiple-pu diff --git a/jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/Movie.java b/jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/Movie.java index 0e21e6703..7f41f9e2a 100644 --- a/jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/Movie.java +++ b/jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/Movie.java @@ -11,7 +11,7 @@ @Entity @Table(name = "MOVIE_MULTIPLE_PU") @NamedQueries({ - @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"), + @NamedQuery(name = "Movie.findAll", query = "SELECT m FROM Movie m"), }) public class Movie implements Serializable { @Id @@ -52,8 +52,12 @@ public void setActors(String actors) { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Movie movie = (Movie) o; diff --git a/jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/ProductCode.java b/jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/ProductCode.java index e513dac11..136f7ad8b 100644 --- a/jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/ProductCode.java +++ b/jpa/multiple-pu/src/main/java/org/javaee7/jpa/multiple/pu/ProductCode.java @@ -22,7 +22,7 @@ @NamedQuery(name = "ProductCode.findAll", query = "SELECT p FROM ProductCode p"), @NamedQuery(name = "ProductCode.findByProdCode", query = "SELECT p FROM ProductCode p WHERE p.prodCode = :prodCode"), @NamedQuery(name = "ProductCode.findByDiscountCode", query = "SELECT p FROM ProductCode p WHERE p.discountCode = :discountCode"), - @NamedQuery(name = "ProductCode.findByDescription", query = "SELECT p FROM ProductCode p WHERE p.description = :description")}) + @NamedQuery(name = "ProductCode.findByDescription", query = "SELECT p FROM ProductCode p WHERE p.description = :description") }) public class ProductCode implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -99,5 +99,5 @@ public boolean equals(Object object) { public String toString() { return "org.javaee7.jpa.multiple.pu.ProductCode[ prodCode=" + prodCode + " ]"; } - + } diff --git a/jpa/multiple-pu/src/test/java/org/javaee7/jpa/multiple/pu/MultiplePuTest.java b/jpa/multiple-pu/src/test/java/org/javaee7/jpa/multiple/pu/MultiplePuTest.java index 0c666b680..fbfa1b845 100644 --- a/jpa/multiple-pu/src/test/java/org/javaee7/jpa/multiple/pu/MultiplePuTest.java +++ b/jpa/multiple-pu/src/test/java/org/javaee7/jpa/multiple/pu/MultiplePuTest.java @@ -24,11 +24,11 @@ public class MultiplePuTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.multiple.pu") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.multiple.pu") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } diff --git a/jpa/native-sql-resultset-mapping/pom.xml b/jpa/native-sql-resultset-mapping/pom.xml index a366ef370..2644f0fc0 100644 --- a/jpa/native-sql-resultset-mapping/pom.xml +++ b/jpa/native-sql-resultset-mapping/pom.xml @@ -1,18 +1,17 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - native-sql-resultset-mapping - war - JPA Native SQL ResultSet Mapping - Using the EntityManager API to perform native SQL queries and map the result with @SqlResultSetMapping - annotation - - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + jpa-native-sql-resultset-mapping + war + Java EE 7 Sample: jpa - native-sql-resultset-mapping + Using the EntityManager API to perform native SQL queries and map the result with @SqlResultSetMapping + annotation + + diff --git a/jpa/native-sql-resultset-mapping/src/main/java/org/javaee7/jpa/nativesql/resultset/mapping/Employee.java b/jpa/native-sql-resultset-mapping/src/main/java/org/javaee7/jpa/nativesql/resultset/mapping/Employee.java index 4b157ff94..7fb403b56 100644 --- a/jpa/native-sql-resultset-mapping/src/main/java/org/javaee7/jpa/nativesql/resultset/mapping/Employee.java +++ b/jpa/native-sql-resultset-mapping/src/main/java/org/javaee7/jpa/nativesql/resultset/mapping/Employee.java @@ -9,9 +9,9 @@ @Entity @Table(name = "EMPLOYEE_NATIVE_SQL_RESULTSET_MAPPING") @SqlResultSetMapping(name = "myMapping", - entities = {@EntityResult(entityClass = Employee.class, - fields = {@FieldResult(name = "identifier", column = "id"), - @FieldResult(name = "simpleName", column = "name")})}) + entities = { @EntityResult(entityClass = Employee.class, + fields = { @FieldResult(name = "identifier", column = "id"), + @FieldResult(name = "simpleName", column = "name") }) }) public class Employee implements Serializable { private static final long serialVersionUID = 1L; @Id diff --git a/jpa/native-sql-resultset-mapping/src/test/java/org/javaee7/jpa/nativesql/resultset/mapping/JpaNativeSqlResultSetMappingTest.java b/jpa/native-sql-resultset-mapping/src/test/java/org/javaee7/jpa/nativesql/resultset/mapping/JpaNativeSqlResultSetMappingTest.java index 1005ea77e..49301747e 100644 --- a/jpa/native-sql-resultset-mapping/src/test/java/org/javaee7/jpa/nativesql/resultset/mapping/JpaNativeSqlResultSetMappingTest.java +++ b/jpa/native-sql-resultset-mapping/src/test/java/org/javaee7/jpa/nativesql/resultset/mapping/JpaNativeSqlResultSetMappingTest.java @@ -49,11 +49,11 @@ public class JpaNativeSqlResultSetMappingTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.nativesql.resultset.mapping") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.nativesql.resultset.mapping") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } diff --git a/jpa/native-sql/pom.xml b/jpa/native-sql/pom.xml index dda1b24e5..711abfec2 100644 --- a/jpa/native-sql/pom.xml +++ b/jpa/native-sql/pom.xml @@ -1,16 +1,15 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - native-sql - war - JPA Native SQL - Using the EntityManager API to perform native SQL queries - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + jpa-native-sql + war + Java EE 7 Sample: jpa - native-sql + Using the EntityManager API to perform native SQL queries + diff --git a/jpa/native-sql/src/main/java/org/javaee7/jpa/nativesql/Employee.java b/jpa/native-sql/src/main/java/org/javaee7/jpa/nativesql/Employee.java index 185aec157..2701cc32c 100644 --- a/jpa/native-sql/src/main/java/org/javaee7/jpa/nativesql/Employee.java +++ b/jpa/native-sql/src/main/java/org/javaee7/jpa/nativesql/Employee.java @@ -10,21 +10,22 @@ * @author Arun Gupta */ @Entity -@Table(name="EMPLOYEE_NATIVE_SQL") +@Table(name = "EMPLOYEE_NATIVE_SQL") public class Employee implements Serializable { private static final long serialVersionUID = 1L; @Id private int id; - - @Column(length=50) + + @Column(length = 50) private String name; - - public Employee() { } - + + public Employee() { + } + public Employee(String name) { this.name = name; } - + public int getId() { return id; } diff --git a/jpa/native-sql/src/test/java/org/javaee7/jpa/nativesql/JpaNativeSqlTest.java b/jpa/native-sql/src/test/java/org/javaee7/jpa/nativesql/JpaNativeSqlTest.java index 63e8f57da..0c5412416 100644 --- a/jpa/native-sql/src/test/java/org/javaee7/jpa/nativesql/JpaNativeSqlTest.java +++ b/jpa/native-sql/src/test/java/org/javaee7/jpa/nativesql/JpaNativeSqlTest.java @@ -48,11 +48,11 @@ public class JpaNativeSqlTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.nativesql") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.nativesql") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } diff --git a/jpa/ordercolumn/pom.xml b/jpa/ordercolumn/pom.xml index 1192dd790..6fe219eda 100644 --- a/jpa/ordercolumn/pom.xml +++ b/jpa/ordercolumn/pom.xml @@ -1,14 +1,14 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - ordercolumn + jpa-ordercolumn war - + Java EE 7 Sample: jpa - ordercolumn diff --git a/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionaljoin/Child.java b/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionaljoin/Child.java index 9dd2113f8..8ab8cdf1d 100644 --- a/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionaljoin/Child.java +++ b/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionaljoin/Child.java @@ -11,28 +11,28 @@ @Entity public class Child { - @Id - @GeneratedValue(strategy = IDENTITY) - private Long id; + @Id + @GeneratedValue(strategy = IDENTITY) + private Long id; - @ManyToOne - @JoinColumn(name = "parent_id", insertable = false, updatable = false) - private Parent parent; + @ManyToOne + @JoinColumn(name = "parent_id", insertable = false, updatable = false) + private Parent parent; - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public Parent getParent() { - return parent; - } + public Parent getParent() { + return parent; + } - public void setParent(Parent parent) { - this.parent = parent; - } + public void setParent(Parent parent) { + this.parent = parent; + } } diff --git a/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionalmappedby/Child.java b/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionalmappedby/Child.java index 555367b4d..d9c3ca63e 100644 --- a/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionalmappedby/Child.java +++ b/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionalmappedby/Child.java @@ -16,7 +16,7 @@ public class Child { @ManyToOne private Parent parent; - + public Long getId() { return id; } diff --git a/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionalmappedby/Parent.java b/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionalmappedby/Parent.java index 197150f82..b8c783be7 100644 --- a/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionalmappedby/Parent.java +++ b/jpa/ordercolumn/src/main/java/org/javaee7/jpa/ordercolumn/entity/bidirectionalmappedby/Parent.java @@ -16,28 +16,28 @@ @Entity public class Parent { - @Id - @GeneratedValue(strategy = IDENTITY) - private Long id; + @Id + @GeneratedValue(strategy = IDENTITY) + private Long id; - @OneToMany(cascade = ALL, fetch = EAGER, mappedBy = "parent") - @OrderColumn - private List children = new ArrayList<>(); + @OneToMany(cascade = ALL, fetch = EAGER, mappedBy = "parent") + @OrderColumn + private List children = new ArrayList<>(); - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public List getChildren() { - return children; - } + public List getChildren() { + return children; + } - public void setChildren(List children) { - this.children = children; - } + public void setChildren(List children) { + this.children = children; + } } diff --git a/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnBiJoinTest.java b/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnBiJoinTest.java index 516e0b3f9..d51a46a68 100644 --- a/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnBiJoinTest.java +++ b/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnBiJoinTest.java @@ -58,9 +58,9 @@ public class OrderColumnBiJoinTest { @Deployment private static Archive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addPackages(true, Child.class.getPackage()) - .addPackages(true, OrderColumnTesterService.class.getPackage()) - .addAsResource("META-INF/persistence.xml"); + .addPackages(true, Child.class.getPackage()) + .addPackages(true, OrderColumnTesterService.class.getPackage()) + .addAsResource("META-INF/persistence.xml"); } @EJB @@ -84,9 +84,8 @@ public void saveInOneGo() { // Reload parent fresh from data source again Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } /** @@ -122,9 +121,8 @@ public void saveParentSeparatelyFirst() { Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } @@ -148,9 +146,8 @@ public void saveParentWithOneChildFirst() { Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } @Test @@ -175,9 +172,8 @@ public void saveParentWithChildrenThenDeleteOned() { Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("3 children added to parent and saved, but after re-loading number of chilren different", - 3, savedParent.getChildren().size() - ); + assertEquals("3 children added to parent and saved, but after re-loading number of chilren different", + 3, savedParent.getChildren().size()); // Removing child at position 1 and saving again savedParent.getChildren().remove(1); @@ -185,9 +181,8 @@ public void saveParentWithChildrenThenDeleteOned() { savedParent = indexColumnTesterService.save(savedParent); savedParent = indexColumnTesterService.getParentById(savedParent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } diff --git a/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnBiMappedByTest.java b/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnBiMappedByTest.java index a149b04a6..fb8bfff6e 100644 --- a/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnBiMappedByTest.java +++ b/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnBiMappedByTest.java @@ -59,9 +59,9 @@ public class OrderColumnBiMappedByTest { @Deployment private static Archive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addPackages(true, Parent.class.getPackage()) - .addPackages(true, OrderColumnTesterService.class.getPackage()) - .addAsResource("META-INF/persistence.xml"); + .addPackages(true, Parent.class.getPackage()) + .addPackages(true, OrderColumnTesterService.class.getPackage()) + .addAsResource("META-INF/persistence.xml"); } @EJB @@ -85,9 +85,8 @@ public void saveInOneGo() { Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } /** @@ -123,9 +122,8 @@ public void saveParentSeparatelyFirst() { Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } diff --git a/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnUniTest.java b/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnUniTest.java index 67079628d..249870f0e 100644 --- a/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnUniTest.java +++ b/jpa/ordercolumn/src/test/java/org/javaee7/jpa/ordercolumn/OrderColumnUniTest.java @@ -53,9 +53,9 @@ public class OrderColumnUniTest { @Deployment private static Archive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addPackages(true, Child.class.getPackage()) - .addPackages(true, OrderColumnTesterService.class.getPackage()) - .addAsResource("META-INF/persistence.xml"); + .addPackages(true, Child.class.getPackage()) + .addPackages(true, OrderColumnTesterService.class.getPackage()) + .addAsResource("META-INF/persistence.xml"); } @EJB @@ -90,9 +90,8 @@ public void saveInOneGo() { Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } /** @@ -125,9 +124,8 @@ public void saveParentSeparatelyFirst() { Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } @@ -163,9 +161,8 @@ public void saveParentWithOneChildFirst() { Parent savedParent = indexColumnTesterService.getParentById(parent.getId()); - assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", - 2, savedParent.getChildren().size() - ); + assertEquals("2 children added to parent and saved, but after re-loading number of chilren different", + 2, savedParent.getChildren().size()); } diff --git a/jpa/pom.xml b/jpa/pom.xml index 149993892..7e5a236a4 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -1,18 +1,18 @@ 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT pom - Java EE 7 JPA Samples + Java EE 7 Sample: jpa criteria @@ -43,6 +43,7 @@ jpa-converter default-datasource + org.javaee7 diff --git a/jpa/pu-typesafe/pom.xml b/jpa/pu-typesafe/pom.xml index 184b18b73..bcbc6eaa8 100644 --- a/jpa/pu-typesafe/pom.xml +++ b/jpa/pu-typesafe/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - - org.javaee7.jpa - pu-typesafe + + org.javaee7 + jpa-pu-typesafe 1.0-SNAPSHOT war + Java EE 7 Sample: jpa - pu-typesafe diff --git a/jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/DefaultDatabase.java b/jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/DefaultDatabase.java index fb03b90c9..495240ee3 100644 --- a/jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/DefaultDatabase.java +++ b/jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/DefaultDatabase.java @@ -14,6 +14,6 @@ */ @Qualifier @Retention(RUNTIME) -@Target({METHOD, FIELD, PARAMETER, TYPE}) +@Target({ METHOD, FIELD, PARAMETER, TYPE }) public @interface DefaultDatabase { } diff --git a/jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/Movie.java b/jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/Movie.java index 89b4ed588..ff5b1df35 100644 --- a/jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/Movie.java +++ b/jpa/pu-typesafe/src/main/java/org/javaee7/jpa/pu/typesafe/Movie.java @@ -52,8 +52,12 @@ public void setActors(String actors) { @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Movie movie = (Movie) o; diff --git a/jpa/pu-typesafe/src/test/java/org/javaee7/jpa/pu/typesafe/PuTypesafeTest.java b/jpa/pu-typesafe/src/test/java/org/javaee7/jpa/pu/typesafe/PuTypesafeTest.java index d139c06c3..59746d079 100644 --- a/jpa/pu-typesafe/src/test/java/org/javaee7/jpa/pu/typesafe/PuTypesafeTest.java +++ b/jpa/pu-typesafe/src/test/java/org/javaee7/jpa/pu/typesafe/PuTypesafeTest.java @@ -32,11 +32,11 @@ public class PuTypesafeTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.pu.typesafe") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.pu.typesafe") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } @@ -54,7 +54,7 @@ public void testPuTypesafe() throws Exception { assertArrayEquals(movies.toArray(), defaultFindAll.toArray()); List persistenceContextFindAll = - persistenceContextEM.createNamedQuery("Movie.findAll", Movie.class).getResultList(); + persistenceContextEM.createNamedQuery("Movie.findAll", Movie.class).getResultList(); assertArrayEquals(movies.toArray(), persistenceContextFindAll.toArray()); } diff --git a/jpa/schema-gen-index/pom.xml b/jpa/schema-gen-index/pom.xml index 8f962972e..992de1869 100644 --- a/jpa/schema-gen-index/pom.xml +++ b/jpa/schema-gen-index/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - - schema-gen-index + + jpa-schema-gen-index war + Java EE 7 Sample: jpa - schema-gen-index diff --git a/jpa/schema-gen-index/src/test/java/org/javaee7/jpa/index/SchemaGenIndexTest.java b/jpa/schema-gen-index/src/test/java/org/javaee7/jpa/index/SchemaGenIndexTest.java index d96f02b3c..f80b48af7 100644 --- a/jpa/schema-gen-index/src/test/java/org/javaee7/jpa/index/SchemaGenIndexTest.java +++ b/jpa/schema-gen-index/src/test/java/org/javaee7/jpa/index/SchemaGenIndexTest.java @@ -23,8 +23,8 @@ public class SchemaGenIndexTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.index") - .addAsResource("META-INF/persistence.xml"); + .addPackage("org.javaee7.jpa.index") + .addAsResource("META-INF/persistence.xml"); System.out.println(war.toString(true)); return war; } diff --git a/jpa/schema-gen-metadata/pom.xml b/jpa/schema-gen-metadata/pom.xml index 6238e013b..4c26af3e8 100644 --- a/jpa/schema-gen-metadata/pom.xml +++ b/jpa/schema-gen-metadata/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - - schema-gen-metadata + + jpa-schema-gen-metadata war + Java EE 7 Sample: jpa - schema-gen-metadata diff --git a/jpa/schema-gen-metadata/src/main/java/org/javaee7/jpa/schemagen/metadata/Employee.java b/jpa/schema-gen-metadata/src/main/java/org/javaee7/jpa/schemagen/metadata/Employee.java index d15b245c7..3f7e44d58 100644 --- a/jpa/schema-gen-metadata/src/main/java/org/javaee7/jpa/schemagen/metadata/Employee.java +++ b/jpa/schema-gen-metadata/src/main/java/org/javaee7/jpa/schemagen/metadata/Employee.java @@ -23,16 +23,17 @@ public class Employee implements Serializable { @Id @GeneratedValue(strategy = GenerationType.AUTO) private int id; - - @Column(length=40) + + @Column(length = 40) private String name; - - public Employee() { } - + + public Employee() { + } + public Employee(String name) { this.name = name; } - + public int getId() { return id; } diff --git a/jpa/schema-gen-metadata/src/main/java/org/javaee7/jpa/schemagen/metadata/EmployeeBean.java b/jpa/schema-gen-metadata/src/main/java/org/javaee7/jpa/schemagen/metadata/EmployeeBean.java index f67326402..fa35dda4c 100644 --- a/jpa/schema-gen-metadata/src/main/java/org/javaee7/jpa/schemagen/metadata/EmployeeBean.java +++ b/jpa/schema-gen-metadata/src/main/java/org/javaee7/jpa/schemagen/metadata/EmployeeBean.java @@ -13,11 +13,11 @@ public class EmployeeBean { @PersistenceContext EntityManager em; - + public void persist(Employee e) { em.persist(e); } - + public List get() { return em.createNamedQuery("Employee.findAll", Employee.class).getResultList(); } diff --git a/jpa/schema-gen-metadata/src/test/java/org/javaee7/jpa/schemagen/metadata/EmployeeBeanTest.java b/jpa/schema-gen-metadata/src/test/java/org/javaee7/jpa/schemagen/metadata/EmployeeBeanTest.java index 123fd5172..4905ff11c 100644 --- a/jpa/schema-gen-metadata/src/test/java/org/javaee7/jpa/schemagen/metadata/EmployeeBeanTest.java +++ b/jpa/schema-gen-metadata/src/test/java/org/javaee7/jpa/schemagen/metadata/EmployeeBeanTest.java @@ -24,10 +24,10 @@ public class EmployeeBeanTest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(Employee.class, - EmployeeBean.class) - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/load.sql"); + .addClasses(Employee.class, + EmployeeBean.class) + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/load.sql"); } @Test diff --git a/jpa/schema-gen-scripts-external/pom.xml b/jpa/schema-gen-scripts-external/pom.xml index 1e06e07a1..aa4c262d8 100644 --- a/jpa/schema-gen-scripts-external/pom.xml +++ b/jpa/schema-gen-scripts-external/pom.xml @@ -1,16 +1,16 @@ - - - 4.0.0 - - jpa-samples - org.javaee7.jpa - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jpa-samples - schema-gen-scripts-external - 1.0-SNAPSHOT - war - - + + + 4.0.0 + + + jpa + org.javaee7 + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jpa-schema-gen-scripts-external + 1.0-SNAPSHOT + war + Java EE 7 Sample: jpa - schema-gen-scripts-external + diff --git a/jpa/schema-gen-scripts-external/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/external/Employee.java b/jpa/schema-gen-scripts-external/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/external/Employee.java index 57d7b914e..3b221922e 100644 --- a/jpa/schema-gen-scripts-external/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/external/Employee.java +++ b/jpa/schema-gen-scripts-external/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/external/Employee.java @@ -12,7 +12,7 @@ * @author Arun Gupta */ @Entity -@Table(name="EMPLOYEE_SCHEMA_GEN_SCRIPTS_EXTERNAL") +@Table(name = "EMPLOYEE_SCHEMA_GEN_SCRIPTS_EXTERNAL") @NamedQueries({ @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e") }) @@ -20,10 +20,10 @@ public class Employee implements Serializable { private static final long serialVersionUID = 1L; @Id private int id; - - @Column(length=50) + + @Column(length = 50) private String name; - + public int getId() { return id; } diff --git a/jpa/schema-gen-scripts-external/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/external/SchemaGenScriptsExternalTest.java b/jpa/schema-gen-scripts-external/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/external/SchemaGenScriptsExternalTest.java index 641e9df3f..3c4c227ee 100644 --- a/jpa/schema-gen-scripts-external/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/external/SchemaGenScriptsExternalTest.java +++ b/jpa/schema-gen-scripts-external/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/external/SchemaGenScriptsExternalTest.java @@ -26,18 +26,18 @@ public class SchemaGenScriptsExternalTest { @Deployment public static WebArchive createDeployment() throws Exception { copyURLToFile(currentThread().getContextClassLoader().getResource("META-INF/create.sql"), - new File("/tmp/create.sql")); + new File("/tmp/create.sql")); copyURLToFile(currentThread().getContextClassLoader().getResource("META-INF/drop.sql"), - new File("/tmp/drop.sql")); + new File("/tmp/drop.sql")); copyURLToFile(currentThread().getContextClassLoader().getResource("META-INF/load.sql"), - new File("/tmp/load.sql")); + new File("/tmp/load.sql")); WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpasamples.schema.gen.scripts.external") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpasamples.schema.gen.scripts.external") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } diff --git a/jpa/schema-gen-scripts-generate/pom.xml b/jpa/schema-gen-scripts-generate/pom.xml index fced67bb4..f58eb11f1 100644 --- a/jpa/schema-gen-scripts-generate/pom.xml +++ b/jpa/schema-gen-scripts-generate/pom.xml @@ -1,16 +1,16 @@ - - - 4.0.0 - - jpa-samples - org.javaee7.jpa - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jpa-samples - schema-gen-scripts-generate - 1.0-SNAPSHOT - war - - + + + 4.0.0 + + + jpa + org.javaee7 + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jpa-schema-gen-scripts-generate + 1.0-SNAPSHOT + war + Java EE 7 Sample: jpa - schema-gen-scripts-generate + diff --git a/jpa/schema-gen-scripts-generate/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/generate/Employee.java b/jpa/schema-gen-scripts-generate/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/generate/Employee.java index af10a5c85..468e4bed5 100644 --- a/jpa/schema-gen-scripts-generate/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/generate/Employee.java +++ b/jpa/schema-gen-scripts-generate/src/main/java/org/javaee7/jpasamples/schema/gen/scripts/generate/Employee.java @@ -9,7 +9,7 @@ @Entity @Table(name = "EMPLOYEE_SCHEMA_GEN_SCRIPTS_GENERATE") @NamedQueries({ - @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e") + @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e") }) public class Employee implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jpa/schema-gen-scripts-generate/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/generate/SchemaGenScriptsTest.java b/jpa/schema-gen-scripts-generate/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/generate/SchemaGenScriptsTest.java index c0f268e21..1b27792f5 100644 --- a/jpa/schema-gen-scripts-generate/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/generate/SchemaGenScriptsTest.java +++ b/jpa/schema-gen-scripts-generate/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/generate/SchemaGenScriptsTest.java @@ -25,8 +25,8 @@ public class SchemaGenScriptsTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpasamples.schema.gen.scripts.generate") - .addAsResource("META-INF/persistence.xml"); + .addPackage("org.javaee7.jpasamples.schema.gen.scripts.generate") + .addAsResource("META-INF/persistence.xml"); System.out.println(war.toString(true)); return war; } diff --git a/jpa/schema-gen-scripts/pom.xml b/jpa/schema-gen-scripts/pom.xml index 7a4aa977b..29476f27a 100644 --- a/jpa/schema-gen-scripts/pom.xml +++ b/jpa/schema-gen-scripts/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jpa - schema-gen-scripts - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jpa-schema-gen-scripts + 1.0-SNAPSHOT + war + Java EE 7 Sample: jpa - schema-gen-scripts + diff --git a/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/Employee.java b/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/Employee.java index ebe20851a..86fff8fe1 100644 --- a/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/Employee.java +++ b/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/Employee.java @@ -12,7 +12,7 @@ * @author Arun Gupta */ @Entity -@Table(name="EMPLOYEE_SCHEMA_GEN_SCRIPTS") +@Table(name = "EMPLOYEE_SCHEMA_GEN_SCRIPTS") @NamedQueries({ @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e") }) @@ -20,16 +20,17 @@ public class Employee implements Serializable { private static final long serialVersionUID = 1L; @Id private int id; - - @Column(length=50) + + @Column(length = 50) private String name; - - public Employee() { } - + + public Employee() { + } + public Employee(String name) { this.name = name; } - + public int getId() { return id; } @@ -45,7 +46,7 @@ public String getName() { public void setName(String name) { this.name = name; } - + @Override public String toString() { return name; diff --git a/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/EmployeeBean.java b/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/EmployeeBean.java index 8dea4c351..53812101d 100644 --- a/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/EmployeeBean.java +++ b/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/EmployeeBean.java @@ -13,7 +13,7 @@ public class EmployeeBean { @PersistenceContext EntityManager em; - + public List get() { return em.createNamedQuery("Employee.findAll", Employee.class).getResultList(); } diff --git a/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/TestServlet.java b/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/TestServlet.java index a28a6edd4..2a270387c 100644 --- a/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/TestServlet.java +++ b/jpa/schema-gen-scripts/src/main/java/org/javaee7/jpa/schemagen/scripts/TestServlet.java @@ -12,7 +12,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { @Inject @@ -28,7 +28,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -55,7 +55,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -69,7 +69,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jpa/schema-gen-scripts/src/test/java/org/javaee7/jpa/schemagen/scripts/EmployeeBeanTest.java b/jpa/schema-gen-scripts/src/test/java/org/javaee7/jpa/schemagen/scripts/EmployeeBeanTest.java index 0efdd53da..a19e4013c 100644 --- a/jpa/schema-gen-scripts/src/test/java/org/javaee7/jpa/schemagen/scripts/EmployeeBeanTest.java +++ b/jpa/schema-gen-scripts/src/test/java/org/javaee7/jpa/schemagen/scripts/EmployeeBeanTest.java @@ -22,12 +22,12 @@ public class EmployeeBeanTest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(Employee.class, - EmployeeBean.class) - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/load.sql") - .addAsResource("META-INF/drop.sql"); + .addClasses(Employee.class, + EmployeeBean.class) + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/load.sql") + .addAsResource("META-INF/drop.sql"); } @Test diff --git a/jpa/storedprocedure/pom.xml b/jpa/storedprocedure/pom.xml index 72c7cda94..6ec9c755a 100644 --- a/jpa/storedprocedure/pom.xml +++ b/jpa/storedprocedure/pom.xml @@ -1,14 +1,15 @@ - + + 4.0.0 + - org.javaee7.jpa - jpa-samples + org.javaee7 + jpa 1.0-SNAPSHOT ../pom.xml - - storedprocedure + jpa-storedprocedure 1.0-SNAPSHOT war + Java EE 7 Sample: jpa - storedprocedure diff --git a/jpa/storedprocedure/src/test/java/org/javaee7/jpa/storedprocedure/StoredProcedureTest.java b/jpa/storedprocedure/src/test/java/org/javaee7/jpa/storedprocedure/StoredProcedureTest.java index 6fb872e83..edda5e5a0 100644 --- a/jpa/storedprocedure/src/test/java/org/javaee7/jpa/storedprocedure/StoredProcedureTest.java +++ b/jpa/storedprocedure/src/test/java/org/javaee7/jpa/storedprocedure/StoredProcedureTest.java @@ -23,11 +23,11 @@ public class StoredProcedureTest { @Deployment public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addPackage("org.javaee7.jpa.storedprocedure") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/drop.sql") - .addAsResource("META-INF/load.sql"); + .addPackage("org.javaee7.jpa.storedprocedure") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/drop.sql") + .addAsResource("META-INF/load.sql"); System.out.println(war.toString(true)); return war; } diff --git a/jpa/unsynchronized-pc/pom.xml b/jpa/unsynchronized-pc/pom.xml index 52ba089c8..e4a7530a7 100644 --- a/jpa/unsynchronized-pc/pom.xml +++ b/jpa/unsynchronized-pc/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.jpa - jpa-samples - 1.0-SNAPSHOT - ../pom.xml - - - unsynchronized-pc - war - + + + 4.0.0 + + + org.javaee7 + jpa + 1.0-SNAPSHOT + ../pom.xml + + jpa-unsynchronized-pc + war + Java EE 7 Sample: jpa - unsynchronized-pc + diff --git a/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/Employee.java b/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/Employee.java index 7c768a63a..146e2a4ad 100644 --- a/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/Employee.java +++ b/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/Employee.java @@ -12,7 +12,7 @@ * @author Arun Gupta */ @Entity -@Table(name="EMPLOYEE_SCHEMA_UNSYNCHRONIZED_PC") +@Table(name = "EMPLOYEE_SCHEMA_UNSYNCHRONIZED_PC") @NamedQueries({ @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e") }) @@ -20,11 +20,12 @@ public class Employee implements Serializable { private static final long serialVersionUID = 1L; @Id private int id; - - @Column(length=50) + + @Column(length = 50) private String name; - - public Employee() { } + + public Employee() { + } public Employee(int id, String name) { this.id = id; @@ -34,7 +35,7 @@ public Employee(int id, String name) { public Employee(String name) { this.name = name; } - + public int getId() { return id; } diff --git a/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/EmployeeBean.java b/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/EmployeeBean.java index 9316090db..effb530b1 100644 --- a/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/EmployeeBean.java +++ b/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/EmployeeBean.java @@ -14,17 +14,16 @@ public class EmployeeBean { @PersistenceContext(synchronization = SynchronizationType.UNSYNCHRONIZED) EntityManager em; - + public void persistWithoutJoin(Employee e) { em.persist(e); } - + public void persistWithJoin(Employee e) { em.joinTransaction(); em.persist(e); } - - + public List get() { return em.createNamedQuery("Employee.findAll", Employee.class).getResultList(); } diff --git a/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/TestServlet.java b/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/TestServlet.java index 7dcb99b3e..ec204fedb 100644 --- a/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/TestServlet.java +++ b/jpa/unsynchronized-pc/src/main/java/org/javaee7/jpa/unsynchronized/pc/TestServlet.java @@ -12,7 +12,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) public class TestServlet extends HttpServlet { @Inject @@ -28,7 +28,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -65,7 +65,7 @@ private void listEmployees(PrintWriter out, String title, String result) { */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -79,7 +79,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/jsf/README.md b/jsf/README.md new file mode 100644 index 000000000..f59496b48 --- /dev/null +++ b/jsf/README.md @@ -0,0 +1,31 @@ +# Java EE 7 Samples: JSF 2.2# + +The [JSR 344](https://jcp.org/en/jsr/detail?id=344) is an update to the 2.1 version of the JavaServer Faces specification. This is the first major revision of the JavaServer Specification since JSR 314. + +## Samples ## + + - ajax + - bean-validation + - components + - composite-component + - contracts + - contracts-library + - contracts-library-impl + - file-upload + - flows-simple + - flows-mixed + - flows-programmatic + - flows-declarative + - http-get + - passthrough + - radio-buttons + - resource-handling + - simple-facelet + - server-extension + - viewscoped + +## How to run + +More information on how to run can be found at: + + diff --git a/jsf/ajax/pom.xml b/jsf/ajax/pom.xml index 5bd8014ec..f872d66e2 100644 --- a/jsf/ajax/pom.xml +++ b/jsf/ajax/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - ajax - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-ajax + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - ajax + diff --git a/jsf/ajax/src/main/java/org/javaee7/jsf/ajax/UserService.java b/jsf/ajax/src/main/java/org/javaee7/jsf/ajax/UserService.java index 824421e6c..20819d36e 100644 --- a/jsf/ajax/src/main/java/org/javaee7/jsf/ajax/UserService.java +++ b/jsf/ajax/src/main/java/org/javaee7/jsf/ajax/UserService.java @@ -11,8 +11,9 @@ @Named @SessionScoped public class UserService implements Serializable { - @Inject User user; - + @Inject + User user; + public void register() { System.out.println("Registering " + user.getName() + " with the password \"" + user.getPassword() + "\""); } diff --git a/jsf/bean-validation/pom.xml b/jsf/bean-validation/pom.xml index ff694679f..95d45c816 100644 --- a/jsf/bean-validation/pom.xml +++ b/jsf/bean-validation/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - bean-validation - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-bean-validation + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - bean-validation + diff --git a/jsf/bean-validation/src/main/java/org/javaee7/jsf/bean/validation/MyBean.java b/jsf/bean-validation/src/main/java/org/javaee7/jsf/bean/validation/MyBean.java index a64161b03..b034802b9 100644 --- a/jsf/bean-validation/src/main/java/org/javaee7/jsf/bean/validation/MyBean.java +++ b/jsf/bean-validation/src/main/java/org/javaee7/jsf/bean/validation/MyBean.java @@ -14,14 +14,14 @@ @Named @SessionScoped public class MyBean implements Serializable { - + @Size(min = 3, message = "At least 3 characters") private String name; - + @Min(18) @Max(25) private int age; - + @Pattern(regexp = "[0-9]{5}") private String zip; diff --git a/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java b/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java index 058ea4a06..6bf93f985 100644 --- a/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java +++ b/jsf/bean-validation/src/test/java/org/javaee7/jsf/bean/validation/MyBeanTest.java @@ -30,10 +30,10 @@ */ @RunWith(Arquillian.class) public class MyBeanTest { - + @ArquillianResource private URL base; - + WebClient webClient; private static final String WEBAPP_SRC = "src/main/webapp"; @@ -46,119 +46,118 @@ public class MyBeanTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class). - addClass(MyBean.class) - .addAsWebResource(new File(WEBAPP_SRC, "index.xhtml")) - .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")); + addClass(MyBean.class) + .addAsWebResource(new File(WEBAPP_SRC, "index.xhtml")) + .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")); } @Before public void setup() throws IOException { webClient = new WebClient(); page = webClient.getPage(base + "/faces/index.xhtml"); - nameInputText = (HtmlTextInput)page.getElementById("nameInputText"); - ageInputText = (HtmlTextInput)page.getElementById("ageInputText"); - zipInputText = (HtmlTextInput)page.getElementById("zipInputText"); - button = (HtmlSubmitInput)page.getElementById("submitButton"); + nameInputText = (HtmlTextInput) page.getElementById("nameInputText"); + ageInputText = (HtmlTextInput) page.getElementById("ageInputText"); + zipInputText = (HtmlTextInput) page.getElementById("zipInputText"); + button = (HtmlSubmitInput) page.getElementById("submitButton"); } - + @Test public void testNameLessCharacters() throws IOException { nameInputText.setText("ab"); ageInputText.setText("20"); zipInputText.setText("12345"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("nameMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("nameMessage"); assertEquals("At least 3 characters", span.asText()); } - + @Test public void testNameBoundary() throws IOException { nameInputText.setText("abc"); ageInputText.setText("20"); zipInputText.setText("12345"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("nameMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("nameMessage"); assertEquals("", span.asText()); } - + @Test public void testAgeLessThan() throws IOException { nameInputText.setText("abc"); ageInputText.setText("16"); zipInputText.setText("12345"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("ageMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("ageMessage"); assertEquals("must be greater than or equal to 18", span.asText()); } - + @Test public void testAgeLowBoundary() throws IOException { nameInputText.setText("abc"); ageInputText.setText("18"); zipInputText.setText("12345"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("ageMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("ageMessage"); assertEquals("", span.asText()); } - + @Test public void testAgeHighBoundary() throws IOException { nameInputText.setText("abc"); ageInputText.setText("25"); zipInputText.setText("12345"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("ageMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("ageMessage"); assertEquals("", span.asText()); } - + @Test public void testAgeGreaterThan() throws IOException { nameInputText.setText("abc"); ageInputText.setText("26"); zipInputText.setText("12345"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("ageMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("ageMessage"); assertEquals("must be less than or equal to 25", span.asText()); } - + @Test public void testZipAlphabets() throws IOException { nameInputText.setText("abc"); ageInputText.setText("20"); zipInputText.setText("abcde"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("zipMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("zipMessage"); assertEquals("must match \"[0-9]{5}\"", span.asText()); } - + @Test public void testZipLessNumbers() throws IOException { nameInputText.setText("abc"); ageInputText.setText("20"); zipInputText.setText("1234"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("zipMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("zipMessage"); assertEquals("must match \"[0-9]{5}\"", span.asText()); } - + @Test public void testZipMoreNumbers() throws IOException { nameInputText.setText("abc"); ageInputText.setText("20"); zipInputText.setText("123456"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("zipMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("zipMessage"); assertEquals("must match \"[0-9]{5}\"", span.asText()); } - - + @Test public void testZipBoundary() throws IOException { nameInputText.setText("abc"); ageInputText.setText("20"); zipInputText.setText("12345"); HtmlPage result = button.click(); - HtmlSpan span = (HtmlSpan)result.getElementById("zipMessage"); + HtmlSpan span = (HtmlSpan) result.getElementById("zipMessage"); assertEquals("", span.asText()); } } diff --git a/jsf/components/pom.xml b/jsf/components/pom.xml index 7b24e7c40..03e930fb0 100644 --- a/jsf/components/pom.xml +++ b/jsf/components/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - components - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-components + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - components + diff --git a/jsf/components/src/main/java/org/javaee7/jsf/components/MyBean.java b/jsf/components/src/main/java/org/javaee7/jsf/components/MyBean.java index a2474a62d..35e7c1eaf 100644 --- a/jsf/components/src/main/java/org/javaee7/jsf/components/MyBean.java +++ b/jsf/components/src/main/java/org/javaee7/jsf/components/MyBean.java @@ -24,13 +24,13 @@ public class MyBean { String inputTextarea; boolean selectBooleanCheckbox; String[] selectManyCheckbox; - + @PostConstruct public void init() { list = Arrays.asList( - new Person(1, "Penny"), - new Person(2, "Leonard"), - new Person(3, "Sheldon")).toArray(new Person[0]); + new Person(1, "Penny"), + new Person(2, "Leonard"), + new Person(3, "Sheldon")).toArray(new Person[0]); } public String getCommandLink() { @@ -52,7 +52,7 @@ public void setCommandLinkLabel(String commandLinkLabel) { public void setList(Person[] list) { this.list = list; } - + public Person[] getList() { return list; } @@ -97,6 +97,4 @@ public void setSelectManyCheckbox(String[] selectManyCheckbox) { this.selectManyCheckbox = selectManyCheckbox; } - - } diff --git a/jsf/components/src/main/java/org/javaee7/jsf/components/Person.java b/jsf/components/src/main/java/org/javaee7/jsf/components/Person.java index f951a53ca..3cd0f06e1 100644 --- a/jsf/components/src/main/java/org/javaee7/jsf/components/Person.java +++ b/jsf/components/src/main/java/org/javaee7/jsf/components/Person.java @@ -16,7 +16,7 @@ public Person(int id, String name) { this.id = id; this.name = name; } - + public int getId() { return id; } @@ -32,5 +32,5 @@ public String getName() { public void setName(String name) { this.name = name; } - + } diff --git a/jsf/composite-component/pom.xml b/jsf/composite-component/pom.xml index 70ef6254f..3b7ff6b04 100644 --- a/jsf/composite-component/pom.xml +++ b/jsf/composite-component/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - composite-component - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-composite-component + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - composite-component + diff --git a/jsf/composite-component/src/main/java/org/javaee7/jsf/composite/component/UserService.java b/jsf/composite-component/src/main/java/org/javaee7/jsf/composite/component/UserService.java index 555ca459a..55f9ffeec 100644 --- a/jsf/composite-component/src/main/java/org/javaee7/jsf/composite/component/UserService.java +++ b/jsf/composite-component/src/main/java/org/javaee7/jsf/composite/component/UserService.java @@ -11,8 +11,9 @@ @Named @SessionScoped public class UserService implements Serializable { - @Inject User user; - + @Inject + User user; + public void register() { System.out.println("Registering " + user.getName() + " with the password \"" + user.getPassword() + "\""); } diff --git a/jsf/contracts-library-impl/pom.xml b/jsf/contracts-library-impl/pom.xml index 0f48d6105..f474973ee 100644 --- a/jsf/contracts-library-impl/pom.xml +++ b/jsf/contracts-library-impl/pom.xml @@ -1,15 +1,15 @@ - - + + 4.0.0 + - org.javaee7.jsf - jsf-samples + org.javaee7 + jsf 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jsf-samples - contracts-library-impl + org.javaee7 + jsf-contracts-library-impl 1.0-SNAPSHOT + Java EE 7 Sample: jsf - contracts-library-impl diff --git a/jsf/contracts-library/pom.xml b/jsf/contracts-library/pom.xml index ca5e885a2..7d8431195 100644 --- a/jsf/contracts-library/pom.xml +++ b/jsf/contracts-library/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - contracts-library - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-contracts-library + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - contracts-library + diff --git a/jsf/contracts/pom.xml b/jsf/contracts/pom.xml index 287a42457..089c7a0b5 100644 --- a/jsf/contracts/pom.xml +++ b/jsf/contracts/pom.xml @@ -1,17 +1,19 @@ - + + 4.0.0 + - org.javaee7.jsf - jsf-samples + org.javaee7 + jsf 1.0-SNAPSHOT ../pom.xml - - - org.javaee7.jsf - contracts + + org.javaee7 + jsf-contracts 1.0-SNAPSHOT war + Java EE 7 Sample: jsf - contracts + gfv3ee6 diff --git a/jsf/contracts/src/main/java/org/javaee7/jsf/contracts/ContractsBean.java b/jsf/contracts/src/main/java/org/javaee7/jsf/contracts/ContractsBean.java index d1b2be230..a521c263f 100644 --- a/jsf/contracts/src/main/java/org/javaee7/jsf/contracts/ContractsBean.java +++ b/jsf/contracts/src/main/java/org/javaee7/jsf/contracts/ContractsBean.java @@ -10,7 +10,7 @@ @Named @SessionScoped public class ContractsBean implements Serializable { - + String contract = "red"; public String getContract() { diff --git a/jsf/file-upload/pom.xml b/jsf/file-upload/pom.xml index 2af55cfd5..c8437f84d 100644 --- a/jsf/file-upload/pom.xml +++ b/jsf/file-upload/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - file-upload - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-file-upload + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - file-upload + diff --git a/jsf/flows-declarative/pom.xml b/jsf/flows-declarative/pom.xml index 5ce37052f..1ef3d2268 100644 --- a/jsf/flows-declarative/pom.xml +++ b/jsf/flows-declarative/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - flows-declarative - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-flows-declarative + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - flows-declarative + diff --git a/jsf/flows-mixed/pom.xml b/jsf/flows-mixed/pom.xml index 597122ef0..a2acf2176 100644 --- a/jsf/flows-mixed/pom.xml +++ b/jsf/flows-mixed/pom.xml @@ -1,17 +1,19 @@ - + + 4.0.0 + - org.javaee7.jsf - jsf-samples + org.javaee7 + jsf 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jsf - flows-mixed + org.javaee7 + jsf-flows-mixed 1.0-SNAPSHOT war + Java EE 7 Sample: jsf - flows-mixed + gfv3ee6 diff --git a/jsf/flows-mixed/src/main/java/org/javaee7/jsf/flows/mixed/Flow1.java b/jsf/flows-mixed/src/main/java/org/javaee7/jsf/flows/mixed/Flow1.java index f391e1965..309edc675 100644 --- a/jsf/flows-mixed/src/main/java/org/javaee7/jsf/flows/mixed/Flow1.java +++ b/jsf/flows-mixed/src/main/java/org/javaee7/jsf/flows/mixed/Flow1.java @@ -11,23 +11,24 @@ */ public class Flow1 { - @Produces @FlowDefinition + @Produces + @FlowDefinition public Flow defineFlow(@FlowBuilderParameter FlowBuilder flowBuilder) { String flowId = "flow1"; flowBuilder.id("", flowId); flowBuilder.viewNode(flowId, "/" + flowId + "/" + flowId + ".xhtml").markAsStartNode(); - + flowBuilder.returnNode("taskFlowReturn1"). - fromOutcome("#{flow1Bean.returnValue}"); + fromOutcome("#{flow1Bean.returnValue}"); flowBuilder.returnNode("goHome"). - fromOutcome("#{flow1Bean.homeValue}"); - + fromOutcome("#{flow1Bean.homeValue}"); + flowBuilder.inboundParameter("param1FromFlow2", "#{flowScope.param1Value}"); flowBuilder.inboundParameter("param2FromFlow2", "#{flowScope.param2Value}"); - + flowBuilder.flowCallNode("call2").flowReference("", "flow2"). - outboundParameter("param1FromFlow1", "param1 flow1 value"). - outboundParameter("param2FromFlow1", "param2 flow1 value"); + outboundParameter("param1FromFlow1", "param1 flow1 value"). + outboundParameter("param2FromFlow1", "param2 flow1 value"); return flowBuilder.getFlow(); } diff --git a/jsf/flows-mixed/src/main/java/org/javaee7/jsf/flows/mixed/Flow1Bean.java b/jsf/flows-mixed/src/main/java/org/javaee7/jsf/flows/mixed/Flow1Bean.java index dc2460683..9d0d771d7 100644 --- a/jsf/flows-mixed/src/main/java/org/javaee7/jsf/flows/mixed/Flow1Bean.java +++ b/jsf/flows-mixed/src/main/java/org/javaee7/jsf/flows/mixed/Flow1Bean.java @@ -21,5 +21,5 @@ public String getReturnValue() { public String getHomeValue() { return "/index"; - } + } } diff --git a/jsf/flows-programmatic/pom.xml b/jsf/flows-programmatic/pom.xml index c9e58648b..168493bf6 100644 --- a/jsf/flows-programmatic/pom.xml +++ b/jsf/flows-programmatic/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - flows-programmatic - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-flows-programmatic + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - flows-programmatic + diff --git a/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow1.java b/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow1.java index fe53ac2ad..a70ad9641 100644 --- a/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow1.java +++ b/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow1.java @@ -11,23 +11,24 @@ */ public class Flow1 { - @Produces @FlowDefinition + @Produces + @FlowDefinition public Flow defineFlow(@FlowBuilderParameter FlowBuilder flowBuilder) { String flowId = "flow1"; flowBuilder.id("", flowId); flowBuilder.viewNode(flowId, "/" + flowId + "/" + flowId + ".xhtml").markAsStartNode(); - + flowBuilder.returnNode("taskFlowReturn1"). - fromOutcome("#{flow1Bean.returnValue}"); + fromOutcome("#{flow1Bean.returnValue}"); flowBuilder.returnNode("goHome"). - fromOutcome("#{flow1Bean.homeValue}"); - + fromOutcome("#{flow1Bean.homeValue}"); + flowBuilder.inboundParameter("param1FromFlow2", "#{flowScope.param1Value}"); flowBuilder.inboundParameter("param2FromFlow2", "#{flowScope.param2Value}"); - + flowBuilder.flowCallNode("call2").flowReference("", "flow2"). - outboundParameter("param1FromFlow1", "param1 flow1 value"). - outboundParameter("param2FromFlow1", "param2 flow1 value"); + outboundParameter("param1FromFlow1", "param1 flow1 value"). + outboundParameter("param2FromFlow1", "param2 flow1 value"); return flowBuilder.getFlow(); } diff --git a/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow1Bean.java b/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow1Bean.java index 6beb70c0c..1dd71a463 100644 --- a/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow1Bean.java +++ b/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow1Bean.java @@ -21,5 +21,5 @@ public String getReturnValue() { public String getHomeValue() { return "/index"; - } + } } diff --git a/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow2.java b/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow2.java index 122bde93d..54689c7be 100644 --- a/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow2.java +++ b/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow2.java @@ -11,23 +11,24 @@ */ public class Flow2 { - @Produces @FlowDefinition + @Produces + @FlowDefinition public Flow defineFlow(@FlowBuilderParameter FlowBuilder flowBuilder) { String flowId = "flow2"; flowBuilder.id("", flowId); flowBuilder.viewNode(flowId, "/" + flowId + "/" + flowId + ".xhtml").markAsStartNode(); - + flowBuilder.returnNode("taskFlowReturn1"). - fromOutcome("#{flow2Bean.returnValue}"); + fromOutcome("#{flow2Bean.returnValue}"); flowBuilder.returnNode("goHome"). - fromOutcome("#{flow2Bean.homeValue}"); - + fromOutcome("#{flow2Bean.homeValue}"); + flowBuilder.inboundParameter("param1FromFlow1", "#{flowScope.param1Value}"); flowBuilder.inboundParameter("param2FromFlow1", "#{flowScope.param2Value}"); - + flowBuilder.flowCallNode("call1").flowReference("", "flow1"). - outboundParameter("param1FromFlow2", "param1 flow2 value"). - outboundParameter("param2FromFlow2", "param2 flow2 value"); + outboundParameter("param1FromFlow2", "param1 flow2 value"). + outboundParameter("param2FromFlow2", "param2 flow2 value"); return flowBuilder.getFlow(); } diff --git a/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow2Bean.java b/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow2Bean.java index 5bf62e300..1ffc4f249 100644 --- a/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow2Bean.java +++ b/jsf/flows-programmatic/src/main/java/org/javaee7/jsf/flows/programmatic/Flow2Bean.java @@ -8,7 +8,7 @@ * @author Arun Gupta */ @Named -@FlowScoped(value="flow2") +@FlowScoped(value = "flow2") public class Flow2Bean implements Serializable { public String getName() { @@ -21,5 +21,5 @@ public String getReturnValue() { public String getHomeValue() { return "/index"; - } + } } diff --git a/jsf/flows-simple/pom.xml b/jsf/flows-simple/pom.xml index d6f7de045..8760124ef 100644 --- a/jsf/flows-simple/pom.xml +++ b/jsf/flows-simple/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.jsf - jsf-samples + org.javaee7 + jsf 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jsf - flows-simple + org.javaee7 + jsf-flows-simple 1.0-SNAPSHOT war + Java EE 7 Sample: jsf - flows-simple diff --git a/jsf/flows-simple/src/main/java/org/javaee7/jsf/flow/Flow1.java b/jsf/flows-simple/src/main/java/org/javaee7/jsf/flow/Flow1.java index b14cbb3e7..2810cb424 100644 --- a/jsf/flows-simple/src/main/java/org/javaee7/jsf/flow/Flow1.java +++ b/jsf/flows-simple/src/main/java/org/javaee7/jsf/flow/Flow1.java @@ -14,12 +14,12 @@ public class Flow1 implements Serializable { private static final long serialVersionUID = -7623501087369765218L; -// @Produces @FlowDefinition -// public Flow defineFlow(@FlowBuilderParameter FlowBuilder flowBuilder) { -// String flowId = "flow1"; -// flowBuilder.id("", flowId); -// flowBuilder.viewNode(flowId, "/" + flowId + "/" + flowId + ".xhtml").markAsStartNode(); -// -// return flowBuilder.getFlow(); -// } + // @Produces @FlowDefinition + // public Flow defineFlow(@FlowBuilderParameter FlowBuilder flowBuilder) { + // String flowId = "flow1"; + // flowBuilder.id("", flowId); + // flowBuilder.viewNode(flowId, "/" + flowId + "/" + flowId + ".xhtml").markAsStartNode(); + // + // return flowBuilder.getFlow(); + // } } diff --git a/jsf/flows-simple/src/main/java/org/javaee7/jsf/flow/Flow1Bean.java b/jsf/flows-simple/src/main/java/org/javaee7/jsf/flow/Flow1Bean.java index 7c03cfa81..ccc058fb2 100644 --- a/jsf/flows-simple/src/main/java/org/javaee7/jsf/flow/Flow1Bean.java +++ b/jsf/flows-simple/src/main/java/org/javaee7/jsf/flow/Flow1Bean.java @@ -18,7 +18,7 @@ public Flow1Bean() { public String getName() { return this.getClass().getSimpleName(); } - + public String getHomeAction() { return "/index"; } diff --git a/jsf/http-get/pom.xml b/jsf/http-get/pom.xml index bfdb483fd..9e25abf86 100644 --- a/jsf/http-get/pom.xml +++ b/jsf/http-get/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - http-get - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + jsf-http-get + war + Java EE 7 Sample: jsf - http-get + diff --git a/jsf/http-get/src/main/java/org/javaee7/jsf/http/get/User.java b/jsf/http-get/src/main/java/org/javaee7/jsf/http/get/User.java index f01e0759d..7ff32cffa 100644 --- a/jsf/http-get/src/main/java/org/javaee7/jsf/http/get/User.java +++ b/jsf/http-get/src/main/java/org/javaee7/jsf/http/get/User.java @@ -28,7 +28,7 @@ public void process(ComponentSystemEvent event) throws AbortProcessingException System.out.println("process called"); name = name.toUpperCase(); } - + public void process2() { System.out.println("process2 called"); name = name.toUpperCase(); diff --git a/jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java b/jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java index 100633755..2133d9dac 100644 --- a/jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java +++ b/jsf/http-get/src/test/java/org/javaee7/jsf/http/get/UserTest.java @@ -26,7 +26,7 @@ public class UserTest { @ArquillianResource private URL base; - + WebClient webClient; private static final String WEBAPP_SRC = "src/main/webapp"; @@ -35,12 +35,12 @@ public class UserTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class). - addClass(User.class) - .addAsWebResource(new File(WEBAPP_SRC, "index.xhtml")) - .addAsWebResource(new File(WEBAPP_SRC, "index2.xhtml")) - .addAsWebResource(new File(WEBAPP_SRC, "login.xhtml")) - .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")) - .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "beans.xml")); + addClass(User.class) + .addAsWebResource(new File(WEBAPP_SRC, "index.xhtml")) + .addAsWebResource(new File(WEBAPP_SRC, "index2.xhtml")) + .addAsWebResource(new File(WEBAPP_SRC, "login.xhtml")) + .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")) + .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "beans.xml")); } @Before @@ -51,38 +51,38 @@ public void setup() throws IOException { @Test public void testLink() throws IOException { - HtmlAnchor anchor = (HtmlAnchor)page.getElementById("link1"); + HtmlAnchor anchor = (HtmlAnchor) page.getElementById("link1"); assertTrue(anchor.getHrefAttribute().contains("faces/login.xhtml")); assertEquals("Login1", anchor.asText()); - + HtmlPage output = anchor.click(); assertEquals("HTTP GET (Login)", output.getTitleText()); } @Test public void testLinkWithParam() throws IOException { - HtmlAnchor anchor = (HtmlAnchor)page.getElementById("link2"); + HtmlAnchor anchor = (HtmlAnchor) page.getElementById("link2"); assertTrue(anchor.getHrefAttribute().contains("faces/login.xhtml")); assertTrue(anchor.getHrefAttribute().contains("?name=Jack")); assertEquals("Login2", anchor.asText()); - + HtmlPage output = anchor.click(); assertEquals("HTTP GET (Login)", output.getTitleText()); } - + @Test public void testLinkWithPreProcessParams() { - HtmlAnchor anchor = (HtmlAnchor)page.getElementById("link3"); + HtmlAnchor anchor = (HtmlAnchor) page.getElementById("link3"); assertEquals("Login3", anchor.asText()); assertTrue(anchor.getHrefAttribute().contains("faces/index2.xhtml")); assertTrue(anchor.getHrefAttribute().contains("?name=Jack")); } - + @Test public void testButton() throws IOException { - HtmlButtonInput button = (HtmlButtonInput)page.getElementById("button1"); + HtmlButtonInput button = (HtmlButtonInput) page.getElementById("button1"); assertEquals("Login4", button.asText()); - + HtmlPage output = button.click(); assertEquals("HTTP GET (Login)", output.getTitleText()); } diff --git a/jsf/passthrough/pom.xml b/jsf/passthrough/pom.xml index 7f28fd998..b4d0ab50a 100644 --- a/jsf/passthrough/pom.xml +++ b/jsf/passthrough/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - passthrough - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-passthrough + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - passthrough + diff --git a/jsf/pom.xml b/jsf/pom.xml index ebef2e9a1..313167b0d 100644 --- a/jsf/pom.xml +++ b/jsf/pom.xml @@ -1,19 +1,18 @@ + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - 4.0.0 - - org.javaee7.jsf - jsf-samples + org.javaee7 + jsf 1.0-SNAPSHOT pom - Java EE 7 JSF Samples + Java EE 7 Sample: jsf ajax @@ -36,7 +35,7 @@ server-extension viewscoped - + org.jboss.arquillian.graphene diff --git a/jsf/radio-buttons/pom.xml b/jsf/radio-buttons/pom.xml index 5a7fc2af3..2d1f4e705 100644 --- a/jsf/radio-buttons/pom.xml +++ b/jsf/radio-buttons/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - radio-buttons - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-radio-buttons + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - radio-buttons + diff --git a/jsf/radio-buttons/src/main/java/org/javaee7/jsf/radio/buttons/Movie.java b/jsf/radio-buttons/src/main/java/org/javaee7/jsf/radio/buttons/Movie.java index 5f9f57ccc..c62c7f689 100644 --- a/jsf/radio-buttons/src/main/java/org/javaee7/jsf/radio/buttons/Movie.java +++ b/jsf/radio-buttons/src/main/java/org/javaee7/jsf/radio/buttons/Movie.java @@ -11,11 +11,11 @@ public class Movie { @Id @NotNull private Integer id; - + @NotNull @Size(min = 1, max = 50) private String name; - + @NotNull @Size(min = 1, max = 200) private String actors; @@ -28,7 +28,7 @@ public Movie(Integer id, String name, String actors) { this.name = name; this.actors = actors; } - + public Integer getId() { return id; } @@ -51,5 +51,5 @@ public String getActors() { public void setActors(String actors) { this.actors = actors; - } + } } diff --git a/jsf/radio-buttons/src/main/java/org/javaee7/jsf/radio/buttons/MovieBean.java b/jsf/radio-buttons/src/main/java/org/javaee7/jsf/radio/buttons/MovieBean.java index 93c3fb1b3..f9914fc55 100644 --- a/jsf/radio-buttons/src/main/java/org/javaee7/jsf/radio/buttons/MovieBean.java +++ b/jsf/radio-buttons/src/main/java/org/javaee7/jsf/radio/buttons/MovieBean.java @@ -14,9 +14,9 @@ public class MovieBean implements Serializable { private static final List list = Arrays.asList( - new Movie(1, "The Matrix", "Keanu Reeves"), - new Movie(2, "The Lord of the Rings", "Elijah Wood"), - new Movie(3, "The Inception", "Leonardo Dicaprio")); + new Movie(1, "The Matrix", "Keanu Reeves"), + new Movie(2, "The Lord of the Rings", "Elijah Wood"), + new Movie(3, "The Inception", "Leonardo Dicaprio")); int selected; public int getSelected() { @@ -32,6 +32,6 @@ public List getAll() { } public Movie getSelectedMovie() { - return list.get(selected-1); + return list.get(selected - 1); } } diff --git a/jsf/resource-handling/pom.xml b/jsf/resource-handling/pom.xml index 67a206ddf..c83702f51 100644 --- a/jsf/resource-handling/pom.xml +++ b/jsf/resource-handling/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - resource-handling - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-resource-handling + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - resource-handling + diff --git a/jsf/resource-handling/src/main/java/org/javaee7/jsf/resource/handling/CustomerSessionBean.java b/jsf/resource-handling/src/main/java/org/javaee7/jsf/resource/handling/CustomerSessionBean.java index 27efa77c8..654edd9bc 100644 --- a/jsf/resource-handling/src/main/java/org/javaee7/jsf/resource/handling/CustomerSessionBean.java +++ b/jsf/resource-handling/src/main/java/org/javaee7/jsf/resource/handling/CustomerSessionBean.java @@ -13,7 +13,7 @@ public class CustomerSessionBean { public List getCustomerNames() { List names = new ArrayList<>(); - + names.add(new Name("Penny", "TBBT")); names.add(new Name("Sheldon", "TBBT")); names.add(new Name("Amy", "TBBT")); @@ -22,7 +22,7 @@ public List getCustomerNames() { names.add(new Name("Raj", "TBBT")); names.add(new Name("Priya", "TBBT")); names.add(new Name("Howard", "TBBT")); - + return names; } } diff --git a/jsf/resource-handling/src/main/java/org/javaee7/jsf/resource/handling/Name.java b/jsf/resource-handling/src/main/java/org/javaee7/jsf/resource/handling/Name.java index babb02c32..538ac7947 100644 --- a/jsf/resource-handling/src/main/java/org/javaee7/jsf/resource/handling/Name.java +++ b/jsf/resource-handling/src/main/java/org/javaee7/jsf/resource/handling/Name.java @@ -9,9 +9,10 @@ public class Name { private String first; private String last; - - public Name() { } - + + public Name() { + } + public Name(String first, String last) { this.first = first; this.last = last; @@ -32,7 +33,7 @@ public String getLast() { public void setLast(String last) { this.last = last; } - + public String toString() { return last + ", " + first; } diff --git a/jsf/server-extension/pom.xml b/jsf/server-extension/pom.xml index a95e46e3e..6f5e66682 100644 --- a/jsf/server-extension/pom.xml +++ b/jsf/server-extension/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - server-extension - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-server-extension + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - server-extension + diff --git a/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/MyConverter.java b/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/MyConverter.java index 3f6987558..4d2090dad 100644 --- a/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/MyConverter.java +++ b/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/MyConverter.java @@ -15,8 +15,8 @@ public class MyConverter implements Converter { @Override public Object getAsObject(FacesContext context, - UIComponent component, - String value) { + UIComponent component, + String value) { System.out.println("Received: " + value); try { return new UserAge(Integer.parseInt(value.trim())); @@ -27,8 +27,8 @@ public Object getAsObject(FacesContext context, @Override public String getAsString(FacesContext context, - UIComponent component, - Object value) { - return String.valueOf(((UserAge)value).getAge()); + UIComponent component, + Object value) { + return String.valueOf(((UserAge) value).getAge()); } } diff --git a/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/NameValidator.java b/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/NameValidator.java index 99421c40f..ea534e329 100644 --- a/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/NameValidator.java +++ b/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/NameValidator.java @@ -16,10 +16,10 @@ public class NameValidator implements Validator { @Override public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException { System.out.println("Got: " + value); - if (((String)value).length() < 3) - throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, - "Incorrect name length", - "Name length must >= 3, found only " + value)); + if (((String) value).length() < 3) + throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, + "Incorrect name length", + "Name length must >= 3, found only " + value)); } - + } diff --git a/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/User.java b/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/User.java index 81ce50d0d..6235b587c 100644 --- a/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/User.java +++ b/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/User.java @@ -11,9 +11,10 @@ public class User { private int age; private String name; - - public User() { } - + + public User() { + } + public User(int age, String name) { this.age = age; this.name = name; diff --git a/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/UserAge.java b/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/UserAge.java index 679ab43e5..1aa54c8af 100644 --- a/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/UserAge.java +++ b/jsf/server-extension/src/main/java/org/javaee7/jsf/server/extension/UserAge.java @@ -11,7 +11,8 @@ public class UserAge { int age; - public UserAge() { } + public UserAge() { + } public UserAge(int age) { this.age = age; diff --git a/jsf/simple-facelet/pom.xml b/jsf/simple-facelet/pom.xml index aa48d3d3a..746c09c3f 100644 --- a/jsf/simple-facelet/pom.xml +++ b/jsf/simple-facelet/pom.xml @@ -1,15 +1,14 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - simple-facelet - war - - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + jsf-simple-facelet + war + Java EE 7 Sample: jsf - simple-facelet + diff --git a/jsf/simple-facelet/src/main/java/org/javaee7/jsf/simple/facelets/CustomerSessionBean.java b/jsf/simple-facelet/src/main/java/org/javaee7/jsf/simple/facelets/CustomerSessionBean.java index ea5971e5a..9f3fd039f 100644 --- a/jsf/simple-facelet/src/main/java/org/javaee7/jsf/simple/facelets/CustomerSessionBean.java +++ b/jsf/simple-facelet/src/main/java/org/javaee7/jsf/simple/facelets/CustomerSessionBean.java @@ -13,7 +13,7 @@ public class CustomerSessionBean { public List getCustomerNames() { List names = new ArrayList<>(); - + names.add(new Name("Penny", "TBBT")); names.add(new Name("Sheldon", "TBBT")); names.add(new Name("Amy", "TBBT")); @@ -22,7 +22,7 @@ public List getCustomerNames() { names.add(new Name("Raj", "TBBT")); names.add(new Name("Priya", "TBBT")); names.add(new Name("Howard", "TBBT")); - + return names; } } diff --git a/jsf/simple-facelet/src/main/java/org/javaee7/jsf/simple/facelets/Name.java b/jsf/simple-facelet/src/main/java/org/javaee7/jsf/simple/facelets/Name.java index 9497aacad..8044000ea 100644 --- a/jsf/simple-facelet/src/main/java/org/javaee7/jsf/simple/facelets/Name.java +++ b/jsf/simple-facelet/src/main/java/org/javaee7/jsf/simple/facelets/Name.java @@ -9,9 +9,10 @@ public class Name { private String first; private String last; - - public Name() { } - + + public Name() { + } + public Name(String first, String last) { this.first = first; this.last = last; @@ -32,7 +33,7 @@ public String getLast() { public void setLast(String last) { this.last = last; } - + public String toString() { return last + ", " + first; } diff --git a/jsf/simple-facelet/src/test/java/org/javaee7/jsf/simple/facelets/test/SimpleFaceletPage.java b/jsf/simple-facelet/src/test/java/org/javaee7/jsf/simple/facelets/test/SimpleFaceletPage.java index ac108d08a..ddc5f9c38 100644 --- a/jsf/simple-facelet/src/test/java/org/javaee7/jsf/simple/facelets/test/SimpleFaceletPage.java +++ b/jsf/simple-facelet/src/test/java/org/javaee7/jsf/simple/facelets/test/SimpleFaceletPage.java @@ -15,10 +15,10 @@ public class SimpleFaceletPage { @FindBy(tagName = "td") private List names; - + public List getNames() { List result = new ArrayList(); - for(WebElement nameElement : names) { + for (WebElement nameElement : names) { result.add(nameElement.getText()); } return result; diff --git a/jsf/simple-facelet/src/test/java/org/javaee7/jsf/simple/facelets/test/SimpleFaceletTest.java b/jsf/simple-facelet/src/test/java/org/javaee7/jsf/simple/facelets/test/SimpleFaceletTest.java index 0a7b30efd..e5ff8e798 100644 --- a/jsf/simple-facelet/src/test/java/org/javaee7/jsf/simple/facelets/test/SimpleFaceletTest.java +++ b/jsf/simple-facelet/src/test/java/org/javaee7/jsf/simple/facelets/test/SimpleFaceletTest.java @@ -28,27 +28,27 @@ public class SimpleFaceletTest { private static final String WEBAPP_SRC = "src/main/webapp/"; private static final List EXPECTED_TABLE_NAMES = Arrays.asList("Penny", "Sheldon", - "Amy", "Leonard", "Bernadette", "Raj", "Priya", "Howard"); - + "Amy", "Leonard", "Bernadette", "Raj", "Priya", "Howard"); + @Drone private WebDriver browser; @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClass(CustomerSessionBean.class) - .addClass(Name.class) - .addAsWebResource(new File(WEBAPP_SRC, "index.xhtml")) - .addAsWebResource(new File(WEBAPP_SRC + "resources/css/cssLayout.css"), "resources/css/cssLayout.css") - .addAsWebResource(new File(WEBAPP_SRC + "resources/css/default.css"), "resources/css/default.css") - .addAsWebInfResource(new File(WEBAPP_SRC, "/WEB-INF/template.xhtml")) - .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")); + .addClass(CustomerSessionBean.class) + .addClass(Name.class) + .addAsWebResource(new File(WEBAPP_SRC, "index.xhtml")) + .addAsWebResource(new File(WEBAPP_SRC + "resources/css/cssLayout.css"), "resources/css/cssLayout.css") + .addAsWebResource(new File(WEBAPP_SRC + "resources/css/default.css"), "resources/css/default.css") + .addAsWebInfResource(new File(WEBAPP_SRC, "/WEB-INF/template.xhtml")) + .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")); } @Test public void testDataTableRendered(@InitialPage SimpleFaceletPage simpleFaceletPage) { Assert.assertEquals( - "The simple facelet was not rendered correctly!", - EXPECTED_TABLE_NAMES, simpleFaceletPage.getNames()); + "The simple facelet was not rendered correctly!", + EXPECTED_TABLE_NAMES, simpleFaceletPage.getNames()); } } diff --git a/jsf/viewscoped/pom.xml b/jsf/viewscoped/pom.xml index c2c8f646b..01d1de443 100644 --- a/jsf/viewscoped/pom.xml +++ b/jsf/viewscoped/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jsf - jsf-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jsf - viewscoped - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jsf + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jsf-viewscoped + 1.0-SNAPSHOT + war + Java EE 7 Sample: jsf - viewscoped + diff --git a/json/README.md b/json/README.md new file mode 100644 index 000000000..79a157f93 --- /dev/null +++ b/json/README.md @@ -0,0 +1,16 @@ +# Java EE 7 Samples: JSON-P 1.0# + +The [JSR 353](https://jcp.org/en/jsr/detail?id=353) specifies a Java API to process (for e.g. parse, generate, transform and query) JSON. + +## Samples ## + + - object-builder + - object-reader + - streaming-generate + - streaming-parser + +## How to run + +More information on how to run can be found at: + + diff --git a/json/object-builder/pom.xml b/json/object-builder/pom.xml index c1764252d..485af91d4 100644 --- a/json/object-builder/pom.xml +++ b/json/object-builder/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.json - json-samples + org.javaee7 + json 1.0-SNAPSHOT ../pom.xml - - object-builder + json-object-builder war + Java EE 7 Sample: json - object-builder diff --git a/json/object-builder/src/test/java/org/javaee7/json/object/builder/DOMGeneratorTest.java b/json/object-builder/src/test/java/org/javaee7/json/object/builder/DOMGeneratorTest.java index 001afa636..0ad9cfbeb 100644 --- a/json/object-builder/src/test/java/org/javaee7/json/object/builder/DOMGeneratorTest.java +++ b/json/object-builder/src/test/java/org/javaee7/json/object/builder/DOMGeneratorTest.java @@ -23,15 +23,15 @@ */ @RunWith(Arquillian.class) public class DOMGeneratorTest { - + @Deployment public static Archive deploy() { File[] requiredLibraries = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("org.json:json", "org.skyscreamer:jsonassert") - .withTransitivity().asFile(); - + .resolve("org.json:json", "org.skyscreamer:jsonassert") + .withTransitivity().asFile(); + return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(requiredLibraries); + .addAsLibraries(requiredLibraries); } @Test @@ -47,9 +47,9 @@ public void testEmptyObject() throws JSONException { @Test public void testSimpleObject() throws JSONException { JsonObject jsonObject = Json.createObjectBuilder() - .add("apple", "red") - .add("banana", "yellow") - .build(); + .add("apple", "red") + .add("banana", "yellow") + .build(); StringWriter w = new StringWriter(); try (JsonWriter writer = Json.createWriter(w)) { writer.write(jsonObject); @@ -60,9 +60,9 @@ public void testSimpleObject() throws JSONException { @Test public void testArray() throws JSONException { JsonArray jsonArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("apple", "red")) - .add(Json.createObjectBuilder().add("banana", "yellow")) - .build(); + .add(Json.createObjectBuilder().add("apple", "red")) + .add(Json.createObjectBuilder().add("banana", "yellow")) + .build(); StringWriter w = new StringWriter(); try (JsonWriter writer = Json.createWriter(w)) { writer.write(jsonArray); @@ -73,17 +73,18 @@ public void testArray() throws JSONException { @Test public void testNestedStructure() throws JSONException { JsonObject jsonObject = Json.createObjectBuilder() - .add("title", "The Matrix") - .add("year", 1999) - .add("cast", Json.createArrayBuilder() - .add("Keanu Reaves") - .add("Laurence Fishburne") - .add("Carrie-Anne Moss")) - .build(); + .add("title", "The Matrix") + .add("year", 1999) + .add("cast", Json.createArrayBuilder() + .add("Keanu Reaves") + .add("Laurence Fishburne") + .add("Carrie-Anne Moss")) + .build(); StringWriter w = new StringWriter(); try (JsonWriter writer = Json.createWriter(w)) { writer.write(jsonObject); } - JSONAssert.assertEquals("{\"title\":\"The Matrix\",\"year\":1999,\"cast\":[\"Keanu Reaves\",\"Laurence Fishburne\",\"Carrie-Anne Moss\"]}", w.toString(), JSONCompareMode.STRICT); + JSONAssert.assertEquals("{\"title\":\"The Matrix\",\"year\":1999,\"cast\":[\"Keanu Reaves\",\"Laurence Fishburne\",\"Carrie-Anne Moss\"]}", w.toString(), + JSONCompareMode.STRICT); } } diff --git a/json/object-reader/pom.xml b/json/object-reader/pom.xml index cab7b56f6..cd3038429 100644 --- a/json/object-reader/pom.xml +++ b/json/object-reader/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.json - json-samples + org.javaee7 + json 1.0-SNAPSHOT ../pom.xml - - org.javaee7.json - object-reader + org.javaee7 + json-object-reader 1.0-SNAPSHOT war + Java EE 7 Sample: json - object-reader diff --git a/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java b/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java index aae364cfe..8ef7e0468 100644 --- a/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java +++ b/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromReaderTest.java @@ -28,18 +28,18 @@ public class JsonReaderFromReaderTest { @Deployment public static Archive deploy() { File[] requiredLibraries = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("org.json:json", "org.skyscreamer:jsonassert") - .withTransitivity().asFile(); + .resolve("org.json:json", "org.skyscreamer:jsonassert") + .withTransitivity().asFile(); return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(requiredLibraries); + .addAsLibraries(requiredLibraries); } @Test public void testEmptyObject() throws JSONException { JsonReader jsonReader = Json.createReader(new StringReader("{}")); JsonObject json = jsonReader.readObject(); - + assertNotNull(json); assertTrue(json.isEmpty()); } @@ -47,11 +47,11 @@ public void testEmptyObject() throws JSONException { @Test public void testSimpleObjectWithTwoElements() throws JSONException { JsonReader jsonReader = Json.createReader(new StringReader("{" - + " \"apple\":\"red\"," - + " \"banana\":\"yellow\"" - + "}")); + + " \"apple\":\"red\"," + + " \"banana\":\"yellow\"" + + "}")); JsonObject json = jsonReader.readObject(); - + assertNotNull(json); assertFalse(json.isEmpty()); assertTrue(json.containsKey("apple")); @@ -63,13 +63,13 @@ public void testSimpleObjectWithTwoElements() throws JSONException { @Test public void testArray() throws JSONException { JsonReader jsonReader = Json.createReader(new StringReader("[" - + " { \"apple\":\"red\" }," - + " { \"banana\":\"yellow\" }" - + "]")); + + " { \"apple\":\"red\" }," + + " { \"banana\":\"yellow\" }" + + "]")); JsonArray jsonArr = jsonReader.readArray(); assertNotNull(jsonArr); assertEquals(2, jsonArr.size()); - + JSONAssert.assertEquals("{\"apple\":\"red\"}", jsonArr.get(0).toString(), JSONCompareMode.STRICT); JSONAssert.assertEquals("{\"banana\":\"yellow\"}", jsonArr.get(1).toString(), JSONCompareMode.STRICT); } @@ -77,14 +77,14 @@ public void testArray() throws JSONException { @Test public void testNestedStructure() throws JSONException { JsonReader jsonReader = Json.createReader(new StringReader("{" - + " \"title\":\"The Matrix\"," - + " \"year\":1999," - + " \"cast\":[" - + " \"Keanu Reaves\"," - + " \"Laurence Fishburne\"," - + " \"Carrie-Anne Moss\"" - + " ]" - + "}")); + + " \"title\":\"The Matrix\"," + + " \"year\":1999," + + " \"cast\":[" + + " \"Keanu Reaves\"," + + " \"Laurence Fishburne\"," + + " \"Carrie-Anne Moss\"" + + " ]" + + "}")); JsonObject json = jsonReader.readObject(); assertNotNull(json); @@ -97,11 +97,11 @@ public void testNestedStructure() throws JSONException { JsonArray jsonArr = json.getJsonArray("cast"); assertNotNull(jsonArr); assertEquals(3, jsonArr.size()); - + JSONAssert.assertEquals("[" - + " \"Keanu Reaves\"," - + " \"Laurence Fishburne\"," - + " \"Carrie-Anne Moss\"" - + " ]", jsonArr.toString(), JSONCompareMode.STRICT); + + " \"Keanu Reaves\"," + + " \"Laurence Fishburne\"," + + " \"Carrie-Anne Moss\"" + + " ]", jsonArr.toString(), JSONCompareMode.STRICT); } } diff --git a/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java b/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java index 95afefb19..47623b12b 100644 --- a/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java +++ b/json/object-reader/src/test/java/org/javaee7/json/object/reader/JsonReaderFromStreamTest.java @@ -23,29 +23,29 @@ */ @RunWith(Arquillian.class) public class JsonReaderFromStreamTest { - + @Deployment public static Archive deploy() { File[] requiredLibraries = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("org.json:json", "org.skyscreamer:jsonassert") - .withTransitivity().asFile(); + .resolve("org.json:json", "org.skyscreamer:jsonassert") + .withTransitivity().asFile(); return ShrinkWrap.create(WebArchive.class) - .addAsResource("1.json") - .addAsResource("2.json") - .addAsResource("3.json") - .addAsResource("4.json") - .addAsLibraries(requiredLibraries); + .addAsResource("1.json") + .addAsResource("2.json") + .addAsResource("3.json") + .addAsResource("4.json") + .addAsLibraries(requiredLibraries); } @Test public void testEmptyObject() throws JSONException { JsonReader jsonReader = Json.createReader(Thread - .currentThread() - .getContextClassLoader() - .getResourceAsStream("/1.json")); + .currentThread() + .getContextClassLoader() + .getResourceAsStream("/1.json")); JsonObject json = jsonReader.readObject(); - + assertNotNull(json); assertTrue(json.isEmpty()); } @@ -53,11 +53,11 @@ public void testEmptyObject() throws JSONException { @Test public void testSimpleObjectWithTwoElements() throws JSONException { JsonReader jsonReader = Json.createReader(Thread - .currentThread() - .getContextClassLoader() - .getResourceAsStream("/2.json")); + .currentThread() + .getContextClassLoader() + .getResourceAsStream("/2.json")); JsonObject json = jsonReader.readObject(); - + assertNotNull(json); assertFalse(json.isEmpty()); assertTrue(json.containsKey("apple")); @@ -69,13 +69,13 @@ public void testSimpleObjectWithTwoElements() throws JSONException { @Test public void testArray() throws JSONException { JsonReader jsonReader = Json.createReader(Thread - .currentThread() - .getContextClassLoader() - .getResourceAsStream("/3.json")); + .currentThread() + .getContextClassLoader() + .getResourceAsStream("/3.json")); JsonArray jsonArr = jsonReader.readArray(); assertNotNull(jsonArr); assertEquals(2, jsonArr.size()); - + JSONAssert.assertEquals("{\"apple\":\"red\"}", jsonArr.get(0).toString(), JSONCompareMode.STRICT); JSONAssert.assertEquals("{\"banana\":\"yellow\"}", jsonArr.get(1).toString(), JSONCompareMode.STRICT); } @@ -83,9 +83,9 @@ public void testArray() throws JSONException { @Test public void testNestedStructure() throws JSONException { JsonReader jsonReader = Json.createReader(Thread - .currentThread() - .getContextClassLoader() - .getResourceAsStream("/4.json")); + .currentThread() + .getContextClassLoader() + .getResourceAsStream("/4.json")); JsonObject json = jsonReader.readObject(); assertNotNull(json); @@ -98,11 +98,11 @@ public void testNestedStructure() throws JSONException { JsonArray jsonArr = json.getJsonArray("cast"); assertNotNull(jsonArr); assertEquals(3, jsonArr.size()); - + JSONAssert.assertEquals("[" - + " \"Keanu Reaves\"," - + " \"Laurence Fishburne\"," - + " \"Carrie-Anne Moss\"" - + " ]", jsonArr.toString(), JSONCompareMode.STRICT); + + " \"Keanu Reaves\"," + + " \"Laurence Fishburne\"," + + " \"Carrie-Anne Moss\"" + + " ]", jsonArr.toString(), JSONCompareMode.STRICT); } } diff --git a/json/pom.xml b/json/pom.xml index 3b89b8463..83ceb12aa 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -1,18 +1,18 @@ 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.json - json-samples + org.javaee7 + json 1.0-SNAPSHOT pom - Java EE 7 JSON-P Samples + Java EE 7 Sample: json object-builder @@ -20,6 +20,7 @@ streaming-generate streaming-parser + org.javaee7 diff --git a/json/streaming-generate/pom.xml b/json/streaming-generate/pom.xml index 8758ab61f..df2733787 100644 --- a/json/streaming-generate/pom.xml +++ b/json/streaming-generate/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.json - json-samples + org.javaee7 + json 1.0-SNAPSHOT ../pom.xml - - org.javaee7.json - streaming-generate + org.javaee7 + json-streaming-generate 1.0-SNAPSHOT war + Java EE 7 Sample: json - streaming-generate diff --git a/json/streaming-generate/src/test/java/org/javaee7/json/streaming/generate/StreamingGeneratorTest.java b/json/streaming-generate/src/test/java/org/javaee7/json/streaming/generate/StreamingGeneratorTest.java index 85f7d88a6..7aa3be2c1 100644 --- a/json/streaming-generate/src/test/java/org/javaee7/json/streaming/generate/StreamingGeneratorTest.java +++ b/json/streaming-generate/src/test/java/org/javaee7/json/streaming/generate/StreamingGeneratorTest.java @@ -30,11 +30,11 @@ public class StreamingGeneratorTest { @Deployment public static Archive deploy() { File[] requiredLibraries = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("org.json:json", "org.skyscreamer:jsonassert") - .withTransitivity().asFile(); + .resolve("org.json:json", "org.skyscreamer:jsonassert") + .withTransitivity().asFile(); return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(requiredLibraries); + .addAsLibraries(requiredLibraries); } @Test @@ -55,10 +55,10 @@ public void testSimpleObject() throws JSONException { JsonGenerator gen = factory.createGenerator(w); gen - .writeStartObject() - .write("apple", "red") - .write("banana", "yellow") - .writeEnd(); + .writeStartObject() + .write("apple", "red") + .write("banana", "yellow") + .writeEnd(); gen.flush(); JSONAssert.assertEquals("{\"apple\" : \"red\", \"banana\" : \"yellow\" }", w.toString(), JSONCompareMode.STRICT); } @@ -70,14 +70,14 @@ public void testArray() throws JSONException { JsonGenerator gen = factory.createGenerator(w); gen - .writeStartArray() - .writeStartObject() - .write("apple", "red") - .writeEnd() - .writeStartObject() - .write("banana", "yellow") - .writeEnd() - .writeEnd(); + .writeStartArray() + .writeStartObject() + .write("apple", "red") + .writeEnd() + .writeStartObject() + .write("banana", "yellow") + .writeEnd() + .writeEnd(); gen.flush(); JSONAssert.assertEquals("[{\"apple\":\"red\"},{\"banana\":\"yellow\"}]", w.toString(), JSONCompareMode.STRICT); } @@ -89,16 +89,17 @@ public void testNestedStructure() throws JSONException { JsonGenerator gen = factory.createGenerator(w); gen - .writeStartObject() - .write("title", "The Matrix") - .write("year", 1999) - .writeStartArray("cast") - .write("Keanu Reaves") - .write("Laurence Fishburne") - .write("Carrie-Anne Moss") - .writeEnd() - .writeEnd(); + .writeStartObject() + .write("title", "The Matrix") + .write("year", 1999) + .writeStartArray("cast") + .write("Keanu Reaves") + .write("Laurence Fishburne") + .write("Carrie-Anne Moss") + .writeEnd() + .writeEnd(); gen.flush(); - JSONAssert.assertEquals("{\"title\":\"The Matrix\",\"year\":1999,\"cast\":[\"Keanu Reaves\",\"Laurence Fishburne\",\"Carrie-Anne Moss\"]}", w.toString(), JSONCompareMode.STRICT); + JSONAssert.assertEquals("{\"title\":\"The Matrix\",\"year\":1999,\"cast\":[\"Keanu Reaves\",\"Laurence Fishburne\",\"Carrie-Anne Moss\"]}", w.toString(), + JSONCompareMode.STRICT); } } diff --git a/json/streaming-parser/pom.xml b/json/streaming-parser/pom.xml index e92778773..5337edb8d 100644 --- a/json/streaming-parser/pom.xml +++ b/json/streaming-parser/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.json - json-samples + org.javaee7 + json 1.0-SNAPSHOT ../pom.xml - - org.javaee7.json - streaming-parser + org.javaee7 + json-streaming-parser 1.0-SNAPSHOT war + Java EE 7 Sample: json - streaming-parser diff --git a/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java b/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java index 8bca9dbec..de41d8520 100644 --- a/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java +++ b/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromReaderTest.java @@ -24,11 +24,11 @@ public class JsonParserFromReaderTest { @Deployment public static Archive deploy() { File[] requiredLibraries = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("org.json:json") - .withTransitivity().asFile(); + .resolve("org.json:json") + .withTransitivity().asFile(); return ShrinkWrap.create(WebArchive.class) - .addAsLibraries(requiredLibraries); + .addAsLibraries(requiredLibraries); } @Test @@ -42,9 +42,9 @@ public void testEmptyObject() throws JSONException { @Test public void testSimpleObject() throws JSONException { String json = "{" - + " \"apple\":\"red\"," - + " \"banana\":\"yellow\"" - + "}"; + + " \"apple\":\"red\"," + + " \"banana\":\"yellow\"" + + "}"; JsonParser parser = Json.createParser(new StringReader(json)); assertEquals(JsonParser.Event.START_OBJECT, parser.next()); assertEquals(JsonParser.Event.KEY_NAME, parser.next()); diff --git a/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java b/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java index c07e31f48..0b885d0f5 100644 --- a/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java +++ b/json/streaming-parser/src/test/java/org/javaee7/json/streaming/parser/JsonParserFromStreamTest.java @@ -25,23 +25,23 @@ public class JsonParserFromStreamTest { @Deployment public static Archive deploy() { File[] requiredLibraries = Maven.resolver().loadPomFromFile("pom.xml") - .resolve("org.json:json") - .withTransitivity().asFile(); + .resolve("org.json:json") + .withTransitivity().asFile(); return ShrinkWrap.create(WebArchive.class) - .addAsResource("1.json") - .addAsResource("2.json") - .addAsResource("3.json") - .addAsResource("4.json") - .addAsLibraries(requiredLibraries); + .addAsResource("1.json") + .addAsResource("2.json") + .addAsResource("3.json") + .addAsResource("4.json") + .addAsLibraries(requiredLibraries); } @Test public void testEmptyObject() throws JSONException { JsonParser parser = Json.createParser(Thread - .currentThread() - .getContextClassLoader() - .getResourceAsStream("/1.json")); + .currentThread() + .getContextClassLoader() + .getResourceAsStream("/1.json")); assertEquals(JsonParser.Event.START_OBJECT, parser.next()); assertEquals(JsonParser.Event.END_OBJECT, parser.next()); @@ -50,9 +50,9 @@ public void testEmptyObject() throws JSONException { @Test public void testSimpleObject() throws JSONException { JsonParser parser = Json.createParser(Thread - .currentThread() - .getContextClassLoader() - .getResourceAsStream("/2.json")); + .currentThread() + .getContextClassLoader() + .getResourceAsStream("/2.json")); assertEquals(JsonParser.Event.START_OBJECT, parser.next()); assertEquals(JsonParser.Event.KEY_NAME, parser.next()); @@ -65,9 +65,9 @@ public void testSimpleObject() throws JSONException { @Test public void testArray() throws JSONException { JsonParser parser = Json.createParser(Thread - .currentThread() - .getContextClassLoader() - .getResourceAsStream("/3.json")); + .currentThread() + .getContextClassLoader() + .getResourceAsStream("/3.json")); assertEquals(JsonParser.Event.START_ARRAY, parser.next()); assertEquals(JsonParser.Event.START_OBJECT, parser.next()); @@ -84,9 +84,9 @@ public void testArray() throws JSONException { @Test public void testNestedStructure() throws JSONException { JsonParser parser = Json.createParser(Thread - .currentThread() - .getContextClassLoader() - .getResourceAsStream("/4.json")); + .currentThread() + .getContextClassLoader() + .getResourceAsStream("/4.json")); assertEquals(JsonParser.Event.START_OBJECT, parser.next()); assertEquals(JsonParser.Event.KEY_NAME, parser.next()); diff --git a/jta/README.md b/jta/README.md new file mode 100644 index 000000000..1ad380401 --- /dev/null +++ b/jta/README.md @@ -0,0 +1,15 @@ +# Java EE 7 Samples: JTA 1.2# + +The [JSR 907](https://jcp.org/en/jsr/detail?id=907) specifies a revisions to the JTA specification. + +## Samples ## + + - transactional + - tx-exception + - user-transaction + +## How to run + +More information on how to run can be found at: + + diff --git a/jta/pom.xml b/jta/pom.xml index 828008f30..c00c7efa0 100644 --- a/jta/pom.xml +++ b/jta/pom.xml @@ -1,24 +1,25 @@ 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.jta - jta-samples + org.javaee7 + jta 1.0-SNAPSHOT pom - Java EE 7 JTA Samples + Java EE 7 Sample: jta + + + transactional + tx-exception + user-transaction + - - transactional - tx-exception - user-transaction - org.javaee7 diff --git a/jta/transactional/pom.xml b/jta/transactional/pom.xml index c8bdee0fe..006156b44 100644 --- a/jta/transactional/pom.xml +++ b/jta/transactional/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jta - jta-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jta - transactional - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jta + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jta-transactional + 1.0-SNAPSHOT + war + Java EE 7 Sample: jta - transactional + diff --git a/jta/transactional/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionalBean.java b/jta/transactional/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionalBean.java index af9867b52..64b3a4add 100644 --- a/jta/transactional/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionalBean.java +++ b/jta/transactional/src/main/java/org/javaee7/jta/transaction/scope/MyTransactionalBean.java @@ -10,7 +10,7 @@ public class MyTransactionalBean { @Inject MyTransactionScopedBean bean1; - + @Inject MyTransactionScopedBean bean2; diff --git a/jta/transactional/src/main/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBean.java b/jta/transactional/src/main/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBean.java index 7e9e5e286..9720f5903 100644 --- a/jta/transactional/src/main/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBean.java +++ b/jta/transactional/src/main/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBean.java @@ -12,17 +12,17 @@ public class MyTransactionalTxTypeBean { public void required() { System.out.println(getClass().getName() + "Transactional.TxType.REQUIRED"); } - + @Transactional(Transactional.TxType.REQUIRES_NEW) public void requiresNew() { System.out.println(getClass().getName() + "Transactional.TxType.REQUIRES_NEW"); } - + @Transactional(Transactional.TxType.MANDATORY) public void mandatory() { System.out.println(getClass().getName() + "Transactional.TxType.MANDATORY"); } - + @Transactional(Transactional.TxType.SUPPORTS) public void supports() { System.out.println(getClass().getName() + "Transactional.TxType.SUPPORTS"); @@ -32,7 +32,7 @@ public void supports() { public void notSupported() { System.out.println(getClass().getName() + "Transactional.TxType.NOT_SUPPORTED"); } - + @Transactional(Transactional.TxType.NEVER) public void never() { System.out.println(getClass().getName() + "Transactional.TxType.NEVER"); diff --git a/jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java b/jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java index 574f93ece..2a5252117 100644 --- a/jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java +++ b/jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanTest.java @@ -24,11 +24,12 @@ public class MyTransactionalBeanTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(MyTransactionalBean.class, MyTransactionScopedBean.class) - .addAsManifestResource("beans.xml"); + .addClasses(MyTransactionalBean.class, MyTransactionScopedBean.class) + .addAsManifestResource("beans.xml"); } - @Inject MyTransactionalBean bean; + @Inject + MyTransactionalBean bean; @Test public void should_withTransaction_have_only_one_instance_injected() { diff --git a/jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanWithUserTransactionTest.java b/jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanWithUserTransactionTest.java index d1dea538f..ab543ce3b 100644 --- a/jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanWithUserTransactionTest.java +++ b/jta/transactional/src/test/java/org/javaee7/jta/transaction/scope/MyTransactionalBeanWithUserTransactionTest.java @@ -25,16 +25,18 @@ public class MyTransactionalBeanWithUserTransactionTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(MyTransactionalBean.class, MyTransactionScopedBean.class) - .addAsManifestResource("beans.xml"); + .addClasses(MyTransactionalBean.class, MyTransactionScopedBean.class) + .addAsManifestResource("beans.xml"); } - @Inject MyTransactionalBean bean; + @Inject + MyTransactionalBean bean; - @Inject UserTransaction ut; + @Inject + UserTransaction ut; @Test - public void should_withTransaction_have_only_one_instance_injected() throws Exception{ + public void should_withTransaction_have_only_one_instance_injected() throws Exception { ut.begin(); bean.withTransaction(); ut.commit(); diff --git a/jta/transactional/src/test/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBeanTest.java b/jta/transactional/src/test/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBeanTest.java index e7bbb2ff6..066599f03 100644 --- a/jta/transactional/src/test/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBeanTest.java +++ b/jta/transactional/src/test/java/org/javaee7/jta/transactional/MyTransactionalTxTypeBeanTest.java @@ -19,15 +19,15 @@ public class MyTransactionalTxTypeBeanTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClass(MyTransactionalTxTypeBean.class); + .addClass(MyTransactionalTxTypeBean.class); } - @Inject MyTransactionalTxTypeBean bean; - + @Inject + MyTransactionalTxTypeBean bean; @Test public void should_required_work() { - bean.required(); + bean.required(); } @Test diff --git a/jta/tx-exception/pom.xml b/jta/tx-exception/pom.xml index 2003a4064..e4c9363bb 100644 --- a/jta/tx-exception/pom.xml +++ b/jta/tx-exception/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jta - jta-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jta - tx-exception - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jta + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jta-tx-exception + 1.0-SNAPSHOT + war + Java EE 7 Sample: jta - tx-exception + diff --git a/jta/tx-exception/src/main/java/org/javaee7/jta/tx/exception/Employee.java b/jta/tx-exception/src/main/java/org/javaee7/jta/tx/exception/Employee.java index a05c368ef..379ca2f12 100644 --- a/jta/tx-exception/src/main/java/org/javaee7/jta/tx/exception/Employee.java +++ b/jta/tx-exception/src/main/java/org/javaee7/jta/tx/exception/Employee.java @@ -12,7 +12,7 @@ * @author Arun Gupta */ @Entity -@Table(name="EMPLOYEE_SCHEMA_JTA") +@Table(name = "EMPLOYEE_SCHEMA_JTA") @NamedQueries({ @NamedQuery(name = "Employee.findAll", query = "SELECT e FROM Employee e") }) @@ -20,21 +20,22 @@ public class Employee implements Serializable { private static final long serialVersionUID = 1L; @Id private int id; - - @Column(length=50) + + @Column(length = 50) private String name; - - public Employee() { } - + + public Employee() { + } + public Employee(String name) { this.name = name; } - + public Employee(int id, String name) { this.id = id; this.name = name; } - + public int getId() { return id; } @@ -50,7 +51,7 @@ public String getName() { public void setName(String name) { this.name = name; } - + @Override public String toString() { return name; diff --git a/jta/tx-exception/src/main/java/org/javaee7/jta/tx/exception/EmployeeBean.java b/jta/tx-exception/src/main/java/org/javaee7/jta/tx/exception/EmployeeBean.java index fd4bc2d61..9ee6d7317 100644 --- a/jta/tx-exception/src/main/java/org/javaee7/jta/tx/exception/EmployeeBean.java +++ b/jta/tx-exception/src/main/java/org/javaee7/jta/tx/exception/EmployeeBean.java @@ -11,19 +11,19 @@ public class EmployeeBean { @PersistenceContext EntityManager em; - + @Transactional public void addAndThrowChecked() throws Exception { em.persist(new Employee(8, "Priya")); throw new Exception(); } - + @Transactional public void addAndThrowRuntime() { em.persist(new Employee(9, "Priya")); throw new RuntimeException(); - } - + } + public List getEmployees() { System.out.println("getEmployees"); return em.createNamedQuery("Employee.findAll", Employee.class).getResultList(); diff --git a/jta/tx-exception/src/test/java/org/javaee7/jta/tx/exception/EmployeeBeanTest.java b/jta/tx-exception/src/test/java/org/javaee7/jta/tx/exception/EmployeeBeanTest.java index ca1757ea1..89331d88c 100644 --- a/jta/tx-exception/src/test/java/org/javaee7/jta/tx/exception/EmployeeBeanTest.java +++ b/jta/tx-exception/src/test/java/org/javaee7/jta/tx/exception/EmployeeBeanTest.java @@ -23,14 +23,16 @@ public class EmployeeBeanTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addClasses(EmployeeBean.class, Employee.class) - .addAsManifestResource("beans.xml") - .addAsResource("META-INF/persistence.xml") - .addAsResource("META-INF/create.sql") - .addAsResource("META-INF/load.sql") - .addAsResource("META-INF/drop.sql"); + .addClasses(EmployeeBean.class, Employee.class) + .addAsManifestResource("beans.xml") + .addAsResource("META-INF/persistence.xml") + .addAsResource("META-INF/create.sql") + .addAsResource("META-INF/load.sql") + .addAsResource("META-INF/drop.sql"); } - @Inject EmployeeBean bean; + + @Inject + EmployeeBean bean; @Test public void should_have_7_employees() { @@ -41,7 +43,8 @@ public void should_have_7_employees() { public void should_have_1_more_employee_after_checked_exception() { try { bean.addAndThrowChecked(); - } catch (Exception ex) { } + } catch (Exception ex) { + } assertEquals(8, bean.getEmployees().size()); } @@ -49,7 +52,8 @@ public void should_have_1_more_employee_after_checked_exception() { public void should_not_have_1_more_employee_after_runtime_exception() { try { bean.addAndThrowRuntime(); - } catch (Exception ex) { } + } catch (Exception ex) { + } assertEquals(7, bean.getEmployees().size()); } diff --git a/jta/user-transaction/pom.xml b/jta/user-transaction/pom.xml index 56066adfc..efd1e8c58 100644 --- a/jta/user-transaction/pom.xml +++ b/jta/user-transaction/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.jta - jta-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.jta - user-transaction - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + jta + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + jta-user-transaction + 1.0-SNAPSHOT + war + Java EE 7 Sample: jta - user-transaction + diff --git a/jta/user-transaction/src/test/java/org/javaee7/jta/user/transaction/UserTransactionTest.java b/jta/user-transaction/src/test/java/org/javaee7/jta/user/transaction/UserTransactionTest.java index 765f2afed..dcb3bb556 100644 --- a/jta/user-transaction/src/test/java/org/javaee7/jta/user/transaction/UserTransactionTest.java +++ b/jta/user-transaction/src/test/java/org/javaee7/jta/user/transaction/UserTransactionTest.java @@ -23,10 +23,11 @@ public class UserTransactionTest { @Deployment public static Archive deploy() { return ShrinkWrap.create(JavaArchive.class) - .addAsManifestResource("beans.xml"); + .addAsManifestResource("beans.xml"); } - @Inject UserTransaction ut; + @Inject + UserTransaction ut; @Test public void should_work_with_cdi() throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException { @@ -37,7 +38,7 @@ public void should_work_with_cdi() throws SystemException, NotSupportedException @Test public void should_work_with_jndi() throws SystemException, NotSupportedException, HeuristicRollbackException, HeuristicMixedException, RollbackException, NamingException { Context context = new InitialContext(); - UserTransaction ut = (UserTransaction)context.lookup("java:comp/UserTransaction"); + UserTransaction ut = (UserTransaction) context.lookup("java:comp/UserTransaction"); ut.begin(); ut.commit(); } diff --git a/pom.xml b/pom.xml index c4d85943a..44ddbc89e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,935 +1,934 @@ - - 4.0.0 - - org.javaee7 - javaee7-samples - 1.0-SNAPSHOT - pom - Java EE 7 Samples - - - 1.7 - 3.0.0 - UTF-8 - 1.1.1.Final - 1.3.0.Final - 2.40.0 - 2.0.2.Final - 1.0.0.Beta2 - 8.2.0.Final - 7.2.0.Final - - 1.3.1 - false - 1.3 - 0.7-groovy-2.0 - 2.1.5 - 4.0 - - - - ${maven.min.version} - - - - test-utils - batch - cdi - concurrency - ejb - el - interceptor - javamail - jaspic - jacc - jaxrs - jaxws - jca - jms - jpa - jta - jsf - json - servlet - validation - websocket - - util - - - - - - org.jboss.arquillian - arquillian-bom - ${org.jboss.arquillian.version} - import - pom - - - org.jboss.arquillian.extension - arquillian-drone-bom - ${org.jboss.arquillian.drone.version} - pom - import - - - org.jboss.arquillian.selenium - selenium-bom - ${org.jboss.arquillian.selenium.bom.version} - pom - import - - - org.jboss.arquillian.graphene - graphene-webdriver - ${org.jboss.arquillian.graphene.version} - pom - test - - - org.javaee7 - util-samples - 1.0-SNAPSHOT - jar - test - - - - - - - javax - javaee-api - 7.0 - provided - - - - - - junit - junit - 4.11 - test - - - org.hamcrest - hamcrest-core - ${hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${hamcrest.version} - test - - - - org.assertj - assertj-core - 1.5.0 - test - - - org.jboss.arquillian.junit - arquillian-junit-container - test - - - org.jboss.arquillian.spock - arquillian-spock-container - ${org.jboss.arquillian.spock} - test - - - org.jboss.arquillian.protocol - arquillian-protocol-servlet - test - - - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-impl-maven - test - jar - - - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-impl-maven-archive - test - - - org.spockframework - spock-core - ${spock.version} - test - - - org.codehaus.groovy - groovy-all - ${groovy.version} - test - - - xmlunit - xmlunit - 1.5 - test - - - org.skyscreamer - jsonassert - 1.2.1 - test - - - httpunit - httpunit - 1.7 - test - - - net.sourceforge.htmlunit - htmlunit - 2.13 - test - - - rhino - js - 1.7R1 - test - - - org.json - json - 20131018 - test - - - com.jayway.awaitility - awaitility - 1.6.0 - test - - - - - codehaus-snapshots - Codehaus Snapshots - http://nexus.codehaus.org/snapshots/ - - false - - - true - - - - - - - codehaus-snapshots - Codehaus Snapshots - http://nexus.codehaus.org/snapshots/ - - false - - - true - - - - - - ${project.artifactId} - - - src/test/resources - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.min.version} - ${java.min.version} - groovy-eclipse-compiler - - - - org.codehaus.groovy - groovy-eclipse-compiler - 2.8.0-01 - - - org.codehaus.groovy - groovy-eclipse-batch - 2.1.5-03 - - - - - org.codehaus.groovy - groovy-eclipse-compiler - 2.8.0-01 - true - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - - default-test - test - - test - - - - org.jboss.arquillian.spock:arquillian-spock-container - - - - - spock-test - test - - test - - - - **/*Specification.java - - - org.jboss.arquillian.junit:arquillian-junit-container - - - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.17 - - true - true - - - - org.apache.maven.plugins - maven-war-plugin - 2.1.1 - - false - - - - maven-enforcer-plugin - - - - At least Maven in version ${maven.min.version} is - required. - ${maven.min.version} - - - At least a JDK in version ${java.min.version} is - required. - ${java.min.version} - - - - - - - enforce - - - - - - org.wildfly.plugins - wildfly-maven-plugin - 1.0.2.Final - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${plugin.enforcer.version} - - - - - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.17 - - true - true - - - - - - - - - wildfly-embedded-arquillian - - chromium-browser - standalone-full.xml - ${project.build.directory}/wildfly-${org.wildfly} - - - - io.undertow - undertow-websockets-jsr - 1.0.0.Beta25 - test - - - org.jboss.resteasy - resteasy-client - 3.0.5.Final - test - - - org.jboss.resteasy - resteasy-jaxb-provider - 3.0.5.Final - test - - - org.jboss.resteasy - resteasy-json-p-provider - 3.0.5.Final - test - - - org.wildfly - wildfly-arquillian-container-embedded - ${org.wildfly} - test - - - - - - src/test/resources - true - - - src/test/resources-wildfly-embedded - true - - - - - org.apache.maven.plugins - maven-dependency-plugin - - ${maven.test.skip} - - - - unpack - process-test-classes - - unpack - - - - - org.wildfly - wildfly-dist - ${org.wildfly} - zip - false - ${project.build.directory} - - - - - - - - maven-surefire-plugin - - - org.jboss.logmanager.LogManager - wildfly - - - ${project.build.directory}/wildfly-${org.wildfly} - - - - - - - - wildfly-managed-arquillian - - chromium-browser - standalone-full.xml - ${project.build.directory}/wildfly-${org.wildfly} - - - - io.undertow - undertow-websockets-jsr - 1.0.0.Beta25 - test - - - org.jboss.resteasy - resteasy-client - 3.0.5.Final - test - - - org.jboss.resteasy - resteasy-jaxb-provider - 3.0.5.Final - test - - - org.jboss.resteasy - resteasy-json-p-provider - 3.0.5.Final - test - - - org.wildfly - wildfly-arquillian-container-managed - ${org.wildfly} - test - - - - - - src/test/resources - true - - - src/test/resources-wildfly-managed - true - - - - - org.apache.maven.plugins - maven-dependency-plugin - - ${maven.test.skip} - - - - unpack - process-test-classes - - unpack - - - - - org.wildfly - wildfly-dist - ${org.wildfly} - zip - false - ${project.build.directory} - - - - - - - - maven-surefire-plugin - - - ${project.build.directory}/wildfly-${org.wildfly} - - - wildfly - - - - - - - - wildfly-remote-arquillian - - true - - - - io.undertow - undertow-websockets-jsr - 1.0.0.Beta25 - test - - - org.jboss.resteasy - resteasy-client - 3.0.5.Final - test - - - org.jboss.resteasy - resteasy-jaxb-provider - 3.0.5.Final - test - - - org.jboss.resteasy - resteasy-json-p-provider - 3.0.5.Final - test - - - org.wildfly - wildfly-arquillian-container-remote - ${org.wildfly} - test - - - - - - src/test/resources - true - - - src/test/resources-wildfly-remote - true - - - - - - jbosseap-remote-arquillian - - - org.jboss.resteasy - resteasy-client - 3.0.5.Final - test - - - org.jboss.resteasy - resteasy-jaxb-provider - 3.0.5.Final - test - - - org.jboss.resteasy - resteasy-json-p-provider - 3.0.5.Final - test - - - org.jboss.as - jboss-as-arquillian-container-remote - ${org.jboss.eap} - test - - - - - - src/test/resources - true - - - src/test/resources-jbosseap-remote - true - - - - - - glassfish-embedded-arquillian - - - org.glassfish.main.extras - glassfish-embedded-all - ${glassfish.version} - test - - - org.glassfish - javax.json - 1.0.4 - test - - - org.glassfish.tyrus - tyrus-client - 1.3 - test - - - org.glassfish.tyrus - tyrus-container-grizzly-client - 1.3 - test - - - org.glassfish.jersey.core - jersey-client - 2.4 - test - - - org.jboss.arquillian.container - arquillian-glassfish-embedded-3.1 - 1.0.0.CR4 - test - - - - - - src/test/resources - true - - - src/test/resources-glassfish-embedded - true - - - - - - glassfish-remote-arquillian - - - org.glassfish - javax.json - 1.0.4 - test - - - org.glassfish.tyrus - tyrus-client - 1.3 - test - - - org.glassfish.tyrus - tyrus-container-grizzly-client - 1.3 - test - - - org.glassfish.jersey.core - jersey-client - 2.4 - test - - - org.glassfish.jersey.media - jersey-media-json-jackson - 2.4 - test - - - org.glassfish.jersey.media - jersey-media-json-processing - 2.4 - test - - - org.jboss.arquillian.container - arquillian-glassfish-remote-3.1 - 1.0.0.CR4 - test - - - - - - src/test/resources - true - - - src/test/resources-glassfish-remote - true - - - - - - tomee-embedded-arquillian - - - org.apache.openejb - arquillian-tomee-embedded - 2.0.0-SNAPSHOT - - - org.apache.openejb - tomee-embedded - 2.0.0-SNAPSHOT - - - org.apache.openejb - tomee-webservices - 2.0.0-SNAPSHOT - - - org.apache.openejb - tomee-jaxrs - 2.0.0-SNAPSHOT - - - org.apache.batchee - batchee-jbatch - 0.2-incubating - - - org.apache.johnzon - johnzon-core - 0.1-incubating - - - org.apache.tomcat - tomcat-el-api - 8.0.14 - - - org.apache.tomcat - tomcat-jasper-el - 8.0.14 - - - org.apache.commons - commons-lang3 - 3.3.2 - - - - - - maven-surefire-plugin - - - org.apache.el.ExpressionFactoryImpl - - - - - - - - tomee-remote-arquillian - - - org.apache.openejb - arquillian-tomee-remote - 2.0.0-SNAPSHOT - - - org.apache.openejb - apache-tomee - 2.0.0-SNAPSHOT - plus - zip - - - - - - - browser-firefox - - firefox - - - - browser-chrome - - chrome - - - - browser-ie - - internetExplorer - - - - browser-safari - - safari - - - - browser-opera - - opera - - - - browser-phantomjs - - phantomjs - - - - - javadocs - - - javadocs - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - sources - process-resources - - sources - resolve - - - javadoc - false - - - - - - - - - - + + + + + ${maven.min.version} + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.17 + + true + true + + + + + 4.0.0 + org.javaee7 + samples-parent + 1.0-SNAPSHOT + pom + Java EE 7 Sample: javaee7-samples + + + + codehaus-snapshots + Codehaus Snapshots + http://nexus.codehaus.org/snapshots/ + + false + + + true + + + + + + + codehaus-snapshots + Codehaus Snapshots + http://nexus.codehaus.org/snapshots/ + + false + + + true + + + + + + 1.7 + 3.0.0 + UTF-8 + 1.1.1.Final + 1.3.0.Final + 2.40.0 + 2.0.2.Final + 1.0.0.Beta2 + 8.2.0.Final + 7.2.0.Final + + 1.3.1 + false + 1.3 + 0.7-groovy-2.0 + 2.1.5 + 4.0 + + + + test-utils + batch + cdi + concurrency + ejb + el + interceptor + javamail + jaspic + jacc + jaxrs + jaxws + jca + jms + jpa + jta + jsf + json + servlet + validation + websocket + + util + + + + + + org.jboss.arquillian + arquillian-bom + ${org.jboss.arquillian.version} + import + pom + + + org.jboss.arquillian.extension + arquillian-drone-bom + ${org.jboss.arquillian.drone.version} + pom + import + + + org.jboss.arquillian.selenium + selenium-bom + ${org.jboss.arquillian.selenium.bom.version} + pom + import + + + org.jboss.arquillian.graphene + graphene-webdriver + ${org.jboss.arquillian.graphene.version} + pom + test + + + org.javaee7 + util + 1.0-SNAPSHOT + jar + test + + + + + + + javax + javaee-api + 7.0 + provided + + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + + + + org.assertj + assertj-core + 1.5.0 + test + + + org.jboss.arquillian.junit + arquillian-junit-container + test + + + org.jboss.arquillian.spock + arquillian-spock-container + ${org.jboss.arquillian.spock} + test + + + org.jboss.arquillian.protocol + arquillian-protocol-servlet + test + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven + test + jar + + + org.jboss.shrinkwrap.resolver + shrinkwrap-resolver-impl-maven-archive + test + + + org.spockframework + spock-core + ${spock.version} + test + + + org.codehaus.groovy + groovy-all + ${groovy.version} + test + + + xmlunit + xmlunit + 1.5 + test + + + org.skyscreamer + jsonassert + 1.2.1 + test + + + httpunit + httpunit + 1.7 + test + + + net.sourceforge.htmlunit + htmlunit + 2.13 + test + + + rhino + js + 1.7R1 + test + + + org.json + json + 20131018 + test + + + com.jayway.awaitility + awaitility + 1.6.0 + test + + + + + ${project.artifactId} + + + src/test/resources + true + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.min.version} + ${java.min.version} + groovy-eclipse-compiler + + + + org.codehaus.groovy + groovy-eclipse-compiler + 2.8.0-01 + + + org.codehaus.groovy + groovy-eclipse-batch + 2.1.5-03 + + + + + org.codehaus.groovy + groovy-eclipse-compiler + 2.8.0-01 + true + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + + default-test + test + + test + + + + org.jboss.arquillian.spock:arquillian-spock-container + + + + + spock-test + test + + test + + + + **/*Specification.java + + + org.jboss.arquillian.junit:arquillian-junit-container + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.17 + + true + true + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + false + + + + maven-enforcer-plugin + + + + At least Maven in version ${maven.min.version} is + required. + ${maven.min.version} + + + At least a JDK in version ${java.min.version} is + required. + ${java.min.version} + + + + + + + enforce + + + + + + org.wildfly.plugins + wildfly-maven-plugin + 1.0.2.Final + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${plugin.enforcer.version} + + + + + + + + wildfly-embedded-arquillian + + chromium-browser + standalone-full.xml + ${project.build.directory}/wildfly-${org.wildfly} + + + + io.undertow + undertow-websockets-jsr + 1.0.0.Beta25 + test + + + org.jboss.resteasy + resteasy-client + 3.0.5.Final + test + + + org.jboss.resteasy + resteasy-jaxb-provider + 3.0.5.Final + test + + + org.jboss.resteasy + resteasy-json-p-provider + 3.0.5.Final + test + + + org.wildfly + wildfly-arquillian-container-embedded + ${org.wildfly} + test + + + + + + src/test/resources + true + + + src/test/resources-wildfly-embedded + true + + + + + org.apache.maven.plugins + maven-dependency-plugin + + ${maven.test.skip} + + + + unpack + process-test-classes + + unpack + + + + + org.wildfly + wildfly-dist + ${org.wildfly} + zip + false + ${project.build.directory} + + + + + + + + maven-surefire-plugin + + + org.jboss.logmanager.LogManager + wildfly + + + ${project.build.directory}/wildfly-${org.wildfly} + + + + + + + + wildfly-managed-arquillian + + chromium-browser + standalone-full.xml + ${project.build.directory}/wildfly-${org.wildfly} + + + + io.undertow + undertow-websockets-jsr + 1.0.0.Beta25 + test + + + org.jboss.resteasy + resteasy-client + 3.0.5.Final + test + + + org.jboss.resteasy + resteasy-jaxb-provider + 3.0.5.Final + test + + + org.jboss.resteasy + resteasy-json-p-provider + 3.0.5.Final + test + + + org.wildfly + wildfly-arquillian-container-managed + ${org.wildfly} + test + + + + + + src/test/resources + true + + + src/test/resources-wildfly-managed + true + + + + + org.apache.maven.plugins + maven-dependency-plugin + + ${maven.test.skip} + + + + unpack + process-test-classes + + unpack + + + + + org.wildfly + wildfly-dist + ${org.wildfly} + zip + false + ${project.build.directory} + + + + + + + + maven-surefire-plugin + + + ${project.build.directory}/wildfly-${org.wildfly} + + + wildfly + + + + + + + + wildfly-remote-arquillian + + true + + + + io.undertow + undertow-websockets-jsr + 1.0.0.Beta25 + test + + + org.jboss.resteasy + resteasy-client + 3.0.5.Final + test + + + org.jboss.resteasy + resteasy-jaxb-provider + 3.0.5.Final + test + + + org.jboss.resteasy + resteasy-json-p-provider + 3.0.5.Final + test + + + org.wildfly + wildfly-arquillian-container-remote + ${org.wildfly} + test + + + + + + src/test/resources + true + + + src/test/resources-wildfly-remote + true + + + + + + jbosseap-remote-arquillian + + + org.jboss.resteasy + resteasy-client + 3.0.5.Final + test + + + org.jboss.resteasy + resteasy-jaxb-provider + 3.0.5.Final + test + + + org.jboss.resteasy + resteasy-json-p-provider + 3.0.5.Final + test + + + org.jboss.as + jboss-as-arquillian-container-remote + ${org.jboss.eap} + test + + + + + + src/test/resources + true + + + src/test/resources-jbosseap-remote + true + + + + + + glassfish-embedded-arquillian + + + org.glassfish.main.extras + glassfish-embedded-all + ${glassfish.version} + test + + + org.glassfish + javax.json + 1.0.4 + test + + + org.glassfish.tyrus + tyrus-client + 1.3 + test + + + org.glassfish.tyrus + tyrus-container-grizzly-client + 1.3 + test + + + org.glassfish.jersey.core + jersey-client + 2.4 + test + + + org.jboss.arquillian.container + arquillian-glassfish-embedded-3.1 + 1.0.0.CR4 + test + + + + + + src/test/resources + true + + + src/test/resources-glassfish-embedded + true + + + + + + glassfish-remote-arquillian + + + org.glassfish + javax.json + 1.0.4 + test + + + org.glassfish.tyrus + tyrus-client + 1.3 + test + + + org.glassfish.tyrus + tyrus-container-grizzly-client + 1.3 + test + + + org.glassfish.jersey.core + jersey-client + 2.4 + test + + + org.glassfish.jersey.media + jersey-media-json-jackson + 2.4 + test + + + org.glassfish.jersey.media + jersey-media-json-processing + 2.4 + test + + + org.jboss.arquillian.container + arquillian-glassfish-remote-3.1 + 1.0.0.CR4 + test + + + + + + src/test/resources + true + + + src/test/resources-glassfish-remote + true + + + + + + tomee-embedded-arquillian + + + org.apache.openejb + arquillian-tomee-embedded + 2.0.0-SNAPSHOT + + + org.apache.openejb + tomee-embedded + 2.0.0-SNAPSHOT + + + org.apache.openejb + tomee-webservices + 2.0.0-SNAPSHOT + + + org.apache.openejb + tomee-jaxrs + 2.0.0-SNAPSHOT + + + org.apache.batchee + batchee-jbatch + 0.2-incubating + + + org.apache.johnzon + johnzon-core + 0.1-incubating + + + org.apache.tomcat + tomcat-el-api + 8.0.14 + + + org.apache.tomcat + tomcat-jasper-el + 8.0.14 + + + org.apache.commons + commons-lang3 + 3.3.2 + + + + + + maven-surefire-plugin + + + org.apache.el.ExpressionFactoryImpl + + + + + + + + tomee-remote-arquillian + + + org.apache.openejb + arquillian-tomee-remote + 2.0.0-SNAPSHOT + + + org.apache.openejb + apache-tomee + 2.0.0-SNAPSHOT + plus + zip + + + + + + + browser-firefox + + firefox + + + + browser-chrome + + chrome + + + + browser-ie + + internetExplorer + + + + browser-safari + + safari + + + + browser-opera + + opera + + + + browser-phantomjs + + phantomjs + + + + + javadocs + + + javadocs + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + sources + process-resources + + sources + resolve + + + javadoc + false + + + + + + + + + + diff --git a/servlet/README.md b/servlet/README.md new file mode 100644 index 000000000..2827d0cac --- /dev/null +++ b/servlet/README.md @@ -0,0 +1,30 @@ +# Java EE 7 Samples: Servlet 3.1# + +The [JSR 340](https://jcp.org/en/jsr/detail?id=340) specifies the next version of Java Servlets - Java Servlets 3.1. + +## Samples ## + + - cookies + - async-servlet + - error-mapping + - event-listeners + - metadata-complete + - nonblocking + - protocol-handler + - resource-packaging + - servlet-filters + - file-upload + - web-fragment + - security-basicauth + - security-form-based + - security-programmatic + - security-deny-uncovered + - security-basicauth-omission + - programmatic-registration + - simple-servlet + +## How to run + +More information on how to run can be found at: + + diff --git a/servlet/async-servlet/pom.xml b/servlet/async-servlet/pom.xml index b8ae51eee..019e91a3b 100644 --- a/servlet/async-servlet/pom.xml +++ b/servlet/async-servlet/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - async-servlet - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-async-servlet + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - async-servlet + diff --git a/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java b/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java index 87f88c47d..0be4ff676 100644 --- a/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java +++ b/servlet/async-servlet/src/main/java/org/javaee7/servlet/async/MyAsyncServlet.java @@ -17,8 +17,8 @@ */ @WebServlet(urlPatterns = "/MyAsyncServlet", asyncSupported = true) public class MyAsyncServlet extends HttpServlet { - -// @Resource(lookup="java:comp/DefaultManagedExecutorService") + + // @Resource(lookup="java:comp/DefaultManagedExecutorService") @Resource ManagedExecutorService executor; @@ -32,7 +32,7 @@ public class MyAsyncServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { AsyncContext ac = request.startAsync(); ac.addListener(new AsyncListener() { @@ -90,7 +90,7 @@ public void run() { */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -104,7 +104,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/cookies/pom.xml b/servlet/cookies/pom.xml index 22d5f2963..9bd042110 100644 --- a/servlet/cookies/pom.xml +++ b/servlet/cookies/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - cookies - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-cookies + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - cookies + diff --git a/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java b/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java index f054168c1..ba1cae496 100644 --- a/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java +++ b/servlet/cookies/src/main/java/org/javaee7/servlet/cookies/TestServlet.java @@ -14,7 +14,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) @MultipartConfig(location = "/tmp") public class TestServlet extends HttpServlet { @@ -28,7 +28,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -40,25 +40,25 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); SessionCookieConfig cookies = request.getServletContext().getSessionCookieConfig(); out.println("Found cookie: " + cookies.getName()); - + Cookie cookie = new Cookie("myCookieKey", "myCookieValue"); cookie.setMaxAge(60); response.addCookie(cookie); out.println("

Set a new cookie"); - + cookie = new Cookie("myHttpOnlyCookieKey", "myHttpOnlyCookieValue"); cookie.setHttpOnly(true); cookie.setMaxAge(60); response.addCookie(cookie); out.println("
Set a new HTTPOnly Cookie

"); out.println("Check what cookies are visible by"); - out.println("clicking here"); - + out.println("clicking here"); + out.println(""); out.println(""); } @@ -75,7 +75,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -89,7 +89,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/error-mapping/pom.xml b/servlet/error-mapping/pom.xml index 76fb5f5ad..0a10ffe60 100644 --- a/servlet/error-mapping/pom.xml +++ b/servlet/error-mapping/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - error-mapping - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-error-mapping + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - error-mapping + diff --git a/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/TestServlet.java b/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/TestServlet.java index d367f08cb..6486e4f70 100644 --- a/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/TestServlet.java +++ b/servlet/error-mapping/src/main/java/org/javaee7/servlet/error/mapping/TestServlet.java @@ -22,7 +22,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { throw new RuntimeException(); } @@ -37,7 +37,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -51,7 +51,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/event-listeners/pom.xml b/servlet/event-listeners/pom.xml index 5cdd00ce2..90543ed06 100644 --- a/servlet/event-listeners/pom.xml +++ b/servlet/event-listeners/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - event-listeners - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-event-listeners + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - event-listeners + diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestAttributeListener.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestAttributeListener.java index 9b5f6a32a..a469432a8 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestAttributeListener.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/MyServletRequestAttributeListener.java @@ -14,17 +14,17 @@ public class MyServletRequestAttributeListener implements ServletRequestAttribut @Override public void attributeAdded(ServletRequestAttributeEvent srae) { - System.out.println("MyServletRequestAttributeListener.attributeAdded: " +srae.getName()); + System.out.println("MyServletRequestAttributeListener.attributeAdded: " + srae.getName()); } @Override public void attributeRemoved(ServletRequestAttributeEvent srae) { - System.out.println("MyServletRequestAttributeListener.attributeRemoved: " +srae.getName()); + System.out.println("MyServletRequestAttributeListener.attributeRemoved: " + srae.getName()); } @Override public void attributeReplaced(ServletRequestAttributeEvent srae) { - System.out.println("MyServletRequestAttributeListener.attributeReplaced: " +srae.getName()); + System.out.println("MyServletRequestAttributeListener.attributeReplaced: " + srae.getName()); } } diff --git a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/TestServlet.java b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/TestServlet.java index 246906e72..2f6f267e3 100644 --- a/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/TestServlet.java +++ b/servlet/event-listeners/src/main/java/org/javaee7/servlet/event/listeners/TestServlet.java @@ -24,7 +24,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -68,7 +68,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -82,7 +82,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/file-upload/pom.xml b/servlet/file-upload/pom.xml index 2e62a4eee..44d680ccc 100644 --- a/servlet/file-upload/pom.xml +++ b/servlet/file-upload/pom.xml @@ -1,16 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - file-upload - 1.0-SNAPSHOT - war - - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-file-upload + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - file-upload + diff --git a/servlet/file-upload/src/main/java/org/javaee7/servlet/file/upload/TestServlet.java b/servlet/file-upload/src/main/java/org/javaee7/servlet/file/upload/TestServlet.java index 76a365b6d..ef215ff1a 100644 --- a/servlet/file-upload/src/main/java/org/javaee7/servlet/file/upload/TestServlet.java +++ b/servlet/file-upload/src/main/java/org/javaee7/servlet/file/upload/TestServlet.java @@ -13,7 +13,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet" }) @MultipartConfig(location = "/tmp") public class TestServlet extends HttpServlet { @@ -27,7 +27,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -63,7 +63,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -77,7 +77,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/file-upload/src/test/java/org/javaee7/servlet/file/upload/FileUploadTest.java b/servlet/file-upload/src/test/java/org/javaee7/servlet/file/upload/FileUploadTest.java index 05abb3faa..ddc535cb4 100644 --- a/servlet/file-upload/src/test/java/org/javaee7/servlet/file/upload/FileUploadTest.java +++ b/servlet/file-upload/src/test/java/org/javaee7/servlet/file/upload/FileUploadTest.java @@ -33,28 +33,28 @@ public class FileUploadTest { @Deployment(testable = false) public static WebArchive deploy() throws URISyntaxException { return ShrinkWrap.create(WebArchive.class) - .addClasses(TestServlet.class); + .addClasses(TestServlet.class); } @Test public void uploadFile() throws IOException, URISyntaxException { -// HttpClient client = new DefaultHttpClient(); -// HttpPost postRequest = new HttpPost(new URL(base, "TestServlet").toURI()); -// -// MultipartEntity multiPartEntity = new MultipartEntity(); -// FileBody fileBody = new FileBody(new File("pom.xml")); -// multiPartEntity.addPart("attachment", fileBody); -// -// postRequest.setEntity(multiPartEntity); -// HttpResponse response = client.execute(postRequest); -// -// String servletOutput = EntityUtils.toString(response.getEntity()); -// -// assertThat(response.getStatusLine().getStatusCode(), is(equalTo(200))); -// assertThat(servletOutput, containsString("Received 1 parts")); -// assertThat(servletOutput, containsString("writing pom.xml part")); -// assertThat(servletOutput, containsString("uploaded to: /tmp/pom.xml")); + // HttpClient client = new DefaultHttpClient(); + // HttpPost postRequest = new HttpPost(new URL(base, "TestServlet").toURI()); + // + // MultipartEntity multiPartEntity = new MultipartEntity(); + // FileBody fileBody = new FileBody(new File("pom.xml")); + // multiPartEntity.addPart("attachment", fileBody); + // + // postRequest.setEntity(multiPartEntity); + // HttpResponse response = client.execute(postRequest); + // + // String servletOutput = EntityUtils.toString(response.getEntity()); + // + // assertThat(response.getStatusLine().getStatusCode(), is(equalTo(200))); + // assertThat(servletOutput, containsString("Received 1 parts")); + // assertThat(servletOutput, containsString("writing pom.xml part")); + // assertThat(servletOutput, containsString("uploaded to: /tmp/pom.xml")); } } diff --git a/servlet/metadata-complete/pom.xml b/servlet/metadata-complete/pom.xml index 69e6331c8..cf6ab3a63 100644 --- a/servlet/metadata-complete/pom.xml +++ b/servlet/metadata-complete/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - metadata-complete - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-metadata-complete + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - metadata-complete + diff --git a/servlet/metadata-complete/src/main/java/org/javaee7/servlet/metadata/complete/TestServlet.java b/servlet/metadata-complete/src/main/java/org/javaee7/servlet/metadata/complete/TestServlet.java index f526169fd..109199a94 100644 --- a/servlet/metadata-complete/src/main/java/org/javaee7/servlet/metadata/complete/TestServlet.java +++ b/servlet/metadata-complete/src/main/java/org/javaee7/servlet/metadata/complete/TestServlet.java @@ -14,13 +14,13 @@ public class TestServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my GET"); } @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my POST"); } } diff --git a/servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java b/servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java index d75402496..3e67234fe 100644 --- a/servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java +++ b/servlet/metadata-complete/src/test/java/org/javaee7/servlet/metadata/complete/TestServletTest.java @@ -28,17 +28,17 @@ public class TestServletTest { @ArquillianResource private URL base; - + WebClient webClient; @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class). - addClass(TestServlet.class). - addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); + addClass(TestServlet.class). + addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); return war; } - + @Before public void setup() { webClient = new WebClient(); diff --git a/servlet/nonblocking/pom.xml b/servlet/nonblocking/pom.xml index 2d53f64e4..071e5e798 100644 --- a/servlet/nonblocking/pom.xml +++ b/servlet/nonblocking/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.servlet - servlet-samples + org.javaee7 + servlet 1.0-SNAPSHOT ../pom.xml - - org.javaee7.servlet - nonblocking + org.javaee7 + servlet-nonblocking 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - nonblocking diff --git a/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/MyReadListener.java b/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/MyReadListener.java index 03bdaf2ce..0f79f2767 100644 --- a/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/MyReadListener.java +++ b/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/MyReadListener.java @@ -27,7 +27,7 @@ public void onDataAvailable() { int len = -1; byte b[] = new byte[1024]; while (input.isReady() - && (len = input.read(b)) != -1) { + && (len = input.read(b)) != -1) { String data = new String(b, 0, len); System.out.println("--> " + data); } diff --git a/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/ReadTestServlet.java b/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/ReadTestServlet.java index b6a12aeb3..68322be8a 100644 --- a/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/ReadTestServlet.java +++ b/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/ReadTestServlet.java @@ -13,7 +13,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/ReadTestServlet"}, asyncSupported=true) +@WebServlet(urlPatterns = { "/ReadTestServlet" }, asyncSupported = true) public class ReadTestServlet extends HttpServlet { /** @@ -27,7 +27,7 @@ public class ReadTestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter output = response.getWriter()) { output.println(""); @@ -46,7 +46,6 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re } } - // /** * Handles the HTTP @@ -59,7 +58,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -74,7 +73,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/TestClient.java b/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/TestClient.java index 27eddb431..09a115776 100644 --- a/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/TestClient.java +++ b/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/TestClient.java @@ -17,7 +17,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestClient"}) +@WebServlet(urlPatterns = { "/TestClient" }) public class TestClient extends HttpServlet { /** @@ -31,7 +31,7 @@ public class TestClient extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -42,11 +42,11 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re out.println("

Invoke the servlet clients

"); String path = "http://" - + request.getServerName() - + ":" - + request.getServerPort() - + request.getContextPath() - + "/ReadTestServlet"; + + request.getServerName() + + ":" + + request.getServerPort() + + request.getContextPath() + + "/ReadTestServlet"; out.println("Invoking the endpoint: " + path + "
"); out.flush(); URL url = new URL(path); @@ -75,19 +75,20 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re Logger.getLogger(ReadTestServlet.class.getName()).log(Level.SEVERE, null, ex); } } -// -/** - * Handles the HTTP - * GET method. - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - * @throws IOException if an I/O error occurs - */ -@Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + + // + /** + * Handles the HTTP + * GET method. + * + * @param request servlet request + * @param response servlet response + * @throws ServletException if a servlet-specific error occurs + * @throws IOException if an I/O error occurs + */ + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { processRequest(request, response); } @@ -101,8 +102,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) * @throws IOException if an I/O error occurs */ @Override - protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { processRequest(request, response); } @@ -112,7 +113,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) * @return a String containing servlet description */ @Override - public String getServletInfo() { + public String getServletInfo() { return "Short description"; }// } diff --git a/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/WriteTestServlet.java b/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/WriteTestServlet.java index db3792342..6197097ab 100644 --- a/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/WriteTestServlet.java +++ b/servlet/nonblocking/src/main/java/org/javaee7/servlet/nonblocking/WriteTestServlet.java @@ -13,7 +13,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/WriteServlet"}) +@WebServlet(urlPatterns = { "/WriteServlet" }) public class WriteTestServlet extends HttpServlet { /** @@ -27,17 +27,17 @@ public class WriteTestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Writing Asynchronously"); + out.println("Writing Asynchronously"); out.println(""); out.println(""); out.println("

Writing Asynchronously

"); - + AsyncContext context = request.startAsync(); ServletOutputStream output = response.getOutputStream(); output.setWriteListener(new MyWriteListener(output, context)); @@ -59,7 +59,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -74,7 +74,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/pom.xml b/servlet/pom.xml index 2d20cdfc2..bb9db2427 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -1,18 +1,17 @@ + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - 4.0.0 - - org.javaee7.servlet - servlet-samples + org.javaee7 + servlet pom - Java EE 7 Servlet Samples + Java EE 7 Sample: servlet cookies @@ -36,6 +35,7 @@ programmatic-registration simple-servlet + org.javaee7 diff --git a/servlet/programmatic-registration/pom.xml b/servlet/programmatic-registration/pom.xml index 7605a34bb..6abec3004 100644 --- a/servlet/programmatic-registration/pom.xml +++ b/servlet/programmatic-registration/pom.xml @@ -1,14 +1,15 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - programmatic-registration - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-programmatic-registration + war + Java EE 7 Sample: servlet - programmatic-registration + diff --git a/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/ChildServlet.java b/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/ChildServlet.java index 63f3b6060..f3cb8133b 100644 --- a/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/ChildServlet.java +++ b/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/ChildServlet.java @@ -22,7 +22,7 @@ public class ChildServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (final PrintWriter out = response.getWriter()) { out.println(""); @@ -48,7 +48,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -62,7 +62,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/ParentServlet.java b/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/ParentServlet.java index e3d11e6dc..1aea06de2 100644 --- a/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/ParentServlet.java +++ b/servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/ParentServlet.java @@ -24,7 +24,7 @@ public class ParentServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (final PrintWriter out = response.getWriter()) { out.println(""); @@ -51,7 +51,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -65,7 +65,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/ServletTest.java b/servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/ServletTest.java index b8e1962d8..a30601115 100644 --- a/servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/ServletTest.java +++ b/servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/ServletTest.java @@ -24,20 +24,20 @@ */ @RunWith(Arquillian.class) public class ServletTest { - + @ArquillianResource private URL base; - + WebClient webClient; @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class). - addClass(ParentServlet.class). - addClass(ChildServlet.class); + addClass(ParentServlet.class). + addClass(ChildServlet.class); return war; } - + @Before public void setup() { webClient = new WebClient(); diff --git a/servlet/protocol-handler/pom.xml b/servlet/protocol-handler/pom.xml index e375af6ba..4cd9f2198 100644 --- a/servlet/protocol-handler/pom.xml +++ b/servlet/protocol-handler/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.servlet - servlet-samples + org.javaee7 + servlet 1.0-SNAPSHOT ../pom.xml - - - org.javaee7.servlet - protocol-handler + + org.javaee7 + servlet-protocol-handler 1.0-SNAPSHOT war + Java EE 7 Sample: servlet - protocol-handler diff --git a/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/MyProtocolHandler.java b/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/MyProtocolHandler.java index 783bb222a..062e9fde6 100644 --- a/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/MyProtocolHandler.java +++ b/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/MyProtocolHandler.java @@ -11,8 +11,8 @@ */ public class MyProtocolHandler implements HttpUpgradeHandler { -// public MyProtocolHandler(ServletInputStream in, ServletOutputStream out) { -// } + // public MyProtocolHandler(ServletInputStream in, ServletOutputStream out) { + // } @Override public void init(WebConnection wc) { diff --git a/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/UpgradeServlet.java b/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/UpgradeServlet.java index 1141e6362..0a06f3a3a 100644 --- a/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/UpgradeServlet.java +++ b/servlet/protocol-handler/src/main/java/org/javaee7/servlet/protocolhandler/UpgradeServlet.java @@ -11,7 +11,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/UpgradeServlet"}) +@WebServlet(urlPatterns = { "/UpgradeServlet" }) public class UpgradeServlet extends HttpServlet { /** @@ -25,12 +25,12 @@ public class UpgradeServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); - out.println("Servlet UpgradeServlet"); + out.println("Servlet UpgradeServlet"); out.println(""); out.println(""); out.println("

Servlet UpgradeServlet at " + request.getContextPath() + "

"); @@ -58,7 +58,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -73,7 +73,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/resource-packaging/pom.xml b/servlet/resource-packaging/pom.xml index 2ff557863..b1ddf7528 100644 --- a/servlet/resource-packaging/pom.xml +++ b/servlet/resource-packaging/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - resource-packaging - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-resource-packaging + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - resource-packaging + diff --git a/servlet/resource-packaging/src/test/java/org/javaee7/servlet/resource/packaging/ResourcePackagingTest.java b/servlet/resource-packaging/src/test/java/org/javaee7/servlet/resource/packaging/ResourcePackagingTest.java index 8b17d1329..5d179c70a 100644 --- a/servlet/resource-packaging/src/test/java/org/javaee7/servlet/resource/packaging/ResourcePackagingTest.java +++ b/servlet/resource-packaging/src/test/java/org/javaee7/servlet/resource/packaging/ResourcePackagingTest.java @@ -33,7 +33,7 @@ public class ResourcePackagingTest { @Deployment(testable = false) public static WebArchive deploy() throws URISyntaxException { return ShrinkWrap.create(WebArchive.class) - .addAsLibrary(new File("src/main/webapp/WEB-INF/lib/myResources.jar"), "myResources.jar"); + .addAsLibrary(new File("src/main/webapp/WEB-INF/lib/myResources.jar"), "myResources.jar"); } @ArquillianResource diff --git a/servlet/security-annotated/src/main/java/org/javaee7/servlet/security/annotated/SecureServlet.java b/servlet/security-annotated/src/main/java/org/javaee7/servlet/security/annotated/SecureServlet.java index 654f94cff..8c2e6d378 100644 --- a/servlet/security-annotated/src/main/java/org/javaee7/servlet/security/annotated/SecureServlet.java +++ b/servlet/security-annotated/src/main/java/org/javaee7/servlet/security/annotated/SecureServlet.java @@ -21,12 +21,12 @@ // @HttpMethodConstraint(value = "GET", rolesAllowed = {"g1"}), // @HttpMethodConstraint(value = "POST", rolesAllowed = {"g1"}) // }) -@ServletSecurity(@HttpConstraint(rolesAllowed={"g1"})) +@ServletSecurity(@HttpConstraint(rolesAllowed = { "g1" })) @RolesAllowed("g1") public class SecureServlet extends HttpServlet { protected void processRequest(HttpServletRequest request, HttpServletResponse response, String method) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); out.println(""); @@ -52,7 +52,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response, "GET"); } @@ -66,7 +66,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response, "POST"); } diff --git a/servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java b/servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java index 675174c55..a31e66dc4 100644 --- a/servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java +++ b/servlet/security-annotated/src/test/java/org/javaee7/servlet/security/annotated/SecureServletTest.java @@ -22,28 +22,28 @@ */ @RunWith(Arquillian.class) public class SecureServletTest { - + @ArquillianResource private URL base; - + DefaultCredentialsProvider correctCreds = new DefaultCredentialsProvider(); DefaultCredentialsProvider incorrectCreds = new DefaultCredentialsProvider(); WebClient webClient; - + @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class). - addClass(SecureServlet.class); + addClass(SecureServlet.class); return war; } - + @Before public void setup() { correctCreds.addCredentials("u1", "p1"); incorrectCreds.addCredentials("random", "random"); webClient = new WebClient(); } - + @Test public void testGetWithCorrectCredentials() throws Exception { webClient.setCredentialsProvider(correctCreds); @@ -56,7 +56,7 @@ public void testGetWithIncorrectCredentials() throws Exception { webClient.setCredentialsProvider(incorrectCreds); try { webClient.getPage(base + "/SecureServlet"); - } catch(FailingHttpStatusCodeException e) { + } catch (FailingHttpStatusCodeException e) { assertNotNull(e); assertEquals(401, e.getStatusCode()); return; @@ -84,5 +84,5 @@ public void testPostWithIncorrectCredentials() throws Exception { } fail("/SecureServlet could be accessed without proper security credentials"); } - + } diff --git a/servlet/security-basicauth-omission/pom.xml b/servlet/security-basicauth-omission/pom.xml index 2363190fb..d482ae584 100644 --- a/servlet/security-basicauth-omission/pom.xml +++ b/servlet/security-basicauth-omission/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - security-basicauth-omission - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + servlet-security-basicauth-omission + war + Java EE 7 Sample: servlet - security-basicauth-omission + diff --git a/servlet/security-basicauth-omission/src/main/java/org/javaee7/servlet/security/basicauth/omission/SecureServlet.java b/servlet/security-basicauth-omission/src/main/java/org/javaee7/servlet/security/basicauth/omission/SecureServlet.java index 96723da9e..104c4c35b 100644 --- a/servlet/security-basicauth-omission/src/main/java/org/javaee7/servlet/security/basicauth/omission/SecureServlet.java +++ b/servlet/security-basicauth-omission/src/main/java/org/javaee7/servlet/security/basicauth/omission/SecureServlet.java @@ -16,13 +16,13 @@ public class SecureServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my GET"); } @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my POST"); } } diff --git a/servlet/security-basicauth-omission/src/test/java/org/javaee7/servlet/security/basicauth/omission/SecureServletTest.java b/servlet/security-basicauth-omission/src/test/java/org/javaee7/servlet/security/basicauth/omission/SecureServletTest.java index 71db43dca..c82858a7f 100644 --- a/servlet/security-basicauth-omission/src/test/java/org/javaee7/servlet/security/basicauth/omission/SecureServletTest.java +++ b/servlet/security-basicauth-omission/src/test/java/org/javaee7/servlet/security/basicauth/omission/SecureServletTest.java @@ -38,8 +38,8 @@ public class SecureServletTest { @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class). - addClass(SecureServlet.class). - addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); + addClass(SecureServlet.class). + addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); return war; } @@ -50,14 +50,14 @@ public void setup() { incorrectCreds.addCredentials("random", "random"); } -// @Test + // @Test public void testGetWithCorrectCredentials() throws Exception { webClient.setCredentialsProvider(correctCreds); TextPage page = webClient.getPage(base + "/SecureServlet"); assertEquals("my GET", page.getContent()); } -// @Test + // @Test public void testGetWithIncorrectCredentials() throws Exception { webClient.setCredentialsProvider(incorrectCreds); try { @@ -72,7 +72,7 @@ public void testGetWithIncorrectCredentials() throws Exception { @Test public void testPostWithNoCredentials() throws Exception { -// webClient.setCredentialsProvider(correctCreds); + // webClient.setCredentialsProvider(correctCreds); WebRequest request = new WebRequest(new URL(base + "SecureServlet"), HttpMethod.POST); TextPage page = webClient.getPage(request); assertEquals("my POST", page.getContent()); diff --git a/servlet/security-basicauth/pom.xml b/servlet/security-basicauth/pom.xml index 08060c921..5f10ebeab 100644 --- a/servlet/security-basicauth/pom.xml +++ b/servlet/security-basicauth/pom.xml @@ -1,16 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - security-basicauth - 1.0-SNAPSHOT - war - security-basicauth - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-security-basicauth + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - security-basicauth + diff --git a/servlet/security-basicauth/src/main/java/org/javaee7/servlet/security/basicauth/SecureServlet.java b/servlet/security-basicauth/src/main/java/org/javaee7/servlet/security/basicauth/SecureServlet.java index d3793ff16..b17a1cce2 100644 --- a/servlet/security-basicauth/src/main/java/org/javaee7/servlet/security/basicauth/SecureServlet.java +++ b/servlet/security-basicauth/src/main/java/org/javaee7/servlet/security/basicauth/SecureServlet.java @@ -11,17 +11,17 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/SecureServlet"}) +@WebServlet(urlPatterns = { "/SecureServlet" }) public class SecureServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my GET"); } @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my POST"); } } diff --git a/servlet/security-basicauth/src/test/java/org/javaee7/servlet/security/basicauth/SecureServletTest.java b/servlet/security-basicauth/src/test/java/org/javaee7/servlet/security/basicauth/SecureServletTest.java index 4cd2e3e6c..52ba9fbda 100644 --- a/servlet/security-basicauth/src/test/java/org/javaee7/servlet/security/basicauth/SecureServletTest.java +++ b/servlet/security-basicauth/src/test/java/org/javaee7/servlet/security/basicauth/SecureServletTest.java @@ -24,21 +24,21 @@ */ @RunWith(Arquillian.class) public class SecureServletTest { - + private static final String WEBAPP_SRC = "src/main/webapp"; @ArquillianResource private URL base; - + WebClient webClient; DefaultCredentialsProvider correctCreds = new DefaultCredentialsProvider(); DefaultCredentialsProvider incorrectCreds = new DefaultCredentialsProvider(); - + @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class). - addClass(SecureServlet.class). - addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); + addClass(SecureServlet.class). + addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); return war; } @@ -48,7 +48,7 @@ public void setup() { correctCreds.addCredentials("u1", "p1"); incorrectCreds.addCredentials("random", "random"); } - + @Test public void testGetWithCorrectCredentials() throws Exception { webClient.setCredentialsProvider(correctCreds); @@ -61,14 +61,14 @@ public void testGetWithIncorrectCredentials() throws Exception { webClient.setCredentialsProvider(incorrectCreds); try { webClient.getPage(base + "/SecureServlet"); - } catch(FailingHttpStatusCodeException e) { + } catch (FailingHttpStatusCodeException e) { assertNotNull(e); assertEquals(401, e.getStatusCode()); return; } fail("/SecureServlet could be accessed without proper security credentials"); } - + @Test public void testPostWithCorrectCredentials() throws Exception { webClient.setCredentialsProvider(correctCreds); @@ -83,7 +83,7 @@ public void testPostWithIncorrectCredentials() throws Exception { WebRequest request = new WebRequest(new URL(base + "/SecureServlet"), HttpMethod.POST); try { webClient.getPage(request); - } catch(FailingHttpStatusCodeException e) { + } catch (FailingHttpStatusCodeException e) { assertNotNull(e); assertEquals(401, e.getStatusCode()); return; diff --git a/servlet/security-deny-uncovered/pom.xml b/servlet/security-deny-uncovered/pom.xml index 2120c1672..55f7fa606 100644 --- a/servlet/security-deny-uncovered/pom.xml +++ b/servlet/security-deny-uncovered/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - security-deny-uncovered - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + servlet-security-deny-uncovered + war + Java EE 7 Sample: servlet - security-deny-uncovered + diff --git a/servlet/security-deny-uncovered/src/main/java/org/javaee7/servlet/security/deny/uncovered/SecureServlet.java b/servlet/security-deny-uncovered/src/main/java/org/javaee7/servlet/security/deny/uncovered/SecureServlet.java index 720b59137..94c52891a 100644 --- a/servlet/security-deny-uncovered/src/main/java/org/javaee7/servlet/security/deny/uncovered/SecureServlet.java +++ b/servlet/security-deny-uncovered/src/main/java/org/javaee7/servlet/security/deny/uncovered/SecureServlet.java @@ -15,13 +15,13 @@ public class SecureServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my GET"); } @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my POST"); } } diff --git a/servlet/security-deny-uncovered/src/test/java/org/javaee7/servlet/security/deny/uncovered/SecureServletTest.java b/servlet/security-deny-uncovered/src/test/java/org/javaee7/servlet/security/deny/uncovered/SecureServletTest.java index 1dfdef6ae..af7427457 100644 --- a/servlet/security-deny-uncovered/src/test/java/org/javaee7/servlet/security/deny/uncovered/SecureServletTest.java +++ b/servlet/security-deny-uncovered/src/test/java/org/javaee7/servlet/security/deny/uncovered/SecureServletTest.java @@ -35,14 +35,14 @@ public class SecureServletTest { @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(SecureServlet.class) - .addAsResource(new File("src/main/resources/log4j.properties")) - .addAsWebInfResource((new File("src/main/webapp/WEB-INF/web.xml"))); - + .addClass(SecureServlet.class) + .addAsResource(new File("src/main/resources/log4j.properties")) + .addAsWebInfResource((new File("src/main/webapp/WEB-INF/web.xml"))); + System.out.println(war.toString(true)); return war; } - + @BeforeClass public static void beforeSetup() { System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog"); diff --git a/servlet/security-form-based/pom.xml b/servlet/security-form-based/pom.xml index 96a886135..51c542a34 100644 --- a/servlet/security-form-based/pom.xml +++ b/servlet/security-form-based/pom.xml @@ -1,16 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - security-form-based - 1.0-SNAPSHOT - war - security-form-based - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-security-form-based + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - security-form-based + diff --git a/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java b/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java index 21b7bfc4b..3881aafa9 100644 --- a/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java +++ b/servlet/security-form-based/src/test/java/org/javaee7/servlet/security/form/based/FormTest.java @@ -34,11 +34,11 @@ public class FormTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addAsWebResource(new File(WEBAPP_SRC, "index.jsp")) - .addAsWebResource(new File(WEBAPP_SRC, "loginerror.jsp")) - .addAsWebResource(new File(WEBAPP_SRC, "loginform.jsp")) - .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")) - .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml")); + .addAsWebResource(new File(WEBAPP_SRC, "index.jsp")) + .addAsWebResource(new File(WEBAPP_SRC, "loginerror.jsp")) + .addAsWebResource(new File(WEBAPP_SRC, "loginform.jsp")) + .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "web.xml")) + .addAsWebInfResource(new File(WEBAPP_SRC + "/WEB-INF", "glassfish-web.xml")); } @Before @@ -55,7 +55,7 @@ public void testGetWithCorrectCredentials() throws Exception { loginForm.getInputByName("j_password").setValueAttribute("p1"); HtmlSubmitInput submitButton = loginForm.getInputByName("submitButton"); HtmlPage page2 = submitButton.click(); - + assertEquals("Form-based Security - Success", page2.getTitleText()); } @@ -65,7 +65,7 @@ public void testGetWithIncorrectCredentials() throws Exception { loginForm.getInputByName("j_password").setValueAttribute("random"); HtmlSubmitInput submitButton = loginForm.getInputByName("submitButton"); HtmlPage page2 = submitButton.click(); - + assertEquals("Form-Based Login Error Page", page2.getTitleText()); } } diff --git a/servlet/security-programmatic/pom.xml b/servlet/security-programmatic/pom.xml index ddad81e17..29bf850de 100644 --- a/servlet/security-programmatic/pom.xml +++ b/servlet/security-programmatic/pom.xml @@ -1,14 +1,14 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - security-programmatic - war - security-programmatic - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + servlet-security-programmatic + war + Java EE 7 Sample: servlet - security-programmatic + diff --git a/servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java b/servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java index 673d44fd6..71adead87 100644 --- a/servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java +++ b/servlet/security-programmatic/src/main/java/org/javaee7/servlet/programmatic/login/LoginServlet.java @@ -11,7 +11,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/LoginServlet"}) +@WebServlet(urlPatterns = { "/LoginServlet" }) public class LoginServlet extends HttpServlet { /** @@ -24,16 +24,16 @@ public class LoginServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); PrintWriter out = response.getWriter(); String user = request.getParameter("user"); String password = request.getParameter("password"); - + if (user != null && password != null) { request.login(user, password); } - + userDetails(out, request); } @@ -55,7 +55,7 @@ private void userDetails(PrintWriter out, HttpServletRequest request) { */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -69,7 +69,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java b/servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java index cebc0df7a..898ca791b 100644 --- a/servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java +++ b/servlet/security-programmatic/src/test/java/org/javaee7/servlet/programmatic/login/LoginServletTest.java @@ -22,7 +22,7 @@ */ @RunWith(Arquillian.class) public class LoginServletTest { - + private static final String WEBAPP_SRC = "src/main/webapp"; @ArquillianResource @@ -31,8 +31,8 @@ public class LoginServletTest { @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class). - addClass(LoginServlet.class). - addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); + addClass(LoginServlet.class). + addAsWebInfResource((new File(WEBAPP_SRC + "/WEB-INF", "web.xml"))); return war; } @@ -41,17 +41,16 @@ public void testUnauthenticatedRequest() throws IOException, SAXException { WebClient webClient = new WebClient(); HtmlPage page = webClient.getPage(base + "/LoginServlet"); String responseText = page.asText(); - -// WebRequest request = new WebRequest(new URL(base + "/LoginServlet"), HttpMethod.GET); -// WebResponse response = webClient.getWebConnection().getResponse(request); -// String responseText = response.getContentAsString(); - assert(responseText.contains("isUserInRole?false")); - assert(responseText.contains("getRemoteUser?null")); - assert(responseText.contains("getUserPrincipal?null")); - assert(responseText.contains("getAuthType?null")); - } + // WebRequest request = new WebRequest(new URL(base + "/LoginServlet"), HttpMethod.GET); + // WebResponse response = webClient.getWebConnection().getResponse(request); + // String responseText = response.getContentAsString(); + assert (responseText.contains("isUserInRole?false")); + assert (responseText.contains("getRemoteUser?null")); + assert (responseText.contains("getUserPrincipal?null")); + assert (responseText.contains("getAuthType?null")); + } @Test public void testAuthenticatedRequest() throws IOException, SAXException { @@ -60,10 +59,10 @@ public void testAuthenticatedRequest() throws IOException, SAXException { WebResponse response = webClient.getWebConnection().getResponse(request); String responseText = response.getContentAsString(); System.out.println(responseText); - - assert(responseText.contains("isUserInRole?true")); - assert(responseText.contains("getRemoteUser?u1")); - assert(responseText.contains("getUserPrincipal?u1")); - assert(responseText.contains("getAuthType?BASIC")); + + assert (responseText.contains("isUserInRole?true")); + assert (responseText.contains("getRemoteUser?u1")); + assert (responseText.contains("getUserPrincipal?u1")); + assert (responseText.contains("getAuthType?BASIC")); } } diff --git a/servlet/servlet-filters/pom.xml b/servlet/servlet-filters/pom.xml index 03950d3e5..aaa5cf172 100644 --- a/servlet/servlet-filters/pom.xml +++ b/servlet/servlet-filters/pom.xml @@ -1,13 +1,14 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - servlet-filters - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + servlet-servlet-filters + war + Java EE 7 Sample: servlet - servlet-filters + diff --git a/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/FooBarFilter.java b/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/FooBarFilter.java index 17f513bed..4c8ce6586 100644 --- a/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/FooBarFilter.java +++ b/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/FooBarFilter.java @@ -14,13 +14,13 @@ /** * @author Arun Gupta */ -@WebFilter(filterName = "FooBarFilter", urlPatterns = {"/filtered/*"}) +@WebFilter(filterName = "FooBarFilter", urlPatterns = { "/filtered/*" }) public class FooBarFilter implements Filter { private FilterConfig filterConfig; private void doBeforeProcessing(ServletRequest request, ServletResponse response) - throws IOException, ServletException { + throws IOException, ServletException { try (PrintWriter out = response.getWriter()) { out.print("foo--"); out.flush(); @@ -28,7 +28,7 @@ private void doBeforeProcessing(ServletRequest request, ServletResponse response } private void doAfterProcessing(ServletRequest request, ServletResponse response) - throws IOException, ServletException { + throws IOException, ServletException { try (PrintWriter out = response.getWriter()) { out.print("--bar"); out.flush(); @@ -37,11 +37,11 @@ private void doAfterProcessing(ServletRequest request, ServletResponse response) @Override public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) - throws IOException, ServletException { + FilterChain chain) + throws IOException, ServletException { PrintWriter out = response.getWriter(); CharResponseWrapper wrappedResponse = new CharResponseWrapper( - (HttpServletResponse)response); + (HttpServletResponse) response); doBeforeProcessing(request, wrappedResponse); chain.doFilter(request, wrappedResponse); diff --git a/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/TestServlet.java b/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/TestServlet.java index e24eaf4c4..18b6ea2cc 100644 --- a/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/TestServlet.java +++ b/servlet/servlet-filters/src/main/java/org/javaee7/servlet/filters/TestServlet.java @@ -11,12 +11,12 @@ /** * @author Kuba Marchwicki */ -@WebServlet(urlPatterns = {"/TestServlet", "/filtered/TestServlet"}) +@WebServlet(urlPatterns = { "/TestServlet", "/filtered/TestServlet" }) public class TestServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.print("bar"); diff --git a/servlet/servlet-filters/src/test/java/org/javaee7/servlet/filters/FilterServletTest.java b/servlet/servlet-filters/src/test/java/org/javaee7/servlet/filters/FilterServletTest.java index c27708764..6da88151e 100644 --- a/servlet/servlet-filters/src/test/java/org/javaee7/servlet/filters/FilterServletTest.java +++ b/servlet/servlet-filters/src/test/java/org/javaee7/servlet/filters/FilterServletTest.java @@ -26,8 +26,8 @@ public class FilterServletTest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClass(CharResponseWrapper.class) - .addClasses(TestServlet.class, FooBarFilter.class); + .addClass(CharResponseWrapper.class) + .addClasses(TestServlet.class, FooBarFilter.class); } @ArquillianResource diff --git a/servlet/simple-servlet/pom.xml b/servlet/simple-servlet/pom.xml index c532f141c..5a2d35483 100644 --- a/servlet/simple-servlet/pom.xml +++ b/servlet/simple-servlet/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - simple-servlet - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-simple-servlet + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - simple-servlet + diff --git a/servlet/simple-servlet/src/main/java/org/javaee7/servlet/simple/SimpleServlet.java b/servlet/simple-servlet/src/main/java/org/javaee7/servlet/simple/SimpleServlet.java index 64ee1b800..6f929c4ce 100644 --- a/servlet/simple-servlet/src/main/java/org/javaee7/servlet/simple/SimpleServlet.java +++ b/servlet/simple-servlet/src/main/java/org/javaee7/servlet/simple/SimpleServlet.java @@ -14,13 +14,13 @@ public class SimpleServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my GET"); } @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.getWriter().print("my POST"); } } diff --git a/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java b/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java index d20a90c32..ac1adc07f 100644 --- a/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java +++ b/servlet/simple-servlet/src/test/java/org/javaee7/servlet/metadata/complete/SimpleServletTest.java @@ -27,16 +27,16 @@ public class SimpleServletTest { @ArquillianResource private URL base; - + WebClient webClient; @Deployment(testable = false) public static WebArchive createDeployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClass(SimpleServlet.class); + .addClass(SimpleServlet.class); return war; } - + @Before public void setup() { webClient = new WebClient(); diff --git a/servlet/web-fragment/pom.xml b/servlet/web-fragment/pom.xml index 1c0d34f11..224442afe 100644 --- a/servlet/web-fragment/pom.xml +++ b/servlet/web-fragment/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - org.javaee7.servlet - servlet-samples - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.servlet - web-fragment - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + org.javaee7 + servlet + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + servlet-web-fragment + 1.0-SNAPSHOT + war + Java EE 7 Sample: servlet - web-fragment + diff --git a/servlet/web-fragment/src/main/java/org/javaee7/servlet/web/fragment/TestServlet.java b/servlet/web-fragment/src/main/java/org/javaee7/servlet/web/fragment/TestServlet.java index 3b76f2e46..887466c67 100644 --- a/servlet/web-fragment/src/main/java/org/javaee7/servlet/web/fragment/TestServlet.java +++ b/servlet/web-fragment/src/main/java/org/javaee7/servlet/web/fragment/TestServlet.java @@ -24,7 +24,7 @@ public class TestServlet extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); @@ -51,7 +51,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -65,7 +65,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/test-utils/pom.xml b/test-utils/pom.xml index 72d64a4f9..26d3dc06e 100644 --- a/test-utils/pom.xml +++ b/test-utils/pom.xml @@ -1,17 +1,13 @@ + + 4.0.0 - - javaee7-samples + samples-parent org.javaee7 1.0-SNAPSHOT ../pom.xml - 4.0.0 - test-utils - - + Java EE 7 Sample: javaee7-samples - test-utils diff --git a/util/pom.xml b/util/pom.xml index 8d97fe37d..778ad79d1 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -1,17 +1,14 @@ - + 4.0.0 org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - util-samples + util 1.0-SNAPSHOT - + Java EE 7 Sample: javaee7-samples - util diff --git a/validation/README.md b/validation/README.md new file mode 100644 index 000000000..576bf4f29 --- /dev/null +++ b/validation/README.md @@ -0,0 +1,14 @@ +# Java EE 7 Samples: Bean Validation 1.1# + +The [JSR 303](https://jcp.org/en/jsr/detail?id=303) specifies a meta-data model and API for JavaBeanTM validation based on annotations, with overrides and extended meta-data through the use of XML validation descriptors. + +## Samples ## + + - methods + - custom-constraint + +## How to run + +More information on how to run can be found at: + + diff --git a/validation/custom-constraint/pom.xml b/validation/custom-constraint/pom.xml index e26fc8567..a2f8400d8 100644 --- a/validation/custom-constraint/pom.xml +++ b/validation/custom-constraint/pom.xml @@ -1,16 +1,16 @@ - - - 4.0.0 - - validation-samples - org.javaee7.validation - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.validation - custom-constraint - 1.0-SNAPSHOT - war - - + + + 4.0.0 + + + validation + org.javaee7 + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + validation-custom-constraint + 1.0-SNAPSHOT + war + Java EE 7 Sample: validation - custom-constraint + diff --git a/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/MyBean.java b/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/MyBean.java index ef18f5c6f..c508f307f 100644 --- a/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/MyBean.java +++ b/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/MyBean.java @@ -10,7 +10,7 @@ public class MyBean { public void saveZip(@ZipCode String zip) { System.out.println("Saving zip code for default country (US)"); } - + public void saveZipIndia(@ZipCode(country = ZipCode.Country.INDIA) String zip) { System.out.println("Saving zip code for India"); } diff --git a/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/ZipCode.java b/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/ZipCode.java index aed9de811..49fc8a1b0 100644 --- a/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/ZipCode.java +++ b/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/ZipCode.java @@ -15,11 +15,11 @@ * @author Arun Gupta */ @Documented -@Target({ElementType.ANNOTATION_TYPE, +@Target({ ElementType.ANNOTATION_TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, - ElementType.PARAMETER}) + ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) @Constraint(validatedBy = ZipCodeValidator.class) @Size(min = 5, message = "{org.sample.zipcode.min_size}") diff --git a/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/ZipCodeValidator.java b/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/ZipCodeValidator.java index 767a63669..2c901e818 100644 --- a/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/ZipCodeValidator.java +++ b/validation/custom-constraint/src/main/java/org/javaee7/validation/custom/constraint/ZipCodeValidator.java @@ -9,7 +9,7 @@ * @author Arun Gupta */ public class ZipCodeValidator - implements ConstraintValidator { + implements ConstraintValidator { List zipcodes; @@ -44,7 +44,7 @@ public void initialize(ZipCode constraintAnnotation) { @Override public boolean isValid(String value, ConstraintValidatorContext context) { System.out.println("Validating: " + value); - System.out.println("state: "+ zipcodes.contains(value)); + System.out.println("state: " + zipcodes.contains(value)); return zipcodes.contains(value); } } diff --git a/validation/custom-constraint/src/test/java/org/javaee7/validation/custom/constraint/CustomConstraintTest.java b/validation/custom-constraint/src/test/java/org/javaee7/validation/custom/constraint/CustomConstraintTest.java index 80fbd2530..851d7a958 100644 --- a/validation/custom-constraint/src/test/java/org/javaee7/validation/custom/constraint/CustomConstraintTest.java +++ b/validation/custom-constraint/src/test/java/org/javaee7/validation/custom/constraint/CustomConstraintTest.java @@ -24,9 +24,9 @@ public class CustomConstraintTest { @Deployment public static Archive deployment() { WebArchive war = ShrinkWrap.create(WebArchive.class) - .addClasses(MyBean.class, ZipCode.class, ZipCodeValidator.class) - .addAsResource("ValidationMessages.properties"); - + .addClasses(MyBean.class, ZipCode.class, ZipCodeValidator.class) + .addAsResource("ValidationMessages.properties"); + System.out.println(war.toString(true)); return war; } @@ -38,8 +38,8 @@ public void saveZipCodeforUs() { @Test public void saveZipCodeForIndia() { -// thrown.equals(ConstraintViolationException.class); -// thrown.expectMessage("javaee7.validation.custom.constraint.ZipCode"); + // thrown.equals(ConstraintViolationException.class); + // thrown.expectMessage("javaee7.validation.custom.constraint.ZipCode"); thrown.expectMessage("saveZipIndia.arg0"); bean.saveZipIndia("95051"); } diff --git a/validation/methods/pom.xml b/validation/methods/pom.xml index ecec5dafe..4e545f192 100644 --- a/validation/methods/pom.xml +++ b/validation/methods/pom.xml @@ -1,15 +1,16 @@ - + + + 4.0.0 + - org.javaee7.validation - validation-samples + org.javaee7 + validation 1.0-SNAPSHOT ../pom.xml - - 4.0.0 - - org.javaee7.validation - methods + + org.javaee7 + validation-methods 1.0-SNAPSHOT war + Java EE 7 Sample: validation - methods diff --git a/validation/methods/src/main/java/org/javaee7/validation/methods/MyBean.java b/validation/methods/src/main/java/org/javaee7/validation/methods/MyBean.java index 77d37ea82..7f87f8ae4 100644 --- a/validation/methods/src/main/java/org/javaee7/validation/methods/MyBean.java +++ b/validation/methods/src/main/java/org/javaee7/validation/methods/MyBean.java @@ -14,30 +14,30 @@ */ @RequestScoped public class MyBean { - public String sayHello(@Size(max = 3)String name) { + public String sayHello(@Size(max = 3) String name) { return "Hello " + name; } - + @Future public Date showDate(boolean correct) { Calendar cal = Calendar.getInstance(); cal.add(Calendar.DAY_OF_MONTH, correct ? 5 : -5); return cal.getTime(); } - - public String showList(@NotNull @Size(min=1, max=3) List list, @NotNull String prefix) { + + public String showList(@NotNull @Size(min = 1, max = 3) List list, @NotNull String prefix) { StringBuilder builder = new StringBuilder(); - + for (String s : list) { builder.append(prefix).append(s).append(" "); } - + return builder.toString(); } - -// @NotNull(validationAppliesTo=ConstraintType.PARAMETERS) -// @NotNull -// public void concat(String str1, String str2) { -// str1.concat(str2); -// } + + // @NotNull(validationAppliesTo=ConstraintType.PARAMETERS) + // @NotNull + // public void concat(String str1, String str2) { + // str1.concat(str2); + // } } diff --git a/validation/methods/src/main/java/org/javaee7/validation/methods/MyBean2.java b/validation/methods/src/main/java/org/javaee7/validation/methods/MyBean2.java index b51cfc744..1d875368b 100644 --- a/validation/methods/src/main/java/org/javaee7/validation/methods/MyBean2.java +++ b/validation/methods/src/main/java/org/javaee7/validation/methods/MyBean2.java @@ -20,7 +20,6 @@ public MyBean2(@Valid MyParameter value) { this.value = value; } - public MyParameter getValue() { return value; } diff --git a/validation/methods/src/test/java/org/javaee7/validation/methods/ConstructorParametersConstraintsTest.java b/validation/methods/src/test/java/org/javaee7/validation/methods/ConstructorParametersConstraintsTest.java index fbb73a248..5a6bb0f20 100644 --- a/validation/methods/src/test/java/org/javaee7/validation/methods/ConstructorParametersConstraintsTest.java +++ b/validation/methods/src/test/java/org/javaee7/validation/methods/ConstructorParametersConstraintsTest.java @@ -27,49 +27,49 @@ @RunWith(Arquillian.class) public class ConstructorParametersConstraintsTest { - @Inject - Validator validator; + @Inject + Validator validator; - @Rule - public ExpectedException thrown = ExpectedException.none(); + @Rule + public ExpectedException thrown = ExpectedException.none(); - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(MyBean2.class, MyParameter.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(MyBean2.class, MyParameter.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } - @Test - public void constructorViolationsWhenNullParameters() throws NoSuchMethodException, SecurityException { + @Test + public void constructorViolationsWhenNullParameters() throws NoSuchMethodException, SecurityException { final MyParameter parameter = new MyParameter(); - ExecutableValidator methodValidator = validator.forExecutables(); - Constructor constructor = MyBean2.class - .getConstructor(parameter.getClass()); + ExecutableValidator methodValidator = validator.forExecutables(); + Constructor constructor = MyBean2.class + .getConstructor(parameter.getClass()); - Set> constraints = methodValidator - .validateConstructorParameters(constructor, new Object[] {parameter}); + Set> constraints = methodValidator + .validateConstructorParameters(constructor, new Object[] { parameter }); - ConstraintViolation violation = constraints.iterator().next(); - assertThat(constraints.size(), equalTo(1)); - assertThat(violation.getMessageTemplate(), equalTo("{javax.validation.constraints.NotNull.message}")); - assertThat(violation.getPropertyPath().toString(), equalTo("MyBean2.arg0.value")); - } + ConstraintViolation violation = constraints.iterator().next(); + assertThat(constraints.size(), equalTo(1)); + assertThat(violation.getMessageTemplate(), equalTo("{javax.validation.constraints.NotNull.message}")); + assertThat(violation.getPropertyPath().toString(), equalTo("MyBean2.arg0.value")); + } - @Test - public void constructorViolationsWhenNotNullParameters() throws NoSuchMethodException, SecurityException { - final MyParameter parameter = new MyParameter(); + @Test + public void constructorViolationsWhenNotNullParameters() throws NoSuchMethodException, SecurityException { + final MyParameter parameter = new MyParameter(); parameter.setValue("foo"); ExecutableValidator methodValidator = validator.forExecutables(); - Constructor constructor = MyBean2.class - .getConstructor(parameter.getClass()); + Constructor constructor = MyBean2.class + .getConstructor(parameter.getClass()); - Set> constraints = methodValidator - .validateConstructorParameters(constructor, new Object[] {parameter}); + Set> constraints = methodValidator + .validateConstructorParameters(constructor, new Object[] { parameter }); - assertThat(constraints.isEmpty(), equalTo(true)); - } + assertThat(constraints.isEmpty(), equalTo(true)); + } } diff --git a/validation/methods/src/test/java/org/javaee7/validation/methods/ConstructorParametersInjectionTest.java b/validation/methods/src/test/java/org/javaee7/validation/methods/ConstructorParametersInjectionTest.java index d57fbe3af..4702c605c 100644 --- a/validation/methods/src/test/java/org/javaee7/validation/methods/ConstructorParametersInjectionTest.java +++ b/validation/methods/src/test/java/org/javaee7/validation/methods/ConstructorParametersInjectionTest.java @@ -20,25 +20,25 @@ @RunWith(Arquillian.class) public class ConstructorParametersInjectionTest { - @Inject - MyBean2 bean; + @Inject + MyBean2 bean; @Rule public ExpectedException thrown = ExpectedException.none(); - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class) - .addClasses(MyBean2.class, MyParameter.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class) + .addClasses(MyBean2.class, MyParameter.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } - @Test - public void constructorViolationsWhenNullParameters() { + @Test + public void constructorViolationsWhenNullParameters() { thrown.expect(ConstraintViolationException.class); thrown.expectMessage("javax.validation.constraints.NotNull"); thrown.expectMessage("MyBean2.arg0.value"); - bean.getValue(); - } + bean.getValue(); + } } diff --git a/validation/methods/src/test/java/org/javaee7/validation/methods/MethodParametersConstraintsTest.java b/validation/methods/src/test/java/org/javaee7/validation/methods/MethodParametersConstraintsTest.java index 4252678d7..42c1a61da 100644 --- a/validation/methods/src/test/java/org/javaee7/validation/methods/MethodParametersConstraintsTest.java +++ b/validation/methods/src/test/java/org/javaee7/validation/methods/MethodParametersConstraintsTest.java @@ -26,69 +26,69 @@ @RunWith(Arquillian.class) public class MethodParametersConstraintsTest { - @Inject - MyBean bean; - - @Rule - public ExpectedException thrown = ExpectedException.none(); - - @Deployment - public static Archive deployment() { - return ShrinkWrap.create(JavaArchive.class).addClasses(MyBean.class) - .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); - } - - @Test - public void methodSizeTooLong() { - thrown.expect(ConstraintViolationException.class); - thrown.expectMessage("javax.validation.constraints.Size"); - thrown.expectMessage("org.javaee7.validation.methods.MyBean.sayHello"); - bean.sayHello("Duke"); - } - - @Test - public void methodSizeOk() { - bean.sayHello("Duk"); - } - - @Test - public void showDateFromPast() { - thrown.expect(ConstraintViolationException.class); - thrown.expectMessage("javax.validation.constraints.Future"); - thrown.expectMessage("org.javaee7.validation.methods.MyBean.showDate"); - bean.showDate(false); - } - - @Test - public void showDateFromFuture() { - bean.showDate(true); - } - - @Test - public void multipleParametersWithEmptyList() { - thrown.expect(ConstraintViolationException.class); - thrown.expectMessage("javax.validation.constraints.Size"); - thrown.expectMessage("showList.arg0"); - bean.showList(new ArrayList(), "foo"); - } - - @Test - public void multipleParametersNullSecondParameter() { - thrown.expect(ConstraintViolationException.class); - thrown.expectMessage("javax.validation.constraints.NotNull"); - thrown.expectMessage("showList.arg1"); - - List list = new ArrayList<>(); - list.add("bar"); - bean.showList(list, null); - } - - @Test - public void multipleParametersWithCorrectValues() { - List list = new ArrayList<>(); - list.add("bar"); - list.add("woof"); - String string = bean.showList(list, "foo"); - assertThat(string, is(equalTo("foobar foowoof "))); - } + @Inject + MyBean bean; + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Deployment + public static Archive deployment() { + return ShrinkWrap.create(JavaArchive.class).addClasses(MyBean.class) + .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml"); + } + + @Test + public void methodSizeTooLong() { + thrown.expect(ConstraintViolationException.class); + thrown.expectMessage("javax.validation.constraints.Size"); + thrown.expectMessage("org.javaee7.validation.methods.MyBean.sayHello"); + bean.sayHello("Duke"); + } + + @Test + public void methodSizeOk() { + bean.sayHello("Duk"); + } + + @Test + public void showDateFromPast() { + thrown.expect(ConstraintViolationException.class); + thrown.expectMessage("javax.validation.constraints.Future"); + thrown.expectMessage("org.javaee7.validation.methods.MyBean.showDate"); + bean.showDate(false); + } + + @Test + public void showDateFromFuture() { + bean.showDate(true); + } + + @Test + public void multipleParametersWithEmptyList() { + thrown.expect(ConstraintViolationException.class); + thrown.expectMessage("javax.validation.constraints.Size"); + thrown.expectMessage("showList.arg0"); + bean.showList(new ArrayList(), "foo"); + } + + @Test + public void multipleParametersNullSecondParameter() { + thrown.expect(ConstraintViolationException.class); + thrown.expectMessage("javax.validation.constraints.NotNull"); + thrown.expectMessage("showList.arg1"); + + List list = new ArrayList<>(); + list.add("bar"); + bean.showList(list, null); + } + + @Test + public void multipleParametersWithCorrectValues() { + List list = new ArrayList<>(); + list.add("bar"); + list.add("woof"); + String string = bean.showList(list, "foo"); + assertThat(string, is(equalTo("foobar foowoof "))); + } } diff --git a/validation/pom.xml b/validation/pom.xml index daf300064..77243943e 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -1,24 +1,24 @@ + 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - 4.0.0 - - org.javaee7.validation - validation-samples + org.javaee7 + validation 1.0-SNAPSHOT pom - Java EE 7 Bean Validation Samples + Java EE 7 Sample: validation methods custom-constraint + org.javaee7 diff --git a/websocket/README.md b/websocket/README.md new file mode 100644 index 000000000..03b97b829 --- /dev/null +++ b/websocket/README.md @@ -0,0 +1,41 @@ +# Java EE 7 Samples: Websocket 1.0# + +The [JSR 356](https://jcp.org/en/jsr/detail?id=303) specifies a standard API for creating WebSocket applications. + +## Samples ## + + - chat + - encoder + - encoder-client + - encoder-programmatic + - endpoint + - endpoint-async + - endpoint-javatypes + - endpoint-config + - endpoint-programmatic + - endpoint-programmatic-async + - endpoint-programmatic-config + - endpoint-programmatic-injection + - endpoint-security + - httpsession + - injection + - javase-client + - messagesize + - parameters + - properties + - websocket-vs-rest + - subprotocol + - websocket-client + - websocket-client-config + - websocket-client-programmatic + - websocket-client-programmatic-config + - websocket-client-programmatic-encoders + - whiteboard + - endpoint-singleton + - websocket-vs-rest-payload + +## How to run + +More information on how to run can be found at: + + diff --git a/websocket/atmosphere-chat/src/main/java/org/javaee7/websocket/atmosphere/ChatEndpoint.java b/websocket/atmosphere-chat/src/main/java/org/javaee7/websocket/atmosphere/ChatEndpoint.java index 75ba25029..7135b181d 100644 --- a/websocket/atmosphere-chat/src/main/java/org/javaee7/websocket/atmosphere/ChatEndpoint.java +++ b/websocket/atmosphere-chat/src/main/java/org/javaee7/websocket/atmosphere/ChatEndpoint.java @@ -65,7 +65,7 @@ public void onDisconnect(AtmosphereResourceEvent event) { * @return * @throws IOException */ - @org.atmosphere.config.service.Message(encoders = {JacksonEncoder.class}, decoders = {JacksonDecoder.class}) + @org.atmosphere.config.service.Message(encoders = { JacksonEncoder.class }, decoders = { JacksonDecoder.class }) public Message onMessage(Message message) throws IOException { logger.info("{} just send {}", message.getAuthor(), message.getMessage()); return message; diff --git a/websocket/binary/src/main/java/org/javaee7/websocket/binary/MyEndpointClient.java b/websocket/binary/src/main/java/org/javaee7/websocket/binary/MyEndpointClient.java index 04e986cfa..1649856cb 100644 --- a/websocket/binary/src/main/java/org/javaee7/websocket/binary/MyEndpointClient.java +++ b/websocket/binary/src/main/java/org/javaee7/websocket/binary/MyEndpointClient.java @@ -29,7 +29,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(byte[] message) { MyEndpointClient.response = message; diff --git a/websocket/binary/src/test/java/org/javaee7/websocket/binary/test/MyEndpointTest.java b/websocket/binary/src/test/java/org/javaee7/websocket/binary/test/MyEndpointTest.java index bb1a7ed0a..fb6ca9856 100644 --- a/websocket/binary/src/test/java/org/javaee7/websocket/binary/test/MyEndpointTest.java +++ b/websocket/binary/src/test/java/org/javaee7/websocket/binary/test/MyEndpointTest.java @@ -43,13 +43,13 @@ public class MyEndpointTest { * Arquillian specific method for creating a file which can be deployed * while executing the test. */ - @Deployment(testable=false) + @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(MyEndpointByteBuffer.class, - MyEndpointByteArray.class, - MyEndpointInputStream.class, - MyEndpointClient.class); + .addClasses(MyEndpointByteBuffer.class, + MyEndpointByteArray.class, + MyEndpointInputStream.class, + MyEndpointClient.class); } /** @@ -120,13 +120,13 @@ public void testEndpointInputStream() throws DeploymentException, IOException, U public Session connectToServer(String endpoint) throws DeploymentException, IOException, URISyntaxException { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); URI uri = new URI("ws://" - + base.getHost() - + ":" - + base.getPort() - + "/" - + base.getPath() - + "/" - + endpoint); + + base.getHost() + + ":" + + base.getPort() + + "/" + + base.getPath() + + "/" + + endpoint); System.out.println("Connecting to: " + uri); return container.connectToServer(MyEndpointClient.class, uri); } diff --git a/websocket/chat/pom.xml b/websocket/chat/pom.xml index b4f1a5562..a84dc1d3c 100644 --- a/websocket/chat/pom.xml +++ b/websocket/chat/pom.xml @@ -1,16 +1,17 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - chat + org.javaee7 + websocket-chat 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - chat diff --git a/websocket/chat/src/main/java/org/javaee7/websocket/chat/ChatClientEndpoint1.java b/websocket/chat/src/main/java/org/javaee7/websocket/chat/ChatClientEndpoint1.java index 4c927707d..0c42de33d 100644 --- a/websocket/chat/src/main/java/org/javaee7/websocket/chat/ChatClientEndpoint1.java +++ b/websocket/chat/src/main/java/org/javaee7/websocket/chat/ChatClientEndpoint1.java @@ -25,7 +25,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(String message) { response = message; diff --git a/websocket/chat/src/main/java/org/javaee7/websocket/chat/ChatClientEndpoint2.java b/websocket/chat/src/main/java/org/javaee7/websocket/chat/ChatClientEndpoint2.java index bde246e11..628b18e58 100644 --- a/websocket/chat/src/main/java/org/javaee7/websocket/chat/ChatClientEndpoint2.java +++ b/websocket/chat/src/main/java/org/javaee7/websocket/chat/ChatClientEndpoint2.java @@ -25,7 +25,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(String message) { response = message; diff --git a/websocket/chat/src/test/java/org/javaee7/websocket/chat/ChatTest.java b/websocket/chat/src/test/java/org/javaee7/websocket/chat/ChatTest.java index a434f6b0a..fdc55fbf5 100644 --- a/websocket/chat/src/test/java/org/javaee7/websocket/chat/ChatTest.java +++ b/websocket/chat/src/test/java/org/javaee7/websocket/chat/ChatTest.java @@ -23,25 +23,25 @@ */ @RunWith(Arquillian.class) public class ChatTest { - + @ArquillianResource URI base; @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(ChatEndpoint.class, - ChatClientEndpoint1.class, - ChatClientEndpoint2.class); + .addClasses(ChatEndpoint.class, + ChatClientEndpoint1.class, + ChatClientEndpoint2.class); } - + @Test public void testConnect() throws URISyntaxException, DeploymentException, IOException, InterruptedException { ChatClientEndpoint1.latch = new CountDownLatch(1); final Session session1 = connectToServer(ChatClientEndpoint1.class); assertNotNull(session1); assertTrue(ChatClientEndpoint1.latch.await(2, TimeUnit.SECONDS)); - + assertEquals(ChatClientEndpoint1.TEXT, ChatClientEndpoint1.response); ChatClientEndpoint1.latch = new CountDownLatch(1); @@ -53,16 +53,15 @@ public void testConnect() throws URISyntaxException, DeploymentException, IOExce assertEquals(ChatClientEndpoint2.TEXT, ChatClientEndpoint1.response); assertEquals(ChatClientEndpoint2.TEXT, ChatClientEndpoint2.response); } - public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); URI uri = new URI("ws://" - + base.getHost() - + ":" - + base.getPort() - + base.getPath() - + "chat"); + + base.getHost() + + ":" + + base.getPort() + + base.getPath() + + "chat"); return container.connectToServer(endpoint, uri); } } diff --git a/websocket/encoder-client/pom.xml b/websocket/encoder-client/pom.xml index b1e87e97e..7e81eb3e2 100644 --- a/websocket/encoder-client/pom.xml +++ b/websocket/encoder-client/pom.xml @@ -1,16 +1,17 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - encoder-client + org.javaee7 + websocket-encoder-client 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - encoder-client diff --git a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyClient.java b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyClient.java index 692af5241..9b21d184e 100644 --- a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyClient.java +++ b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyClient.java @@ -15,12 +15,12 @@ /** * @author Arun Gupta */ -@ClientEndpoint(encoders = {MyMessageEncoder.class}, - decoders={MyMessageDecoder.class}) +@ClientEndpoint(encoders = { MyMessageEncoder.class }, + decoders = { MyMessageDecoder.class }) public class MyClient { - public static CountDownLatch latch= new CountDownLatch(3); + public static CountDownLatch latch = new CountDownLatch(3); public static MyMessage response; - + @OnOpen public void onOpen(Session session) { try { @@ -30,13 +30,13 @@ public void onOpen(Session session) { Logger.getLogger(MyClient.class.getName()).log(Level.SEVERE, null, ex); } } - + @OnMessage public void processMessage(MyMessage message) { - response = message; - latch.countDown(); + response = message; + latch.countDown(); } - + @OnError public void onError(Throwable t) { t.printStackTrace(); diff --git a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyEndpoint.java b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyEndpoint.java index b42ebf4e5..2038a214b 100644 --- a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyEndpoint.java +++ b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyEndpoint.java @@ -9,13 +9,14 @@ */ @ServerEndpoint("/encoder-client") public class MyEndpoint { - + @OnOpen - public void onOpen() { } - + public void onOpen() { + } + @OnMessage - public String echoText(String text) { + public String echoText(String text) { return text; } - + } diff --git a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessage.java b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessage.java index 648ac26c1..a302559bd 100644 --- a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessage.java +++ b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessage.java @@ -8,12 +8,12 @@ * @author Arun Gupta */ public class MyMessage { - + private JsonObject jsonObject; public MyMessage() { } - + public MyMessage(String string) { jsonObject = Json.createReader(new StringReader(string)).readObject(); } @@ -29,10 +29,10 @@ public JsonObject getJsonObject() { public void setJsonObject(JsonObject jsonObject) { this.jsonObject = jsonObject; } - + @Override public String toString() { return jsonObject.toString(); } - + } diff --git a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessageDecoder.java b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessageDecoder.java index afbf47c7a..7ecb91b74 100644 --- a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessageDecoder.java +++ b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessageDecoder.java @@ -23,8 +23,10 @@ public boolean willDecode(String string) { } @Override - public void init(EndpointConfig ec) { } + public void init(EndpointConfig ec) { + } @Override - public void destroy() { } + public void destroy() { + } } diff --git a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessageEncoder.java b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessageEncoder.java index 159ba359a..0cd5f59dd 100644 --- a/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessageEncoder.java +++ b/websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyMessageEncoder.java @@ -15,8 +15,10 @@ public String encode(MyMessage myMessage) throws EncodeException { } @Override - public void init(EndpointConfig ec) { } + public void init(EndpointConfig ec) { + } @Override - public void destroy() { } + public void destroy() { + } } diff --git a/websocket/encoder-client/src/test/java/org/javaee7/websocket/encoder/client/MyClientTest.java b/websocket/encoder-client/src/test/java/org/javaee7/websocket/encoder/client/MyClientTest.java index 0713173ae..5d7600449 100644 --- a/websocket/encoder-client/src/test/java/org/javaee7/websocket/encoder/client/MyClientTest.java +++ b/websocket/encoder-client/src/test/java/org/javaee7/websocket/encoder/client/MyClientTest.java @@ -37,10 +37,10 @@ public class MyClientTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(MyEndpoint.class, - MyMessage.class, - MyMessageEncoder.class, - MyMessageDecoder.class); + .addClasses(MyEndpoint.class, + MyMessage.class, + MyMessageEncoder.class, + MyMessageDecoder.class); } @Test @@ -51,18 +51,18 @@ public void testEndpoint() throws URISyntaxException, DeploymentException, IOExc assertTrue(MyClient.latch.await(2, TimeUnit.SECONDS)); assertEquals(JSON, MyClient.response.toString()); } - + public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); assertNotNull(container); assertNotNull(base); URI uri = new URI("ws://" - + base.getHost() - + ":" - + base.getPort() - + base.getPath() - + "encoder-client"); + + base.getHost() + + ":" + + base.getPort() + + base.getPath() + + "encoder-client"); return container.connectToServer(endpoint, uri); } - + } diff --git a/websocket/encoder-programmatic/pom.xml b/websocket/encoder-programmatic/pom.xml index 0f3f6a95a..8f0960161 100644 --- a/websocket/encoder-programmatic/pom.xml +++ b/websocket/encoder-programmatic/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - encoder-programmatic + org.javaee7 + websocket-encoder-programmatic 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - encoder-programmatic diff --git a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyClient.java b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyClient.java index dc5213402..50c79d638 100644 --- a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyClient.java +++ b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyClient.java @@ -14,12 +14,12 @@ /** * @author Arun Gupta */ -@ClientEndpoint(encoders = {MyMessageEncoder.class}, - decoders={MyMessageDecoder.class}) +@ClientEndpoint(encoders = { MyMessageEncoder.class }, + decoders = { MyMessageDecoder.class }) public class MyClient { - public static CountDownLatch latch= new CountDownLatch(3); + public static CountDownLatch latch = new CountDownLatch(3); public static MyMessage response; - + @OnOpen public void onOpen(Session session) { try { @@ -29,13 +29,13 @@ public void onOpen(Session session) { Logger.getLogger(MyClient.class.getName()).log(Level.SEVERE, null, ex); } } - + @OnMessage public void processMessage(MyMessage message) { - response = message; - latch.countDown(); + response = message; + latch.countDown(); } - + @OnError public void onError(Throwable t) { t.printStackTrace(); diff --git a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyEndpointConfiguration.java b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyEndpointConfiguration.java index 7d8be4c49..dc5e886bb 100644 --- a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyEndpointConfiguration.java +++ b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyEndpointConfiguration.java @@ -27,12 +27,12 @@ public MyEndpointConfiguration() { @Override public Set getEndpointConfigs(Set> set) { - Set config = new HashSet(); - config.add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/encoder-programmatic") - .encoders(encoders) - .decoders(decoders) - .build()); - return config; + Set config = new HashSet(); + config.add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/encoder-programmatic") + .encoders(encoders) + .decoders(decoders) + .build()); + return config; } @Override diff --git a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessage.java b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessage.java index 1688831f8..1a0d66389 100644 --- a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessage.java +++ b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessage.java @@ -8,12 +8,12 @@ * @author Arun Gupta */ public class MyMessage { - + private JsonObject jsonObject; public MyMessage() { } - + public MyMessage(String string) { jsonObject = Json.createReader(new StringReader(string)).readObject(); } @@ -29,10 +29,10 @@ public JsonObject getJsonObject() { public void setJsonObject(JsonObject jsonObject) { this.jsonObject = jsonObject; } - + @Override public String toString() { return jsonObject.toString(); } - + } diff --git a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessageDecoder.java b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessageDecoder.java index 815cf5145..0ea4bdcd4 100644 --- a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessageDecoder.java +++ b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessageDecoder.java @@ -22,10 +22,12 @@ public MyMessage decode(String string) throws DecodeException { public boolean willDecode(String string) { return true; } - + @Override - public void init(EndpointConfig ec) { } + public void init(EndpointConfig ec) { + } @Override - public void destroy() { } + public void destroy() { + } } diff --git a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessageEncoder.java b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessageEncoder.java index 64daaa266..2369f063b 100644 --- a/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessageEncoder.java +++ b/websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyMessageEncoder.java @@ -13,10 +13,12 @@ public String encode(MyMessage myMessage) throws EncodeException { MyClient.latch.countDown(); return myMessage.getJsonObject().toString(); } - + @Override - public void init(EndpointConfig ec) { } + public void init(EndpointConfig ec) { + } @Override - public void destroy() { } + public void destroy() { + } } diff --git a/websocket/encoder-programmatic/src/test/java/org/javaee7/websocket/encoder/programmatic/MyClientTest.java b/websocket/encoder-programmatic/src/test/java/org/javaee7/websocket/encoder/programmatic/MyClientTest.java index 0e0e80d8c..2f17b8e65 100644 --- a/websocket/encoder-programmatic/src/test/java/org/javaee7/websocket/encoder/programmatic/MyClientTest.java +++ b/websocket/encoder-programmatic/src/test/java/org/javaee7/websocket/encoder/programmatic/MyClientTest.java @@ -33,11 +33,11 @@ public class MyClientTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(MyEndpoint.class, - MyEndpointConfiguration.class, - MyMessage.class, - MyMessageEncoder.class, - MyMessageDecoder.class); + .addClasses(MyEndpoint.class, + MyEndpointConfiguration.class, + MyMessage.class, + MyMessageEncoder.class, + MyMessageDecoder.class); } @Test @@ -48,18 +48,18 @@ public void testEndpoint() throws URISyntaxException, DeploymentException, IOExc assertTrue(MyClient.latch.await(2, TimeUnit.SECONDS)); assertEquals(JSON, MyClient.response.toString()); } - + public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); assertNotNull(container); assertNotNull(base); URI uri = new URI("ws://" - + base.getHost() - + ":" - + base.getPort() - + base.getPath() - + "encoder-programmatic"); + + base.getHost() + + ":" + + base.getPort() + + base.getPath() + + "encoder-programmatic"); return container.connectToServer(endpoint, uri); } - + } diff --git a/websocket/encoder/pom.xml b/websocket/encoder/pom.xml index ac465dce4..cd82759b0 100644 --- a/websocket/encoder/pom.xml +++ b/websocket/encoder/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - encoder + org.javaee7 + websocket-encoder 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - encoder diff --git a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpoint.java b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpoint.java index 5e0dfa5fa..5bfa547ad 100644 --- a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpoint.java +++ b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpoint.java @@ -6,14 +6,14 @@ /** * @author Arun Gupta */ -@ServerEndpoint(value = "/encoder", - encoders = {MyMessageEncoder.class}, - decoders = {MyMessageDecoder.class}) +@ServerEndpoint(value = "/encoder", + encoders = { MyMessageEncoder.class }, + decoders = { MyMessageDecoder.class }) public class MyEndpoint { @OnMessage public MyMessage messageReceived(MyMessage message) { System.out.println("messageReceived: " + message); - + return message; } } diff --git a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientEmptyJSONArray.java b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientEmptyJSONArray.java index 5d2b8bc8e..a818d48fc 100644 --- a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientEmptyJSONArray.java +++ b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientEmptyJSONArray.java @@ -15,7 +15,7 @@ @ClientEndpoint public class MyEndpointClientEmptyJSONArray { public static String JSON = "{}"; - public static CountDownLatch latch= new CountDownLatch(1); + public static CountDownLatch latch = new CountDownLatch(1); public static String response; @OnOpen @@ -26,7 +26,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(String message) { response = message; diff --git a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientJSONObject.java b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientJSONObject.java index b65bd42e7..64178c626 100644 --- a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientJSONObject.java +++ b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientJSONObject.java @@ -26,7 +26,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(String message) { response = message; diff --git a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessage.java b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessage.java index b31913d08..80c8c4edb 100644 --- a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessage.java +++ b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessage.java @@ -6,7 +6,7 @@ * @author Arun Gupta */ public class MyMessage { - + private JsonObject jsonObject; public MyMessage() { @@ -23,10 +23,10 @@ public JsonObject getJsonObject() { public void setJsonObject(JsonObject jsonObject) { this.jsonObject = jsonObject; } - + @Override public String toString() { return jsonObject.toString(); } - + } diff --git a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageDecoder.java b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageDecoder.java index 6c7771fc5..fae90f639 100644 --- a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageDecoder.java +++ b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageDecoder.java @@ -23,8 +23,10 @@ public boolean willDecode(String string) { } @Override - public void init(EndpointConfig ec) { } + public void init(EndpointConfig ec) { + } @Override - public void destroy() { } + public void destroy() { + } } diff --git a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageEncoder.java b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageEncoder.java index 19ccf67e0..5a4b2f54f 100644 --- a/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageEncoder.java +++ b/websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageEncoder.java @@ -14,8 +14,10 @@ public String encode(MyMessage myMessage) throws EncodeException { } @Override - public void init(EndpointConfig ec) { } + public void init(EndpointConfig ec) { + } @Override - public void destroy() { } + public void destroy() { + } } diff --git a/websocket/encoder/src/test/java/org/javaee7/websocket/encoder/EncoderEndpointTest.java b/websocket/encoder/src/test/java/org/javaee7/websocket/encoder/EncoderEndpointTest.java index 1c607545b..00f17133e 100644 --- a/websocket/encoder/src/test/java/org/javaee7/websocket/encoder/EncoderEndpointTest.java +++ b/websocket/encoder/src/test/java/org/javaee7/websocket/encoder/EncoderEndpointTest.java @@ -39,10 +39,10 @@ public class EncoderEndpointTest { @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(MyEndpoint.class, - MyMessage.class, - MyMessageEncoder.class, - MyMessageDecoder.class); + .addClasses(MyEndpoint.class, + MyMessage.class, + MyMessageEncoder.class, + MyMessageDecoder.class); } @Test @@ -75,11 +75,11 @@ public void testEndpointEmptyJSONObject() throws URISyntaxException, DeploymentE public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); URI uri = new URI("ws://" - + base.getHost() - + ":" - + base.getPort() - + base.getPath() - + "encoder"); + + base.getHost() + + ":" + + base.getPort() + + base.getPath() + + "encoder"); return container.connectToServer(endpoint, uri); } } diff --git a/websocket/endpoint-async/pom.xml b/websocket/endpoint-async/pom.xml index bbc95383a..bc8db4980 100644 --- a/websocket/endpoint-async/pom.xml +++ b/websocket/endpoint-async/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - endpoint-async + org.javaee7 + websocket-endpoint-async 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint-async diff --git a/websocket/endpoint-async/src/test/java/org/javaee7/websocket/endpoint/async/MyAsyncEndpointTest.java b/websocket/endpoint-async/src/test/java/org/javaee7/websocket/endpoint/async/MyAsyncEndpointTest.java index 83ac0096f..8a409a8a3 100644 --- a/websocket/endpoint-async/src/test/java/org/javaee7/websocket/endpoint/async/MyAsyncEndpointTest.java +++ b/websocket/endpoint-async/src/test/java/org/javaee7/websocket/endpoint/async/MyAsyncEndpointTest.java @@ -35,8 +35,8 @@ public class MyAsyncEndpointTest { @Deployment(testable = false) public static WebArchive deploy() throws URISyntaxException { return ShrinkWrap.create(WebArchive.class) - .addClass(MyAsyncEndpointText.class) - .addClass(MyAsyncEndpointByteBuffer.class); + .addClass(MyAsyncEndpointText.class) + .addClass(MyAsyncEndpointByteBuffer.class); } @Test @@ -76,10 +76,10 @@ private Session connectToEndpoint(Object endpoint, String uriPart) throws URISyn private URI getURI(String uriPart) throws URISyntaxException { return new URI("ws://" - + base.getHost() - + ":" - + base.getPort() - + base.getPath() - + uriPart); + + base.getHost() + + ":" + + base.getPort() + + base.getPath() + + uriPart); } } diff --git a/websocket/endpoint-config/pom.xml b/websocket/endpoint-config/pom.xml index e2daac569..de1742de0 100644 --- a/websocket/endpoint-config/pom.xml +++ b/websocket/endpoint-config/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket-samples - endpoint-config + org.javaee7 + websocket-endpoint-config 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint-config diff --git a/websocket/endpoint-config/src/main/java/org/javaee7/websocket/endpoint/config/MyConfigurator.java b/websocket/endpoint-config/src/main/java/org/javaee7/websocket/endpoint/config/MyConfigurator.java index 914f11ba3..cb4342ecc 100644 --- a/websocket/endpoint-config/src/main/java/org/javaee7/websocket/endpoint/config/MyConfigurator.java +++ b/websocket/endpoint-config/src/main/java/org/javaee7/websocket/endpoint/config/MyConfigurator.java @@ -21,5 +21,5 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, } } } - + } diff --git a/websocket/endpoint-config/src/main/java/org/javaee7/websocket/endpoint/config/MyEndpoint.java b/websocket/endpoint-config/src/main/java/org/javaee7/websocket/endpoint/config/MyEndpoint.java index 4a5488bcf..4346aa79e 100644 --- a/websocket/endpoint-config/src/main/java/org/javaee7/websocket/endpoint/config/MyEndpoint.java +++ b/websocket/endpoint-config/src/main/java/org/javaee7/websocket/endpoint/config/MyEndpoint.java @@ -6,9 +6,9 @@ /** * @author Arun Gupta */ -@ServerEndpoint(value="/websocket", configurator = MyConfigurator.class) +@ServerEndpoint(value = "/websocket", configurator = MyConfigurator.class) public class MyEndpoint { - + @OnMessage public String echoText(String name) { return name; diff --git a/websocket/endpoint-javatypes/pom.xml b/websocket/endpoint-javatypes/pom.xml index db5ae5c7b..72fc81dd3 100644 --- a/websocket/endpoint-javatypes/pom.xml +++ b/websocket/endpoint-javatypes/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - endpoint-javatypes + org.javaee7 + websocket-endpoint-javatypes 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint-javatypes diff --git a/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpoint.java b/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpoint.java index efff36b71..57490e2e4 100644 --- a/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpoint.java +++ b/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpoint.java @@ -8,7 +8,7 @@ */ @ServerEndpoint("/websocket") public class MyEndpoint { - + @OnMessage public String echoText(String text) { System.out.println("echoText"); diff --git a/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointFloat.java b/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointFloat.java index 262a0a226..bb58d9d17 100644 --- a/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointFloat.java +++ b/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointFloat.java @@ -8,7 +8,7 @@ */ @ServerEndpoint("/websocket-float") public class MyEndpointFloat { - + @OnMessage public float echoFloat(Float f) { System.out.println("echoFloat"); diff --git a/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointInt.java b/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointInt.java index 2592631e7..f72ba7d7e 100644 --- a/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointInt.java +++ b/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointInt.java @@ -8,7 +8,7 @@ */ @ServerEndpoint("/websocket-int") public class MyEndpointInt { - + @OnMessage public int echoInt(int i) { System.out.println("echoInt"); diff --git a/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointReader.java b/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointReader.java index f41763f93..2ea37b173 100644 --- a/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointReader.java +++ b/websocket/endpoint-javatypes/src/main/java/org/javaee7/websocket/endpoint/javatypes/MyEndpointReader.java @@ -13,7 +13,7 @@ */ @ServerEndpoint("/websocket-reader") public class MyEndpointReader { - + @OnMessage public String echoReader(Reader reader) { System.out.println("echoReader"); @@ -24,7 +24,7 @@ public String echoReader(Reader reader) { Logger.getLogger(MyEndpointReader.class.getName()).log(Level.SEVERE, null, ex); return null; } - + return new String(buffer.array()); } } diff --git a/websocket/endpoint-partial/src/main/java/org/glassfish/endpoint/multipart/MyEndpoint.java b/websocket/endpoint-partial/src/main/java/org/glassfish/endpoint/multipart/MyEndpoint.java index 093fa4f7f..e0b1c0457 100644 --- a/websocket/endpoint-partial/src/main/java/org/glassfish/endpoint/multipart/MyEndpoint.java +++ b/websocket/endpoint-partial/src/main/java/org/glassfish/endpoint/multipart/MyEndpoint.java @@ -10,17 +10,18 @@ /** * @author Arun Gupta */ -@ServerEndpoint(value="/websocket") +@ServerEndpoint(value = "/websocket") public class MyEndpoint { - + @OnOpen public void onOpen(Session session) { System.out.println("Connected from: " + session.getRequestURI()); } - + @OnMessage -// public String echoText(String data) { - public String echoText(String data, boolean part) { + // public String echoText(String data) { + public + String echoText(String data, boolean part) { System.out.println("boolean(text) " + data); System.out.println("text length " + data.length()); if (part) { @@ -33,15 +34,15 @@ public String echoText(String data, boolean part) { @OnMessage public void echoBinary(ByteBuffer data, Session session) throws IOException { -// public ByteBuffer echoBinary(ByteBuffer data, boolean part) { + // public ByteBuffer echoBinary(ByteBuffer data, boolean part) { System.out.println("boolean(binary) " + data); System.out.println("binary length " + data.array().length); -// if (part) { -// System.out.println("whole message received"); -// } else { -// System.out.println("partial message received"); -// } + // if (part) { + // System.out.println("whole message received"); + // } else { + // System.out.println("partial message received"); + // } session.getBasicRemote().sendBinary(data); -// return data; + // return data; } } diff --git a/websocket/endpoint-programmatic-async/pom.xml b/websocket/endpoint-programmatic-async/pom.xml index c58f976e5..706d233af 100644 --- a/websocket/endpoint-programmatic-async/pom.xml +++ b/websocket/endpoint-programmatic-async/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - endpoint-programmatic-async + org.javaee7 + websocket-endpoint-programmatic-async 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint-programmatic-async diff --git a/websocket/endpoint-programmatic-async/src/main/java/org/javaee7/websocket/endpoint/programmatic/async/MyApplicationConfig.java b/websocket/endpoint-programmatic-async/src/main/java/org/javaee7/websocket/endpoint/programmatic/async/MyApplicationConfig.java index 78e168d27..1feb4ee17 100644 --- a/websocket/endpoint-programmatic-async/src/main/java/org/javaee7/websocket/endpoint/programmatic/async/MyApplicationConfig.java +++ b/websocket/endpoint-programmatic-async/src/main/java/org/javaee7/websocket/endpoint/programmatic/async/MyApplicationConfig.java @@ -14,10 +14,12 @@ public class MyApplicationConfig implements ServerApplicationConfig { @Override public Set getEndpointConfigs(Set> set) { - return new HashSet() {{ - add(ServerEndpointConfig.Builder.create(MyEndpointHandler.class, "/websocket-handler").build()); - add(ServerEndpointConfig.Builder.create(MyEndpointFuture.class, "/websocket-future").build()); - }}; + return new HashSet() { + { + add(ServerEndpointConfig.Builder.create(MyEndpointHandler.class, "/websocket-handler").build()); + add(ServerEndpointConfig.Builder.create(MyEndpointFuture.class, "/websocket-future").build()); + } + }; } @Override diff --git a/websocket/endpoint-programmatic-async/src/main/java/org/javaee7/websocket/endpoint/programmatic/async/MyEndpointFuture.java b/websocket/endpoint-programmatic-async/src/main/java/org/javaee7/websocket/endpoint/programmatic/async/MyEndpointFuture.java index 454082e66..40a4412b1 100644 --- a/websocket/endpoint-programmatic-async/src/main/java/org/javaee7/websocket/endpoint/programmatic/async/MyEndpointFuture.java +++ b/websocket/endpoint-programmatic-async/src/main/java/org/javaee7/websocket/endpoint/programmatic/async/MyEndpointFuture.java @@ -21,12 +21,12 @@ public void onOpen(final Session session, EndpointConfig ec) { @Override public void onMessage(String data) { System.out.println("Received (MyEndpointFuture) : " + data); -// try { -// session.getBasicRemote().sendText(data); -// } catch (IOException ex) { -// Logger.getLogger(MyEndpointFuture.class.getName()).log(Level.SEVERE, null, ex); -// } - + // try { + // session.getBasicRemote().sendText(data); + // } catch (IOException ex) { + // Logger.getLogger(MyEndpointFuture.class.getName()).log(Level.SEVERE, null, ex); + // } + Future f = session.getAsyncRemote().sendText(data); try { Thread.sleep(3000); diff --git a/websocket/endpoint-programmatic-config/pom.xml b/websocket/endpoint-programmatic-config/pom.xml index 8a20340d0..0eee403c4 100644 --- a/websocket/endpoint-programmatic-config/pom.xml +++ b/websocket/endpoint-programmatic-config/pom.xml @@ -1,15 +1,16 @@ - - - 4.0.0 - - websocket-samples - org.javaee7.websocket - 1.0-SNAPSHOT - ../pom.xml - - - org.javaee7.websocket - endpoint-programmatic-config - 1.0-SNAPSHOT - war - + + + 4.0.0 + + + websocket + org.javaee7 + 1.0-SNAPSHOT + ../pom.xml + + org.javaee7 + websocket-endpoint-programmatic-config + 1.0-SNAPSHOT + war + Java EE 7 Sample: websocket - endpoint-programmatic-config + diff --git a/websocket/endpoint-programmatic-config/src/main/java/org/javaee7/websocket/endpoint/programmatic/config/MyConfigurator.java b/websocket/endpoint-programmatic-config/src/main/java/org/javaee7/websocket/endpoint/programmatic/config/MyConfigurator.java index a747f5df6..deae2613a 100644 --- a/websocket/endpoint-programmatic-config/src/main/java/org/javaee7/websocket/endpoint/programmatic/config/MyConfigurator.java +++ b/websocket/endpoint-programmatic-config/src/main/java/org/javaee7/websocket/endpoint/programmatic/config/MyConfigurator.java @@ -48,5 +48,4 @@ public String getNegotiatedSubprotocol(List supported, List requ return super.getNegotiatedSubprotocol(supported, requested); } - } diff --git a/websocket/endpoint-programmatic-config/src/main/java/org/javaee7/websocket/endpoint/programmatic/config/MyEndpoint.java b/websocket/endpoint-programmatic-config/src/main/java/org/javaee7/websocket/endpoint/programmatic/config/MyEndpoint.java index 81608971c..fc4a0dd07 100644 --- a/websocket/endpoint-programmatic-config/src/main/java/org/javaee7/websocket/endpoint/programmatic/config/MyEndpoint.java +++ b/websocket/endpoint-programmatic-config/src/main/java/org/javaee7/websocket/endpoint/programmatic/config/MyEndpoint.java @@ -29,7 +29,7 @@ public void onMessage(String text) { } } }); - + session.addMessageHandler(new MessageHandler.Whole() { @Override @@ -41,7 +41,7 @@ public void onMessage(ByteBuffer t) { } } }); - + session.addMessageHandler(new MessageHandler.Whole() { @Override @@ -49,7 +49,7 @@ public void onMessage(PongMessage t) { System.out.println("PongMessage received: " + t.getApplicationData()); } }); - + } @Override diff --git a/websocket/endpoint-programmatic-injection/pom.xml b/websocket/endpoint-programmatic-injection/pom.xml index 1960708a0..d0daf1d61 100644 --- a/websocket/endpoint-programmatic-injection/pom.xml +++ b/websocket/endpoint-programmatic-injection/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - endpoint-programmatic-injection + org.javaee7 + websocket-endpoint-programmatic-injection 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint-programmatic-injection diff --git a/websocket/endpoint-programmatic-injection/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpoint.java b/websocket/endpoint-programmatic-injection/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpoint.java index 387d18d57..c625bef68 100644 --- a/websocket/endpoint-programmatic-injection/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpoint.java +++ b/websocket/endpoint-programmatic-injection/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpoint.java @@ -13,8 +13,9 @@ * @author Arun Gupta */ public class MyEndpoint extends Endpoint { - - @Inject MyBean bean; + + @Inject + MyBean bean; @Override public void onOpen(final Session session, EndpointConfig ec) { diff --git a/websocket/endpoint-programmatic-partial/src/main/java/org/glassfish/endpoint/programmatic/partial/MyEndpoint.java b/websocket/endpoint-programmatic-partial/src/main/java/org/glassfish/endpoint/programmatic/partial/MyEndpoint.java index 0b96c3de6..c40296cd0 100644 --- a/websocket/endpoint-programmatic-partial/src/main/java/org/glassfish/endpoint/programmatic/partial/MyEndpoint.java +++ b/websocket/endpoint-programmatic-partial/src/main/java/org/glassfish/endpoint/programmatic/partial/MyEndpoint.java @@ -30,7 +30,7 @@ public void onMessage(String text, boolean b) { } } }); - + session.addMessageHandler(new MessageHandler.Partial() { @Override diff --git a/websocket/endpoint-programmatic-partial/src/main/java/org/glassfish/endpoint/programmatic/partial/MyEndpointConfiguration.java b/websocket/endpoint-programmatic-partial/src/main/java/org/glassfish/endpoint/programmatic/partial/MyEndpointConfiguration.java index d651e3b38..47af62588 100644 --- a/websocket/endpoint-programmatic-partial/src/main/java/org/glassfish/endpoint/programmatic/partial/MyEndpointConfiguration.java +++ b/websocket/endpoint-programmatic-partial/src/main/java/org/glassfish/endpoint/programmatic/partial/MyEndpointConfiguration.java @@ -14,14 +14,16 @@ public class MyEndpointConfiguration implements ServerApplicationConfig { @Override public Set getEndpointConfigs(Set> set) { - return new HashSet() {{ - add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/websocket").build()); - }}; + return new HashSet() { + { + add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/websocket").build()); + } + }; } @Override public Set> getAnnotatedEndpointClasses(Set> set) { return Collections.emptySet(); } - + } diff --git a/websocket/endpoint-programmatic/pom.xml b/websocket/endpoint-programmatic/pom.xml index 4c1082012..bf54369c9 100644 --- a/websocket/endpoint-programmatic/pom.xml +++ b/websocket/endpoint-programmatic/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - endpoint-programmatic + org.javaee7 + websocket-endpoint-programmatic 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint-programmatic diff --git a/websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpoint.java b/websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpoint.java index b3d8247de..933befe35 100644 --- a/websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpoint.java +++ b/websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpoint.java @@ -30,7 +30,7 @@ public void onMessage(String text) { } } }); - + session.addMessageHandler(new MessageHandler.Whole() { @Override @@ -43,7 +43,7 @@ public void onMessage(ByteBuffer t) { } } }); - + session.addMessageHandler(new MessageHandler.Whole() { @Override @@ -51,7 +51,7 @@ public void onMessage(PongMessage t) { System.out.println("PongMessage received: " + t.getApplicationData()); } }); - + } @Override diff --git a/websocket/endpoint-programmatic/src/test/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointTest.java b/websocket/endpoint-programmatic/src/test/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointTest.java index 54f17fc8f..388db9dfc 100644 --- a/websocket/endpoint-programmatic/src/test/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointTest.java +++ b/websocket/endpoint-programmatic/src/test/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointTest.java @@ -31,15 +31,15 @@ public class MyEndpointTest { @ArquillianResource URI base; - @Deployment(testable=false) + @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(MyEndpoint.class, - MyEndpointConfig.class, - MyEndpointTextClient.class, - MyEndpointBinaryClient.class); + .addClasses(MyEndpoint.class, + MyEndpointConfig.class, + MyEndpointTextClient.class, + MyEndpointBinaryClient.class); } - + @Test public void testTextEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException { MyEndpointTextClient.latch = new CountDownLatch(1); @@ -54,7 +54,7 @@ public void onMessage(String text) { }); assertTrue(MyEndpointTextClient.latch.await(2, TimeUnit.SECONDS)); } - + @Test public void testBinaryEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException { MyEndpointBinaryClient.latch = new CountDownLatch(1); @@ -73,11 +73,11 @@ public void onMessage(ByteBuffer binary) { public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); URI uri = new URI("ws://" - + base.getHost() - + ":" - + base.getPort() - + base.getPath() - + "websocket"); + + base.getHost() + + ":" + + base.getPort() + + base.getPath() + + "websocket"); System.out.println("Connecting to: " + uri); return container.connectToServer(endpoint, uri); } diff --git a/websocket/endpoint-security/pom.xml b/websocket/endpoint-security/pom.xml index 6f9d72ac0..38ec244f8 100644 --- a/websocket/endpoint-security/pom.xml +++ b/websocket/endpoint-security/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - endpoint-security + org.javaee7 + websocket-endpoint-security 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint-security diff --git a/websocket/endpoint-security/src/main/java/org/javaee7/websocket/endpoint/security/MyEndpoint.java b/websocket/endpoint-security/src/main/java/org/javaee7/websocket/endpoint/security/MyEndpoint.java index 776748902..0903d8b95 100644 --- a/websocket/endpoint-security/src/main/java/org/javaee7/websocket/endpoint/security/MyEndpoint.java +++ b/websocket/endpoint-security/src/main/java/org/javaee7/websocket/endpoint/security/MyEndpoint.java @@ -6,9 +6,9 @@ /** * @author Arun Gupta */ -@ServerEndpoint(value="/websocket") +@ServerEndpoint(value = "/websocket") public class MyEndpoint { - + @OnMessage public String echoText(String text) { return text; diff --git a/websocket/endpoint-singleton/pom.xml b/websocket/endpoint-singleton/pom.xml index 5a2ecc6db..ceba2be95 100644 --- a/websocket/endpoint-singleton/pom.xml +++ b/websocket/endpoint-singleton/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - endpoint-singleton + org.javaee7 + websocket-endpoint-singleton 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint-singleton diff --git a/websocket/endpoint-singleton/src/main/java/org/javaee7/websocket/endpoint/singleton/MyConfigurator.java b/websocket/endpoint-singleton/src/main/java/org/javaee7/websocket/endpoint/singleton/MyConfigurator.java index a22e06a96..52b0871ee 100644 --- a/websocket/endpoint-singleton/src/main/java/org/javaee7/websocket/endpoint/singleton/MyConfigurator.java +++ b/websocket/endpoint-singleton/src/main/java/org/javaee7/websocket/endpoint/singleton/MyConfigurator.java @@ -6,18 +6,16 @@ * @author Arun Gupta */ public class MyConfigurator extends ServerEndpointConfig.Configurator { - + private static final MyEndpoint ENDPOINT = new MyEndpoint(); @Override public T getEndpointInstance(Class endpointClass) throws InstantiationException { if (MyEndpoint.class.equals(endpointClass)) { - return (T)ENDPOINT; + return (T) ENDPOINT; } else { throw new InstantiationException(); } } - - } diff --git a/websocket/endpoint-singleton/src/main/java/org/javaee7/websocket/endpoint/singleton/MyEndpoint.java b/websocket/endpoint-singleton/src/main/java/org/javaee7/websocket/endpoint/singleton/MyEndpoint.java index ebc58aed2..7e091b2bc 100644 --- a/websocket/endpoint-singleton/src/main/java/org/javaee7/websocket/endpoint/singleton/MyEndpoint.java +++ b/websocket/endpoint-singleton/src/main/java/org/javaee7/websocket/endpoint/singleton/MyEndpoint.java @@ -6,17 +6,17 @@ /** * @author Arun Gupta */ -@ServerEndpoint(value="/websocket", configurator = MyConfigurator.class) +@ServerEndpoint(value = "/websocket", configurator = MyConfigurator.class) public class MyEndpoint { String newValue = ""; - + /** - * singleton instance of endpoint ensures that string concatenation would work - */ + * singleton instance of endpoint ensures that string concatenation would work + */ @OnMessage public String concat(String value) { this.newValue += value; - + return newValue; } } diff --git a/websocket/endpoint-wss/src/main/java/org/javaee7/websocket/endpoint/wss/MyEndpoint.java b/websocket/endpoint-wss/src/main/java/org/javaee7/websocket/endpoint/wss/MyEndpoint.java index cc6168473..f2cdb2e26 100644 --- a/websocket/endpoint-wss/src/main/java/org/javaee7/websocket/endpoint/wss/MyEndpoint.java +++ b/websocket/endpoint-wss/src/main/java/org/javaee7/websocket/endpoint/wss/MyEndpoint.java @@ -8,7 +8,7 @@ */ @ServerEndpoint("/websocket") public class MyEndpoint { - + @OnMessage public String echoText(String name) { return name; diff --git a/websocket/endpoint/pom.xml b/websocket/endpoint/pom.xml index 24d2d447b..ac93da10b 100644 --- a/websocket/endpoint/pom.xml +++ b/websocket/endpoint/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - endpoint + org.javaee7 + websocket-endpoint 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - endpoint diff --git a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteArrayClient.java b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteArrayClient.java index 620388c22..a6a359efe 100644 --- a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteArrayClient.java +++ b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteArrayClient.java @@ -25,7 +25,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(byte[] message) { response = message; diff --git a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteBufferClient.java b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteBufferClient.java index 0797ad005..8e710689f 100644 --- a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteBufferClient.java +++ b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteBufferClient.java @@ -25,7 +25,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(byte[] message) { response = message; diff --git a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointInputStreamClient.java b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointInputStreamClient.java index 74e6615c3..ab62eb4b2 100644 --- a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointInputStreamClient.java +++ b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointInputStreamClient.java @@ -25,7 +25,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(byte[] message) { response = message; diff --git a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointText.java b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointText.java index e87ad609c..608155f24 100644 --- a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointText.java +++ b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointText.java @@ -8,7 +8,7 @@ */ @ServerEndpoint("/text") public class MyEndpointText { - + @OnMessage public String echoText(String name) { return name; diff --git a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointTextClient.java b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointTextClient.java index 756b403ed..35d997840 100644 --- a/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointTextClient.java +++ b/websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointTextClient.java @@ -24,7 +24,7 @@ public void onOpen(Session session) { ioe.printStackTrace(); } } - + @OnMessage public void processMessage(String message) { response = message; diff --git a/websocket/endpoint/src/test/java/org/javaee7/websocket/endpoint/MyEndpointTest.java b/websocket/endpoint/src/test/java/org/javaee7/websocket/endpoint/MyEndpointTest.java index c2b461b50..eb89f7350 100644 --- a/websocket/endpoint/src/test/java/org/javaee7/websocket/endpoint/MyEndpointTest.java +++ b/websocket/endpoint/src/test/java/org/javaee7/websocket/endpoint/MyEndpointTest.java @@ -34,19 +34,19 @@ public class MyEndpointTest { @ArquillianResource URI base; - @Deployment(testable=false) + @Deployment(testable = false) public static WebArchive createDeployment() { return ShrinkWrap.create(WebArchive.class) - .addClasses(MyEndpointText.class, - MyEndpointTextClient.class, - MyEndpointByteArray.class, - MyEndpointByteArrayClient.class, - MyEndpointByteBuffer.class, - MyEndpointByteBufferClient.class, - MyEndpointInputStream.class, - MyEndpointInputStreamClient.class); + .addClasses(MyEndpointText.class, + MyEndpointTextClient.class, + MyEndpointByteArray.class, + MyEndpointByteArrayClient.class, + MyEndpointByteBuffer.class, + MyEndpointByteBufferClient.class, + MyEndpointInputStream.class, + MyEndpointInputStreamClient.class); } - + @Test public void testTextEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException { MyEndpointTextClient.latch = new CountDownLatch(1); @@ -55,7 +55,7 @@ public void testTextEndpoint() throws URISyntaxException, DeploymentException, I assertTrue(MyEndpointTextClient.latch.await(2, TimeUnit.SECONDS)); assertEquals(TEXT, MyEndpointTextClient.response); } - + @Test public void testEndpointByteBuffer() throws URISyntaxException, DeploymentException, IOException, InterruptedException { MyEndpointByteBufferClient.latch = new CountDownLatch(1); @@ -84,16 +84,15 @@ public void testEndpointInputStream() throws DeploymentException, IOException, U assertNotNull(MyEndpointInputStreamClient.response); assertArrayEquals(TEXT.getBytes(), MyEndpointInputStreamClient.response); } - - + public Session connectToServer(Class endpoint, String uriPart) throws DeploymentException, IOException, URISyntaxException { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); URI uri = new URI("ws://" - + base.getHost() - + ":" - + base.getPort() - + base.getPath() - + uriPart); + + base.getHost() + + ":" + + base.getPort() + + base.getPath() + + uriPart); System.out.println("Connecting to: " + uri); return container.connectToServer(endpoint, uri); } diff --git a/websocket/google-docs/client/src/main/java/org/javaee7/websocket/googledocs/client/GoogleDocClient.java b/websocket/google-docs/client/src/main/java/org/javaee7/websocket/googledocs/client/GoogleDocClient.java index 1ecf14bd5..beaf3ecca 100644 --- a/websocket/google-docs/client/src/main/java/org/javaee7/websocket/googledocs/client/GoogleDocClient.java +++ b/websocket/google-docs/client/src/main/java/org/javaee7/websocket/googledocs/client/GoogleDocClient.java @@ -40,21 +40,21 @@ public void start(Stage stage) throws Exception { stage.setTitle("Google Docs Emulator using WebSocket"); textarea = new TextArea(); textarea.textProperty().addListener( - new ChangeListener() { + new ChangeListener() { - @Override - public void changed(ObservableValue observable, String oldValue, String newValue) { - System.out.println("New value: " + newValue); + @Override + public void changed(ObservableValue observable, String oldValue, String newValue) { + System.out.println("New value: " + newValue); - try { - session.getBasicRemote().sendText(newValue); - } catch (IOException ex) { - Logger.getLogger(GoogleDocClient.class.getName()).log(Level.SEVERE, null, ex); - } + try { + session.getBasicRemote().sendText(newValue); + } catch (IOException ex) { + Logger.getLogger(GoogleDocClient.class.getName()).log(Level.SEVERE, null, ex); } - } - ); + + } + ); textarea.setPrefSize(500, 300); textarea.setWrapText(true); diff --git a/websocket/google-docs/server/src/main/java/org/javaee7/websocket/googledocs/server/GoogleDocServer.java b/websocket/google-docs/server/src/main/java/org/javaee7/websocket/googledocs/server/GoogleDocServer.java index 43addfe73..2e9406037 100644 --- a/websocket/google-docs/server/src/main/java/org/javaee7/websocket/googledocs/server/GoogleDocServer.java +++ b/websocket/google-docs/server/src/main/java/org/javaee7/websocket/googledocs/server/GoogleDocServer.java @@ -17,7 +17,7 @@ public class GoogleDocServer { private static final Logger LOGGER = Logger.getLogger(GoogleDocServer.class.getName()); - + @OnOpen public void onOpen(Session client) { LOGGER.log(Level.INFO, "connected"); diff --git a/websocket/httpsession/pom.xml b/websocket/httpsession/pom.xml index 971b5988e..5059a934f 100644 --- a/websocket/httpsession/pom.xml +++ b/websocket/httpsession/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - httpsession + org.javaee7 + websocket-httpsession 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - httpsession diff --git a/websocket/httpsession/src/main/java/org/javaee7/websocket/httpsession/MyApplicationConfig.java b/websocket/httpsession/src/main/java/org/javaee7/websocket/httpsession/MyApplicationConfig.java index ba54bec34..e151ce641 100644 --- a/websocket/httpsession/src/main/java/org/javaee7/websocket/httpsession/MyApplicationConfig.java +++ b/websocket/httpsession/src/main/java/org/javaee7/websocket/httpsession/MyApplicationConfig.java @@ -17,14 +17,15 @@ public class MyApplicationConfig implements ServerApplicationConfig { @Override public Set getEndpointConfigs(Set> set) { - return new HashSet() {{ - add(ServerEndpointConfig.Builder + return new HashSet() { + { + add(ServerEndpointConfig.Builder .create(MyEndpoint.class, "/websocket") .configurator(new ServerEndpointConfig.Configurator() { @Override public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) { - HttpSession session = (HttpSession)request.getHttpSession(); + HttpSession session = (HttpSession) request.getHttpSession(); System.out.println("HttpSession id: " + session.getId()); System.out.println("HttpSession creation time: " + session.getCreationTime()); super.modifyHandshake(sec, request, response); @@ -32,7 +33,8 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, }) .build()); - }}; + } + }; } @Override diff --git a/websocket/httpsession/src/main/java/org/javaee7/websocket/httpsession/MyEndpoint.java b/websocket/httpsession/src/main/java/org/javaee7/websocket/httpsession/MyEndpoint.java index e668655d9..477f2f627 100644 --- a/websocket/httpsession/src/main/java/org/javaee7/websocket/httpsession/MyEndpoint.java +++ b/websocket/httpsession/src/main/java/org/javaee7/websocket/httpsession/MyEndpoint.java @@ -26,6 +26,6 @@ public void onMessage(String name) { } } }); - + } } diff --git a/websocket/injection/pom.xml b/websocket/injection/pom.xml index b887acce7..3a41d7785 100644 --- a/websocket/injection/pom.xml +++ b/websocket/injection/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - injection + org.javaee7 + websocket-injection 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - injection diff --git a/websocket/injection/src/main/java/org/javaee7/websocket/injection/Logging.java b/websocket/injection/src/main/java/org/javaee7/websocket/injection/Logging.java index 4996aadb5..9041ea7f4 100644 --- a/websocket/injection/src/main/java/org/javaee7/websocket/injection/Logging.java +++ b/websocket/injection/src/main/java/org/javaee7/websocket/injection/Logging.java @@ -14,6 +14,6 @@ @Inherited @InterceptorBinding @Retention(RUNTIME) -@Target({METHOD, TYPE}) +@Target({ METHOD, TYPE }) public @interface Logging { } diff --git a/websocket/injection/src/main/java/org/javaee7/websocket/injection/LoggingInterceptor.java b/websocket/injection/src/main/java/org/javaee7/websocket/injection/LoggingInterceptor.java index 5c69fe24d..be89f4943 100644 --- a/websocket/injection/src/main/java/org/javaee7/websocket/injection/LoggingInterceptor.java +++ b/websocket/injection/src/main/java/org/javaee7/websocket/injection/LoggingInterceptor.java @@ -14,7 +14,7 @@ public class LoggingInterceptor { @AroundInvoke public Object log(InvocationContext context) - throws Exception { + throws Exception { Logger.getLogger(getClass().getName()).info(context.getMethod().getName()); Logger.getLogger(getClass().getName()).info(context.getParameters().toString()); return context.proceed(); diff --git a/websocket/injection/src/main/java/org/javaee7/websocket/injection/MyEndpointWithCDI.java b/websocket/injection/src/main/java/org/javaee7/websocket/injection/MyEndpointWithCDI.java index 394d6d60d..44a1ca055 100644 --- a/websocket/injection/src/main/java/org/javaee7/websocket/injection/MyEndpointWithCDI.java +++ b/websocket/injection/src/main/java/org/javaee7/websocket/injection/MyEndpointWithCDI.java @@ -10,9 +10,10 @@ @ServerEndpoint("/websocket-cdi") @Logging public class MyEndpointWithCDI { - - @Inject MyBean bean; - + + @Inject + MyBean bean; + @OnMessage public String sayHello(String name) { System.out.println(getClass().getName() + ".sayHello"); diff --git a/websocket/injection/src/main/java/org/javaee7/websocket/injection/MyEndpointWithEJB.java b/websocket/injection/src/main/java/org/javaee7/websocket/injection/MyEndpointWithEJB.java index 745c163eb..296a20428 100644 --- a/websocket/injection/src/main/java/org/javaee7/websocket/injection/MyEndpointWithEJB.java +++ b/websocket/injection/src/main/java/org/javaee7/websocket/injection/MyEndpointWithEJB.java @@ -9,9 +9,10 @@ */ @ServerEndpoint("/websocket-ejb") public class MyEndpointWithEJB { - - @Inject MySessionBean bean; - + + @Inject + MySessionBean bean; + @OnMessage public String sayHello(String name) { return bean.sayHello(name + " (from EJB)"); diff --git a/websocket/javase-client/pom.xml b/websocket/javase-client/pom.xml index e521e38b9..79b0373da 100644 --- a/websocket/javase-client/pom.xml +++ b/websocket/javase-client/pom.xml @@ -1,17 +1,6 @@ - - 4.0.0 - - org.javaee7.websocket - websocket-samples - 1.0-SNAPSHOT - ../pom.xml - - - javase-client - jar - - - + 4.0.0 + + + org.javaee7 + websocket + 1.0-SNAPSHOT + ../pom.xml + + websocket-javase-client + jar + Java EE 7 Sample: websocket - javase-client + org.glassfish.tyrus @@ -32,5 +32,4 @@ 1.1 - diff --git a/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/Client.java b/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/Client.java index 5449127ac..50abd34da 100644 --- a/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/Client.java +++ b/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/Client.java @@ -16,14 +16,14 @@ public class Client { final static CountDownLatch messageLatch = new CountDownLatch(1); - + public static void main(String[] args) { try { WebSocketContainer container = ContainerProvider.getWebSocketContainer(); String uri = "ws://echo.websocket.org:80/"; System.out.println("Connecting to " + uri); container.connectToServer(MyClientEndpoint.class, URI.create(uri)); - messageLatch.await(100, TimeUnit.SECONDS); + messageLatch.await(100, TimeUnit.SECONDS); } catch (DeploymentException | InterruptedException | IOException ex) { Logger.getLogger(Client.class.getName()).log(Level.SEVERE, null, ex); } diff --git a/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/MyClientEndpoint.java b/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/MyClientEndpoint.java index a5a48c0d0..9ab372eec 100644 --- a/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/MyClientEndpoint.java +++ b/websocket/javase-client/src/main/java/org/javaee7/websocket/javase/client/MyClientEndpoint.java @@ -25,13 +25,13 @@ public void onOpen(Session session) { Logger.getLogger(MyClientEndpoint.class.getName()).log(Level.SEVERE, null, ex); } } - + @OnMessage public void processMessage(String message) { System.out.println("Received message in client: " + message); Client.messageLatch.countDown(); } - + @OnError public void processError(Throwable t) { t.printStackTrace(); diff --git a/websocket/messagesize/pom.xml b/websocket/messagesize/pom.xml index cfbb33e16..6637e010b 100644 --- a/websocket/messagesize/pom.xml +++ b/websocket/messagesize/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - messagesize + org.javaee7 + websocket-messagesize 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - messagesize diff --git a/websocket/messagesize/src/main/java/org/javaee7/websocket/messagesize/MyEndpoint.java b/websocket/messagesize/src/main/java/org/javaee7/websocket/messagesize/MyEndpoint.java index 0e2ff6937..539fc1be5 100644 --- a/websocket/messagesize/src/main/java/org/javaee7/websocket/messagesize/MyEndpoint.java +++ b/websocket/messagesize/src/main/java/org/javaee7/websocket/messagesize/MyEndpoint.java @@ -11,24 +11,24 @@ /** * @author Arun Gupta */ -@ServerEndpoint(value="/websocket") +@ServerEndpoint(value = "/websocket") public class MyEndpoint { - - @OnMessage(maxMessageSize=6) + + @OnMessage(maxMessageSize = 6) public String echoText(String data) { return data; } - @OnMessage(maxMessageSize=6) + @OnMessage(maxMessageSize = 6) public ByteBuffer echoBinary(ByteBuffer data) throws IOException { return data; } - + @OnClose public void onClose(CloseReason reason) { System.out.println("CLOSED: " + reason.getCloseCode() + ", " + reason.getReasonPhrase()); } - + @OnError public void onError(Throwable t) { t.printStackTrace(); diff --git a/websocket/parameters/pom.xml b/websocket/parameters/pom.xml index 857957d01..a20ca7182 100644 --- a/websocket/parameters/pom.xml +++ b/websocket/parameters/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - parameters + org.javaee7 + websocket-parameters 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - parameters diff --git a/websocket/parameters/src/main/java/org/javaee7/websocket/parameters/GreetingBean.java b/websocket/parameters/src/main/java/org/javaee7/websocket/parameters/GreetingBean.java index 9d0d4aec4..b793d38d9 100644 --- a/websocket/parameters/src/main/java/org/javaee7/websocket/parameters/GreetingBean.java +++ b/websocket/parameters/src/main/java/org/javaee7/websocket/parameters/GreetingBean.java @@ -7,10 +7,10 @@ /** * @author Arun Gupta */ -@ServerEndpoint(value="/greet/{name}") +@ServerEndpoint(value = "/greet/{name}") public class GreetingBean { @OnMessage - public String sayHello(String payload, @PathParam("name")String name) { + public String sayHello(String payload, @PathParam("name") String name) { return payload + " " + name + "!"; } } diff --git a/websocket/pom.xml b/websocket/pom.xml index ada432503..a2224ae33 100644 --- a/websocket/pom.xml +++ b/websocket/pom.xml @@ -1,17 +1,17 @@ 4.0.0 + org.javaee7 - javaee7-samples + samples-parent 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket pom - Java EE 7 WebSocket Samples + Java EE 7 Sample: websocket chat @@ -47,6 +47,7 @@ websocket-vs-rest-payload + org.javaee7 diff --git a/websocket/properties/pom.xml b/websocket/properties/pom.xml index a4da9b0c8..ed910762c 100644 --- a/websocket/properties/pom.xml +++ b/websocket/properties/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - properties + org.javaee7 + websocket-properties 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - properties diff --git a/websocket/properties/src/main/java/org/javaee7/websocket/properties/MyEndpoint.java b/websocket/properties/src/main/java/org/javaee7/websocket/properties/MyEndpoint.java index 2d7d9ddd1..631674417 100644 --- a/websocket/properties/src/main/java/org/javaee7/websocket/properties/MyEndpoint.java +++ b/websocket/properties/src/main/java/org/javaee7/websocket/properties/MyEndpoint.java @@ -8,15 +8,15 @@ /** * @author Arun Gupta */ -@ServerEndpoint(value="/websocket") +@ServerEndpoint(value = "/websocket") public class MyEndpoint { - + @OnMessage public String echoText(String name, Session session) { Map map = session.getUserProperties(); Integer count = 0; if (map.get("count") != null) { - count = (Integer)map.get("count"); + count = (Integer) map.get("count"); } System.out.format("Called %d times", ++count); map.put("count", count); diff --git a/websocket/subprotocol/pom.xml b/websocket/subprotocol/pom.xml index f8a5a2435..65ed3824e 100644 --- a/websocket/subprotocol/pom.xml +++ b/websocket/subprotocol/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - subprotocol + org.javaee7 + websocket-subprotocol 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - subprotocol diff --git a/websocket/subprotocol/src/main/java/org/javaee7/websocket/subprotocol/MyEndpoint.java b/websocket/subprotocol/src/main/java/org/javaee7/websocket/subprotocol/MyEndpoint.java index 545c48e8e..ba2284503 100644 --- a/websocket/subprotocol/src/main/java/org/javaee7/websocket/subprotocol/MyEndpoint.java +++ b/websocket/subprotocol/src/main/java/org/javaee7/websocket/subprotocol/MyEndpoint.java @@ -3,12 +3,11 @@ import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; - /** * @author Arun Gupta */ -@ServerEndpoint(value="/endpoint", - subprotocols="myProtocol") +@ServerEndpoint(value = "/endpoint", + subprotocols = "myProtocol") public class MyEndpoint { @OnMessage public String echoText(String text) { diff --git a/websocket/websocket-client-config/pom.xml b/websocket/websocket-client-config/pom.xml index 88f9e576a..08030c15d 100644 --- a/websocket/websocket-client-config/pom.xml +++ b/websocket/websocket-client-config/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - websocket-client-config + org.javaee7 + websocket-websocket-client-config 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - websocket-client-config diff --git a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyClient.java b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyClient.java index 9071f4509..f20574e97 100644 --- a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyClient.java +++ b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyClient.java @@ -25,12 +25,12 @@ public void onOpen(Session session) { Logger.getLogger(MyClient.class.getName()).log(Level.SEVERE, null, ex); } } - + @OnMessage public void processMessage(String message) { System.out.println("Received message in client: " + message); } - + @OnError public void processError(Throwable t) { t.printStackTrace(); diff --git a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyConfigurator.java b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyConfigurator.java index da4d454f1..9e60b1175 100644 --- a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyConfigurator.java +++ b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyConfigurator.java @@ -8,7 +8,7 @@ /** * @author Arun Gupta */ - public class MyConfigurator extends ClientEndpointConfig.Configurator { +public class MyConfigurator extends ClientEndpointConfig.Configurator { @Override public void beforeRequest(Map> headers) { diff --git a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyEndpoint.java b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyEndpoint.java index 838d2694c..fc4f43332 100644 --- a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyEndpoint.java +++ b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/MyEndpoint.java @@ -3,17 +3,16 @@ import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; - /** * @author Arun Gupta */ -@ServerEndpoint(value="/websocket") +@ServerEndpoint(value = "/websocket") public class MyEndpoint { - + @OnMessage public String sayHello(String name) { System.out.println("Received message in endpoint : " + name); return "Hello " + name; } - + } diff --git a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/TestClient.java b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/TestClient.java index 1ec624ed8..20d2b8716 100644 --- a/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/TestClient.java +++ b/websocket/websocket-client-config/src/main/java/org/javaee7/websocket/client/configuration/TestClient.java @@ -17,7 +17,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestClient"}) +@WebServlet(urlPatterns = { "/TestClient" }) public class TestClient extends HttpServlet { /** @@ -31,22 +31,22 @@ public class TestClient extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); - + WebSocketContainer container = ContainerProvider.getWebSocketContainer(); String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket"; out.println("Connecting to " + uri); container.connectToServer(MyClient.class, URI.create(uri)); out.println("

Look in server.log for log messages from message exchange between client/server."); - + out.println(""); out.println(""); } catch (DeploymentException ex) { @@ -66,7 +66,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -81,7 +81,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/websocket/websocket-client-programmatic-config/pom.xml b/websocket/websocket-client-programmatic-config/pom.xml index 799388410..e68439330 100644 --- a/websocket/websocket-client-programmatic-config/pom.xml +++ b/websocket/websocket-client-programmatic-config/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - websocket-client-programmatic-config + org.javaee7 + websocket-websocket-client-programmatic-config 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - websocket-client-programmatic-config diff --git a/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/MyEndpoint.java b/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/MyEndpoint.java index 03653aee4..eef2cda48 100644 --- a/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/MyEndpoint.java +++ b/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/MyEndpoint.java @@ -3,17 +3,16 @@ import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; - /** * @author Arun Gupta */ @ServerEndpoint("/websocket") public class MyEndpoint { - + @OnMessage public String sayHello(String name) { System.out.println("Received message in endpoint : " + name); return "Hello " + name; } - + } diff --git a/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/TestClient.java b/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/TestClient.java index c1bf2fada..7abc92295 100644 --- a/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/TestClient.java +++ b/websocket/websocket-client-programmatic-config/src/main/java/org/javaee7/websocket/client/programmatic/configuration/TestClient.java @@ -18,7 +18,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestClient"}) +@WebServlet(urlPatterns = { "/TestClient" }) public class TestClient extends HttpServlet { /** @@ -32,24 +32,24 @@ public class TestClient extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); - + WebSocketContainer container = ContainerProvider.getWebSocketContainer(); String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket"; out.println("Connecting to " + uri); - container.connectToServer(MyClient.class, - ClientEndpointConfig.Builder.create().configurator(new MyConfigurator()).build(), - URI.create(uri)); + container.connectToServer(MyClient.class, + ClientEndpointConfig.Builder.create().configurator(new MyConfigurator()).build(), + URI.create(uri)); out.println("

Look in server.log for message exchange between client/server and headers from configurator."); - + out.println(""); out.println(""); } catch (DeploymentException ex) { @@ -69,7 +69,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -84,7 +84,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/websocket/websocket-client-programmatic-encoders/pom.xml b/websocket/websocket-client-programmatic-encoders/pom.xml index 2d31469e2..3ca82ad27 100644 --- a/websocket/websocket-client-programmatic-encoders/pom.xml +++ b/websocket/websocket-client-programmatic-encoders/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - websocket-client-programmatic-encoders + org.javaee7 + websocket-websocket-client-programmatic-encoders 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - websocket-client-programmatic-encoders diff --git a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyEndpoint.java b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyEndpoint.java index 52c132fc7..6d8359192 100644 --- a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyEndpoint.java +++ b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyEndpoint.java @@ -3,17 +3,16 @@ import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; - /** * @author Arun Gupta */ @ServerEndpoint("/websocket") public class MyEndpoint { - + @OnMessage public String echoText(String text) { System.out.println("Received message in endpoint : " + text); return text; } - + } diff --git a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessage.java b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessage.java index 1402fc6f1..22ab36539 100644 --- a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessage.java +++ b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessage.java @@ -8,12 +8,12 @@ * @author Arun Gupta */ public class MyMessage { - + private JsonObject jsonObject; public MyMessage() { } - + public MyMessage(String string) { jsonObject = Json.createReader(new StringReader(string)).readObject(); } @@ -29,11 +29,10 @@ public JsonObject getJsonObject() { public void setJsonObject(JsonObject jsonObject) { this.jsonObject = jsonObject; } - + @Override public String toString() { return jsonObject.toString(); } - -} +} diff --git a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessageDecoder.java b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessageDecoder.java index be596c66b..ee5999561 100644 --- a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessageDecoder.java +++ b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessageDecoder.java @@ -21,14 +21,14 @@ public MyMessage decode(String string) throws DecodeException { public boolean willDecode(String string) { return true; } - + @Override public void init(EndpointConfig ec) { -// System.out.println("init"); + // System.out.println("init"); } @Override public void destroy() { -// System.out.println("desroy"); + // System.out.println("desroy"); } } diff --git a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessageEncoder.java b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessageEncoder.java index b06818878..885daa942 100644 --- a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessageEncoder.java +++ b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/MyMessageEncoder.java @@ -12,14 +12,14 @@ public class MyMessageEncoder implements Encoder.Text { public String encode(MyMessage myMessage) throws EncodeException { return myMessage.getJsonObject().toString(); } - + @Override public void init(EndpointConfig ec) { -// System.out.println("init"); + // System.out.println("init"); } @Override public void destroy() { -// System.out.println("desroy"); - } + // System.out.println("desroy"); + } } diff --git a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/TestClient.java b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/TestClient.java index 4237fa24f..56be5292e 100644 --- a/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/TestClient.java +++ b/websocket/websocket-client-programmatic-encoders/src/main/java/org/javaee7/websocket/client/programmatic/encoders/TestClient.java @@ -24,7 +24,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestClient"}) +@WebServlet(urlPatterns = { "/TestClient" }) public class TestClient extends HttpServlet { /** @@ -38,16 +38,16 @@ public class TestClient extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); - + List> encoders = new ArrayList<>(); encoders.add(MyMessageEncoder.class); List> decoders = new ArrayList<>(); @@ -56,14 +56,14 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re WebSocketContainer container = ContainerProvider.getWebSocketContainer(); String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket"; out.println("Connecting to " + uri); - container.connectToServer(MyClient.class, - ClientEndpointConfig.Builder.create() + container.connectToServer(MyClient.class, + ClientEndpointConfig.Builder.create() .encoders(encoders) .decoders(decoders) .build(), - URI.create(uri)); + URI.create(uri)); out.println("

Look in server.log for message exchange between client/server."); - + out.println(""); out.println(""); } catch (DeploymentException ex) { @@ -83,7 +83,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -98,7 +98,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/websocket/websocket-client-programmatic/pom.xml b/websocket/websocket-client-programmatic/pom.xml index 088d85916..e837a8b1e 100644 --- a/websocket/websocket-client-programmatic/pom.xml +++ b/websocket/websocket-client-programmatic/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - websocket-client-programmatic + org.javaee7 + websocket-websocket-client-programmatic 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - websocket-client-programmatic diff --git a/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/MyEndpoint.java b/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/MyEndpoint.java index 60ed4eecd..2fb266364 100644 --- a/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/MyEndpoint.java +++ b/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/MyEndpoint.java @@ -3,17 +3,16 @@ import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; - /** * @author Arun Gupta */ -@ServerEndpoint(value="/websocket") +@ServerEndpoint(value = "/websocket") public class MyEndpoint { - + @OnMessage public String sayHello(String name) { System.out.println("Received message in endpoint : " + name); return "Hello " + name; } - + } diff --git a/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/TestClient.java b/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/TestClient.java index 78ed49a1b..4e70b2cd4 100644 --- a/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/TestClient.java +++ b/websocket/websocket-client-programmatic/src/main/java/org/javaee7/websocket/client/programmatic/TestClient.java @@ -18,7 +18,7 @@ /** * @author Arun Gupta */ -@WebServlet(urlPatterns = {"/TestClient"}) +@WebServlet(urlPatterns = { "/TestClient" }) public class TestClient extends HttpServlet { /** @@ -32,24 +32,24 @@ public class TestClient extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); - + WebSocketContainer container = ContainerProvider.getWebSocketContainer(); String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket"; out.println("Connecting to " + uri); - container.connectToServer(MyClient.class, - null, - URI.create(uri)); + container.connectToServer(MyClient.class, + null, + URI.create(uri)); out.println("

Look in server.log for message exchange between client/server."); - + out.println(""); out.println(""); } catch (DeploymentException ex) { @@ -69,7 +69,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -84,7 +84,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/websocket/websocket-client/pom.xml b/websocket/websocket-client/pom.xml index 3575030a1..ed5084eb5 100644 --- a/websocket/websocket-client/pom.xml +++ b/websocket/websocket-client/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - websocket-client + org.javaee7 + websocket-websocket-client 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - websocket-client diff --git a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/MyClient.java b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/MyClient.java index 31bdf61ae..bd9bc1664 100644 --- a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/MyClient.java +++ b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/MyClient.java @@ -25,12 +25,12 @@ public void onOpen(Session session) { Logger.getLogger(MyClient.class.getName()).log(Level.SEVERE, null, ex); } } - + @OnMessage public void processMessage(String message) { System.out.println("Received message in client: " + message); } - + @OnError public void processError(Throwable t) { t.printStackTrace(); diff --git a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/MyEndpoint.java b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/MyEndpoint.java index f426639eb..5cd46c178 100644 --- a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/MyEndpoint.java +++ b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/MyEndpoint.java @@ -3,17 +3,16 @@ import javax.websocket.OnMessage; import javax.websocket.server.ServerEndpoint; - /** * @author Arun Gupta */ @ServerEndpoint("/websocket") public class MyEndpoint { - + @OnMessage public String sayHello(String name) { System.out.println("Received message in endpoint : " + name); return "Hello " + name; } - + } diff --git a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestLocalClient.java b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestLocalClient.java index b6ed84399..f4999be7f 100644 --- a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestLocalClient.java +++ b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestLocalClient.java @@ -31,22 +31,22 @@ public class TestLocalClient extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); - out.println("Servlet TestServlet"); + out.println("Servlet TestServlet"); out.println(""); out.println(""); out.println("

Servlet TestServlet at " + request.getContextPath() + "

"); - + WebSocketContainer container = ContainerProvider.getWebSocketContainer(); String uri = "ws://localhost:8080" + request.getContextPath() + "/websocket"; out.println("Connecting to " + uri); container.connectToServer(MyClient.class, URI.create(uri)); out.println("

Look in server.log for log messages from message exchange between client/server."); - + out.println(""); out.println(""); } catch (DeploymentException ex) { @@ -66,7 +66,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -81,7 +81,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestRemoteClient.java b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestRemoteClient.java index 6655bb12e..afb2bd266 100644 --- a/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestRemoteClient.java +++ b/websocket/websocket-client/src/main/java/org/javaee7/websocket/client/TestRemoteClient.java @@ -31,23 +31,23 @@ public class TestRemoteClient extends HttpServlet { * @throws IOException if an I/O error occurs */ protected void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { response.setContentType("text/html;charset=UTF-8"); try (PrintWriter out = response.getWriter()) { out.println(""); out.println(""); out.println(""); - out.println("Servlet TestRemoteClient"); + out.println("Servlet TestRemoteClient"); out.println(""); out.println(""); out.println("

Servlet TestRemoteClient at " + request.getContextPath() + "

"); - + WebSocketContainer container = ContainerProvider.getWebSocketContainer(); String uri = "ws://echo.websocket.org:80/"; out.println("Connecting to " + uri); container.connectToServer(MyClient.class, URI.create(uri)); out.println("

Look in server.log for log messages from message exchange between client/server."); - + out.println(""); out.println(""); } catch (DeploymentException ex) { @@ -67,7 +67,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } @@ -82,7 +82,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } diff --git a/websocket/websocket-vs-rest-payload/pom.xml b/websocket/websocket-vs-rest-payload/pom.xml index 73aa1dfc3..650088433 100644 --- a/websocket/websocket-vs-rest-payload/pom.xml +++ b/websocket/websocket-vs-rest-payload/pom.xml @@ -1,13 +1,14 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - websocket-vs-rest-payload + websocket-websocket-vs-rest-payload war + Java EE 7 Sample: websocket - websocket-vs-rest-payload diff --git a/websocket/websocket-vs-rest-payload/src/main/java/org/javaee7/websocket/websocket/vs/rest/payload/MyWebSocketEndpoint.java b/websocket/websocket-vs-rest-payload/src/main/java/org/javaee7/websocket/websocket/vs/rest/payload/MyWebSocketEndpoint.java index ed740b981..4173bf6af 100644 --- a/websocket/websocket-vs-rest-payload/src/main/java/org/javaee7/websocket/websocket/vs/rest/payload/MyWebSocketEndpoint.java +++ b/websocket/websocket-vs-rest-payload/src/main/java/org/javaee7/websocket/websocket/vs/rest/payload/MyWebSocketEndpoint.java @@ -8,7 +8,7 @@ */ @ServerEndpoint("/websocket") public class MyWebSocketEndpoint { - + @OnMessage public String echoText(String text) { return text; diff --git a/websocket/websocket-vs-rest/pom.xml b/websocket/websocket-vs-rest/pom.xml index 3e430eb1f..1f3549713 100644 --- a/websocket/websocket-vs-rest/pom.xml +++ b/websocket/websocket-vs-rest/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - websocket-vs-rest + org.javaee7 + websocket-websocket-vs-rest 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - websocket-vs-rest diff --git a/websocket/websocket-vs-rest/src/main/java/org/javaee7/websocket/websocket/vs/rest/MyWebSocketEndpoint.java b/websocket/websocket-vs-rest/src/main/java/org/javaee7/websocket/websocket/vs/rest/MyWebSocketEndpoint.java index a9d33db62..f844793ba 100644 --- a/websocket/websocket-vs-rest/src/main/java/org/javaee7/websocket/websocket/vs/rest/MyWebSocketEndpoint.java +++ b/websocket/websocket-vs-rest/src/main/java/org/javaee7/websocket/websocket/vs/rest/MyWebSocketEndpoint.java @@ -8,7 +8,7 @@ */ @ServerEndpoint("/websocket") public class MyWebSocketEndpoint { - + @OnMessage public String echoText(String text) { return text; diff --git a/websocket/whiteboard/pom.xml b/websocket/whiteboard/pom.xml index 92d8a6bce..1454bb338 100644 --- a/websocket/whiteboard/pom.xml +++ b/websocket/whiteboard/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 + - org.javaee7.websocket - websocket-samples + org.javaee7 + websocket 1.0-SNAPSHOT ../pom.xml - - org.javaee7.websocket - whiteboard + org.javaee7 + websocket-whiteboard 1.0-SNAPSHOT war + Java EE 7 Sample: websocket - whiteboard diff --git a/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Coordinates.java b/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Coordinates.java index 0711a9cbc..b64f4fd1e 100644 --- a/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Coordinates.java +++ b/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Coordinates.java @@ -30,6 +30,5 @@ public float getY() { public void setY(float y) { this.y = y; } - - + } diff --git a/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Figure.java b/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Figure.java index c4b26ba52..83137f1ac 100644 --- a/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Figure.java +++ b/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Figure.java @@ -16,7 +16,7 @@ public Figure() { public Figure(JsonObject json) { this.json = json; } - + public JsonObject getJson() { return json; } @@ -24,7 +24,7 @@ public JsonObject getJson() { public void setJson(JsonObject json) { this.json = json; } - + @Override public String toString() { StringWriter writer = new StringWriter(); diff --git a/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/FigureEncoder.java b/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/FigureEncoder.java index 3e1aea199..5e419f0fe 100644 --- a/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/FigureEncoder.java +++ b/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/FigureEncoder.java @@ -14,7 +14,7 @@ public class FigureEncoder implements Encoder.Text
{ private static final Logger LOGGER = Logger.getLogger(FigureDecoder.class.getName()); - + @Override public String encode(Figure figure) throws EncodeException { LOGGER.log(Level.INFO, "encoding: {0}", figure); diff --git a/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Whiteboard.java b/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Whiteboard.java index e7fc7df3d..c429c77ed 100644 --- a/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Whiteboard.java +++ b/websocket/whiteboard/src/main/java/org/javaee7/websocket/whiteboard/Whiteboard.java @@ -19,14 +19,14 @@ * @author Arun Gupta */ @ServerEndpoint(value = "/websocket", - encoders = {FigureEncoder.class}, - decoders = {FigureDecoder.class}) + encoders = { FigureEncoder.class }, + decoders = { FigureDecoder.class }) public class Whiteboard { private static final Logger LOGGER = Logger.getLogger(Whiteboard.class.getName()); private static final Object PRESENT = new Object(); - + private static final ConcurrentMap peers = new ConcurrentHashMap<>(); @OnOpen @@ -43,7 +43,7 @@ public void onClose(Session peer) { public void broadcastFigure(Figure figure, Session session) throws IOException, EncodeException { LOGGER.log(Level.INFO, "boradcastFigure: {0}", figure); for (Session peer : session.getOpenSessions()) { -// for (Session peer : peers.keySet()) { + // for (Session peer : peers.keySet()) { if (!peer.equals(session)) { peer.getBasicRemote().sendObject(figure); } @@ -54,7 +54,7 @@ public void broadcastFigure(Figure figure, Session session) throws IOException, public void broadcastSnapshot(ByteBuffer data, Session session) throws IOException { LOGGER.log(Level.INFO, "broadcastBinary: {0}", data); for (Session peer : session.getOpenSessions()) { -// for (Session peer : peers.keySet()) { + // for (Session peer : peers.keySet()) { if (!peer.equals(session)) { peer.getBasicRemote().sendBinary(data); }