From 9e273b14741b2626f91fea9dcac186c319edc9ea Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Sun, 8 Oct 2017 11:55:55 +0200 Subject: [PATCH 001/197] BAEL-1171 java.lang.String API (#2693) * Evaluation article: Different Types of Bean Injection in Spring * added tests & changed configuration to Java-based config * removed xml config files * rename unit tests * BAEL-972 - Apache Commons Text * remove code from evaluation article * remove code from evaluation article * BAEL-972 - Apache Commons Text - added another example * BAEL-972 - Apache Commons Text - just indentation * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java - fix problems * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * fix formatting * BAEL-1033 minor refactor * BAEL-1035 Introduction to Eclipse Collections * format * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * cleanup * cleanup * BAEL-1109 Introduction to JCache * BAEL-1109 Introduction to JCache * remove unneeded property in pom.xml * fix formatting * close cache instances properly * remove latest commit * BAEL-1057 Introduction to rxjava-jdbc * refactor rxjava-jdbc * Refactor rxjava-jdbc * Refactoring rxjava-jdbc * BAEL-1171 java.lang.String API * refactor rxjava-jdbc * refactor String * String API - move multiple classes into a single class * move class into test package --- .../java/com/baeldung/string/StringTest.java | 26 ++++++++++++++++ .../jdbc/AutomapClassIntegrationTest.java | 6 ++-- .../jdbc/AutomapInterfaceIntegrationTest.java | 9 +++--- .../jdbc/BasicQueryTypesIntegrationTest.java | 30 ++++++++++-------- .../jdbc/InsertBlobIntegrationTest.java | 22 +++++++------ .../jdbc/InsertClobIntegrationTest.java | 20 +++++++----- .../jdbc/ReturnKeysIntegrationTest.java | 31 +++++++++++-------- .../jdbc/TransactionIntegrationTest.java | 23 +++++++++----- 8 files changed, 110 insertions(+), 57 deletions(-) create mode 100644 core-java/src/test/java/com/baeldung/string/StringTest.java diff --git a/core-java/src/test/java/com/baeldung/string/StringTest.java b/core-java/src/test/java/com/baeldung/string/StringTest.java new file mode 100644 index 0000000000..fd83c903a3 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/string/StringTest.java @@ -0,0 +1,26 @@ +package com.baeldung.string; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class StringTest { + + @Test + public void whenCallCodePointAt_thenDecimalUnicodeReturned() { + assertEquals(97, "abcd".codePointAt(0)); + } + + @Test + public void whenCallConcat_thenCorrect() { + assertEquals("elephant", "elep".concat("hant")); + } + + @Test + public void whenGetBytes_thenCorrect() { + byte[] byteArray = "abcd".getBytes(); + byte[] expected = new byte[] { 97, 98, 99, 100 }; + assertArrayEquals(expected, byteArray); + } +} diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java index 51e163db1f..957b6a4543 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java @@ -8,13 +8,15 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import com.github.davidmoten.rx.jdbc.ConnectionProvider; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; public class AutomapClassIntegrationTest { - private Database db = Database.from(Connector.connectionProvider); + private ConnectionProvider connectionProvider = Connector.connectionProvider; + private Database db = Database.from(connectionProvider); private Observable create = null; private Observable insert1, insert2 = null; @@ -56,6 +58,6 @@ public class AutomapClassIntegrationTest { public void close() { db.update("DROP TABLE MANAGER") .dependsOn(create); - Connector.connectionProvider.close(); + connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java index f1182952b1..477a2a1cb8 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java @@ -8,13 +8,15 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import com.github.davidmoten.rx.jdbc.ConnectionProvider; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; public class AutomapInterfaceIntegrationTest { - private Database db = Database.from(Connector.connectionProvider); + private ConnectionProvider connectionProvider = Connector.connectionProvider; + private Database db = Database.from(connectionProvider); private Observable create = null; private Observable insert1, insert2 = null; @@ -55,8 +57,7 @@ public class AutomapInterfaceIntegrationTest { @After public void close() { db.update("DROP TABLE EMPLOYEE") - .dependsOn(create); - Connector.connectionProvider.close(); + .dependsOn(create); + connectionProvider.close(); } - } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java index 5bbe175cb0..c2fb2c32e3 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java @@ -1,38 +1,42 @@ package com.baeldung.rxjava.jdbc; -import com.github.davidmoten.rx.jdbc.Database; -import org.junit.After; -import org.junit.Test; -import rx.Observable; +import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import org.junit.After; +import org.junit.Test; + +import com.github.davidmoten.rx.jdbc.ConnectionProvider; +import com.github.davidmoten.rx.jdbc.Database; + +import rx.Observable; public class BasicQueryTypesIntegrationTest { - private Database db = Database.from(Connector.connectionProvider); + private ConnectionProvider connectionProvider = Connector.connectionProvider; + private Database db = Database.from(connectionProvider); - private Observable create; + private Observable create, insert1, insert2, insert3, update, delete = null; @Test public void whenCreateTableAndInsertRecords_thenCorrect() { create = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int primary key, name varchar(255))") .count(); - Observable insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'John')") + insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'John')") .dependsOn(create) .count(); - Observable update = db.update("UPDATE EMPLOYEE SET name = 'Alan' WHERE id = 1") + update = db.update("UPDATE EMPLOYEE SET name = 'Alan' WHERE id = 1") .dependsOn(create) .count(); - Observable insert2 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(2, 'Sarah')") + insert2 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(2, 'Sarah')") .dependsOn(create) .count(); - Observable insert3 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(3, 'Mike')") + insert3 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(3, 'Mike')") .dependsOn(create) .count(); - Observable delete = db.update("DELETE FROM EMPLOYEE WHERE id = 2") + delete = db.update("DELETE FROM EMPLOYEE WHERE id = 2") .dependsOn(create) .count(); List names = db.select("select name from EMPLOYEE where id < ?") @@ -55,6 +59,6 @@ public class BasicQueryTypesIntegrationTest { public void close() { db.update("DROP TABLE EMPLOYEE") .dependsOn(create); - Connector.connectionProvider.close(); + connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java index 70fc7cf984..71eeded21c 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java @@ -1,21 +1,25 @@ package com.baeldung.rxjava.jdbc; -import com.github.davidmoten.rx.jdbc.Database; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import rx.Observable; +import static org.junit.Assert.assertEquals; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import static org.junit.Assert.assertEquals; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import com.github.davidmoten.rx.jdbc.ConnectionProvider; +import com.github.davidmoten.rx.jdbc.Database; + +import rx.Observable; public class InsertBlobIntegrationTest { - private Database db = Database.from(Connector.connectionProvider); + private ConnectionProvider connectionProvider = Connector.connectionProvider; + private Database db = Database.from(connectionProvider); private String expectedDocument = null; private String actualDocument = null; @@ -56,6 +60,6 @@ public class InsertBlobIntegrationTest { public void close() { db.update("DROP TABLE SERVERLOG") .dependsOn(create); - Connector.connectionProvider.close(); + connectionProvider.close(); } -} +} \ No newline at end of file diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java index aea68426ec..189bca4adb 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java @@ -1,20 +1,24 @@ package com.baeldung.rxjava.jdbc; -import com.github.davidmoten.rx.jdbc.Database; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import rx.Observable; +import static org.junit.Assert.assertEquals; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import static org.junit.Assert.assertEquals; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import com.github.davidmoten.rx.jdbc.ConnectionProvider; +import com.github.davidmoten.rx.jdbc.Database; + +import rx.Observable; public class InsertClobIntegrationTest { - private Database db = Database.from(Connector.connectionProvider); + private ConnectionProvider connectionProvider = Connector.connectionProvider; + private Database db = Database.from(connectionProvider); private String expectedDocument = null; private String actualDocument = null; @@ -54,6 +58,6 @@ public class InsertClobIntegrationTest { public void close() { db.update("DROP TABLE SERVERLOG") .dependsOn(create); - Connector.connectionProvider.close(); + connectionProvider.close(); } } \ No newline at end of file diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java index cc5a9fe3be..2018a9427c 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java @@ -1,24 +1,28 @@ package com.baeldung.rxjava.jdbc; -import com.github.davidmoten.rx.jdbc.Database; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import rx.Observable; - import static org.assertj.core.api.Assertions.assertThat; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import com.github.davidmoten.rx.jdbc.ConnectionProvider; +import com.github.davidmoten.rx.jdbc.Database; + +import rx.Observable; + public class ReturnKeysIntegrationTest { - private Observable createStatement; + private Observable begin = null; + private Observable createStatement = null; - private Database db = Database.from(Connector.connectionProvider); + private ConnectionProvider connectionProvider = Connector.connectionProvider; + private Database db = Database.from(connectionProvider); @Before public void setup() { - Observable begin = db.beginTransaction(); - createStatement = db - .update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int auto_increment primary key, name varchar(255))") + begin = db.beginTransaction(); + createStatement = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int auto_increment primary key, name varchar(255))") .dependsOn(begin) .count(); } @@ -37,7 +41,8 @@ public class ReturnKeysIntegrationTest { @After public void close() { - db.update("DROP TABLE EMPLOYEE"); - Connector.connectionProvider.close(); + db.update("DROP TABLE EMPLOYEE") + .dependsOn(createStatement); + connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java index 2021dcdbb3..4e24d7f10e 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java @@ -1,15 +1,21 @@ package com.baeldung.rxjava.jdbc; -import com.github.davidmoten.rx.jdbc.Database; -import org.junit.After; -import org.junit.Test; -import rx.Observable; - import static org.junit.Assert.assertEquals; +import org.junit.After; +import org.junit.Test; + +import com.github.davidmoten.rx.jdbc.ConnectionProvider; +import com.github.davidmoten.rx.jdbc.Database; + +import rx.Observable; + public class TransactionIntegrationTest { - private Database db = Database.from(Connector.connectionProvider); + private Observable createStatement = null; + + private ConnectionProvider connectionProvider = Connector.connectionProvider; + private Database db = Database.from(connectionProvider); @Test public void whenCommitTransaction_thenRecordUpdated() { @@ -36,7 +42,8 @@ public class TransactionIntegrationTest { @After public void close() { - db.update("DROP TABLE EMPLOYEE"); - Connector.connectionProvider.close(); + db.update("DROP TABLE EMPLOYEE") + .dependsOn(createStatement); + connectionProvider.close(); } } From 26508f310434b91e07c93f3dc806dab5e99a5bf1 Mon Sep 17 00:00:00 2001 From: nabyla <31042612+nabyla@users.noreply.github.com> Date: Sun, 8 Oct 2017 11:47:15 +0100 Subject: [PATCH 002/197] Docx4j article (#2714) * add docx4j dependencies * Add image.jpg (docx4j) * add Docx4j example * Add docx4j test * Remove unused import * Fix typo (baeldung instead of baledung) --- libraries/pom.xml | 10 ++ .../java/com/baeldung/docx/Docx4jExample.java | 106 ++++++++++++++++++ libraries/src/main/resources/image.jpg | Bin 0 -> 70820 bytes .../baeldung/docx/Docx4jReadAndWriteTest.java | 24 ++++ 4 files changed, 140 insertions(+) create mode 100644 libraries/src/main/java/com/baeldung/docx/Docx4jExample.java create mode 100644 libraries/src/main/resources/image.jpg create mode 100644 libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteTest.java diff --git a/libraries/pom.xml b/libraries/pom.xml index 15446975f3..c7c5da95a6 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -601,6 +601,16 @@ wurmloch-crdt ${crdt.version} + + org.docx4j + docx4j + 3.3.5 + + + javax.xml.bind + jaxb-api + 2.1 + diff --git a/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java b/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java new file mode 100644 index 0000000000..b3db8d0284 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java @@ -0,0 +1,106 @@ +package com.baeldung.docx; + +import java.io.File; +import java.nio.file.Files; +import java.util.List; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.JAXBException; + +import org.docx4j.dml.wordprocessingDrawing.Inline; +import org.docx4j.jaxb.Context; +import org.docx4j.model.table.TblFactory; +import org.docx4j.openpackaging.exceptions.Docx4JException; +import org.docx4j.openpackaging.packages.WordprocessingMLPackage; +import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage; +import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart; +import org.docx4j.wml.BooleanDefaultTrue; +import org.docx4j.wml.Color; +import org.docx4j.wml.Drawing; +import org.docx4j.wml.ObjectFactory; +import org.docx4j.wml.P; +import org.docx4j.wml.R; +import org.docx4j.wml.RPr; +import org.docx4j.wml.Tbl; +import org.docx4j.wml.Tc; +import org.docx4j.wml.Text; +import org.docx4j.wml.Tr; + +public class Docx4jExample { + + public void createDocumentPackage(String outputPath, String imagePath) throws Exception { + WordprocessingMLPackage wordPackage = WordprocessingMLPackage.createPackage(); + MainDocumentPart mainDocumentPart = wordPackage.getMainDocumentPart(); + mainDocumentPart.addStyledParagraphOfText("Title", "Hello World!"); + mainDocumentPart.addParagraphOfText("Welcome To Baeldung!"); + ObjectFactory factory = Context.getWmlObjectFactory(); + P p = factory.createP(); + R r = factory.createR(); + Text t = factory.createText(); + t.setValue("Welcome To Baeldung"); + r.getContent().add(t); + p.getContent().add(r); + RPr rpr = factory.createRPr(); + BooleanDefaultTrue b = new BooleanDefaultTrue(); + rpr.setB(b); + rpr.setI(b); + rpr.setCaps(b); + Color red = factory.createColor(); + red.setVal("green"); + rpr.setColor(red); + r.setRPr(rpr); + mainDocumentPart.getContent().add(p); + + File image = new File(imagePath); + byte[] fileContent = Files.readAllBytes(image.toPath()); + BinaryPartAbstractImage imagePart = BinaryPartAbstractImage.createImagePart(wordPackage, fileContent); + Inline inline = imagePart.createImageInline("Baeldung Image", "Alt Text", 1, 2, false); + P Imageparagraph = addImageToParagraph(inline); + mainDocumentPart.getContent().add(Imageparagraph); + + int writableWidthTwips = wordPackage.getDocumentModel().getSections().get(0).getPageDimensions() + .getWritableWidthTwips(); + int columnNumber = 3; + Tbl tbl = TblFactory.createTable(3, 3, writableWidthTwips / columnNumber); + List rows = tbl.getContent(); + for (Object row : rows) { + Tr tr = (Tr) row; + List cells = tr.getContent(); + for (Object cell : cells) { + Tc td = (Tc) cell; + td.getContent().add(p); + } + } + + mainDocumentPart.getContent().add(tbl); + File exportFile = new File(outputPath); + wordPackage.save(exportFile); + } + + public boolean isTextExist(String testText) throws Docx4JException, JAXBException { + File doc = new File("helloWorld.docx"); + WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(doc); + MainDocumentPart mainDocumentPart = wordMLPackage.getMainDocumentPart(); + String textNodesXPath = "//w:t"; + List paragraphs = mainDocumentPart.getJAXBNodesViaXPath(textNodesXPath, true); + for (Object obj : paragraphs) { + Text text = (Text) ((JAXBElement) obj).getValue(); + String textValue = text.getValue(); + if (textValue != null && textValue.contains(testText)) { + return true; + } + } + return false; + } + + private static P addImageToParagraph(Inline inline) { + ObjectFactory factory = new ObjectFactory(); + P p = factory.createP(); + R r = factory.createR(); + p.getContent().add(r); + Drawing drawing = factory.createDrawing(); + r.getContent().add(drawing); + drawing.getAnchorOrInline().add(inline); + return p; + } +} diff --git a/libraries/src/main/resources/image.jpg b/libraries/src/main/resources/image.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e2554a0d9c7b0f0e797a73824c15021346fb1467 GIT binary patch literal 70820 zcmb4qWmp_b)99ih5L|=1E$;3X+}(l%cMDE%cXx+nSqScs;O_435;Q?`_nh~8zx&*u zw|1v`rh0a^s=Ks?^51O$hP=!t82}6n000C10RFB4Bms!<2#5&qh=>S?@7^II zA!8sTzkiR6gNFVA10RQg03QbrkC23hjF5wv+$~`|=U7c0CJg3dY3j z$|(+gkeYWM;fGOfSq_$(-0vq#AHGYBvAb=Q^O*hW9-1-_NP%c|wtq^bNY`s~?DTTG zovra$cYHamk*$~nNPnZAmP@UKJGl-O%4ycKT$(7H#P8fG$3eIq9ka??%v8ry;Kv&i zWR8XHMQSa>>xJDS%*G_FHej^QZYd}(UQSD=4(p>3C}PPrgD>GIvydf_(4%iqY53Kh zQRC}<72!8W+h8;0&*3=Jd*#)un%_XMf(3(R0c4G(X5bO9m!`RiEibk5!c}MldLm%g zVeOwE?GVi*O|>NDsm&h!{(4tGEVPvGex&uK15H3{yd|kknbNpNz*_7hF1;SbH|ny) zcQd;?2Q&2Do3wNAIMZ;70748lfSDq;qF8ti<+9XgJQWht3&U4UJ#vu#@ZjAS?nQN@ z_o}_+E1K?zdM11m)jmG0@*>qpwLE^C<%XNQRk!*c`RmS3cdjAH$ojD@Q|!g=y1H88 zb#o3#0J)qRsZ{znAhSzV^d~y3O13+ejO2T>!Si;`+j}G#4gM5C!<8H61jdG?!z|qD ziA8LW(Csw+?OiE?A0m+@WGvN~YlEwZ0KR%TShe?j!=?as21+Wa_n{U+ith(?&p!+m zqfXd-FE(I`t0QRBlJ~$;kJaIWi%BiX#lSM~HFT0ZJ}6soQXmsO{`%r`SA8SWy=koU za<2Ht%i`+rPB<{r{mE(_XA6vT&aPky=bUA@E&+z+ASkldkeTlLk~!ce&WFJ;;3S%s z_iL`N*%LfC4+L{>wEx?s;wNed$$v>-Tha)kAUm>-X0HR&HO&7Jt3ddEQp=li}5= z-Vw_S(0kTENnRmM+yb{w&;B&ac+|=sQjT}K$7ADgb1&t#=b=6B$nSKdkTY(5=<}z% zz*woUX^#GT=(otk-~qbq+(@ag-?MhnjIt^OTyW44EcSCyjE5rlqnw5GCroula`@fr zDkgs4v|rPFbl{gzU;EBL-z{|1tZ zoMh5S_drn(m&@219Nyz*+e#!Pw4?|&MP>hh$fgJYe8enNf;GLUdhwy0zg=wuVQOp3 z!-c&kCogkOm1B@FpfcKLu2P?nZ!N*Pl zscN-tkYi(Z-}Bk68%%M$_X%8(Qz7g`xUzK{kkTDsc{??;McgtHhn-3|>9LkpAbtBb zMtF21kXb=W%>AW-nODt0-*Hwi!pSZpfG)swXOma#2s{s;3)KE3k;8b~;`(aHb;q|V z;8GLA*lv0d>d4qO@?!;e)J=<0Pml2+&rm|Ih_dUBdxrmj+Gzw!9P#G|jA2OtK(P=i zMG)Xy(11^a{ZOHEt#ElUmRhW`){p6%2KDhp>=AooH8@2(*GSh&JtA`QiWz5rGDlC# zT*2F7uM)<&Y>sD9qBHjBR$!^W zVSVt@@s@AKR4k9gj_$=Pt@6UuDY@+~n3;?+&XQKzh!M6|0>W~+1G#Z#8ZFXG3fo;&i~Qf>vryr*eKti7V+Fqm>Yk9iU4UYZonnY zi2w1@sUiYAaimk8{phx!cmrPQHDO?OXZj*kx?9$~p3KA4Y^5Wh=HW3o7A^IZCcu!@ zk8lH>r~fkx!w({v0-z#*PNrH!vdcGpsxCl!T-u+;^tdrezWCac#$o4a<7sC?e9wpu43jay8n;&y1)a?#Q4DR_*WhcH*k~8mTVHwT@-oDXS`lA z#;2*#FU3Q7TzsZL>!>IY-UueuX`8!M=i|1J=|4PTeh}mOAlCmunhlZMky$s(NjAm2 zRvy0`e{YI&$)xgPGV9K3XcPG-(pM&nr(CfzP{G+4bkA0fopb(Q6sYJlei&kI17L$PYhF8fCGHSYtz#7=Qt7Pyig1 zRYgKXI!P#^FkaU;Sgy`lNS#5d5di8JxtrBXnYAhFj}bS?EPdPqDX10qA^0O@zVf0s z93QdkY~^m35i-|oXl9bb189RVXr*l18-Yy{KQZDYVFnYB!yN`HKK8p{F(*cSIg_p_Y}QJ$IIY+FFxlOa5+FF0oIR8X z|9`zjb~u2Ud;cIU;f-S#FP`+NYBCj(?KgRLTvO9-@U0#7=n9DO!(8QRHTJt@{VtzHl*5;$ zVzP_D!Y{jJL3RxHl(-EpOyT`q8M6K}>PQK?X78JpuK%RU{?uTVOMv_Sl=&f-h! zeryL-JmOiKfc=Gx>b+~;g05|S2e-Ouz1`!Tud>yc>&S^fHSxyZ&-I z2N$*Ad%uXf$nwGi59b1A95+xBo|GQ1VeyC-gB2hBcc~uTq1k~NKWFxRo?TRoN)ySL zblV^+^8bhg0I;(GOwr3GHher5u$QWOiw*4LskNo%^{7j~i(`Z(Mek=JJA^hK9cvN4 zN}WNFdUQ~%-Y<>;8?*qVg3B*A{HzI!i4EUQ;v=ZWp4=LScJC+Be*GfND9RWn9efMS z6&9KF%Bz)S;g#U+8})HhGM1dnar54cnlpUkKU3_)o*OKn_hER1Xx#~G9CC3x69>q|rw3PKzY=!@viZRp6iN;R5EN%TQ8YW*=O z_OCcF<$w>0yxS+n*$R8LTJ|mo4lY;@W=c3m-<$g+IAWl z;3z*U{py+t-MDv?Z!xzgLMq@}(r8Z4&IDUdA2N#g4&m_trh9om>{VC0ec8Gl7eU<3 zy~jXJlZrkc38O&N($fdOs}J{{a|crn;{_NG#C|@L=}w&MrxxFLXcZ> z=k5P=5p>Qc{5*SjccomVzExH4@dHq%Xm%ixzTB*ViYo=|u2ipPO0zX6(!-9WVwG5> zIotEI)poBfztGGiMc@3|`uMx*;2=e`v>`}Y;ELzk*@wy`|K}O1v3bgIM8}k>XZv~& zhvzFD)d*=sQAUtYw$M_AfRHg+p}`pu)f%C&lQ}>IB0v`FGMnu{x1TfrBLI*K0K89Rs)mY?DwZk+EeHT}Xceqw zKAu#1J(_zM!1`94&sdN_DjKBh8kC|h6cT^Z@Omjc)QniM;=|UBkL*=sc_uS2^o(+f zt%ct8+$7yJthn!QKW^Ei^9hql57cs>JiTa4_&m2A4}TekBayo`Rk-jhG!4Q zq+8IyTf)glr_a`lj7=Ti{+^0_CrZ(Q_H5fx(7kHu{y~`3OIfkG1)`Jv7Msbiz+Ka& zJHh8EHUYepud7*!;5LE-d>o!bs|A96-1qpd=8=H0XAvJ|7~=NZ(q^K8)1yYw^c9Nc zY=;^|c7$;*j+@%AlRwknUVfjJU(9o4ptP3^xOWjI5WfZsU80*3lLkW2MGNLi#@q!d z4t_ttP3RqCx!gQqdS`aQDogoNJ2$&y4$RHSQg~v<@M^LjokR#$V2Htf-hFXu`;|4{ zFF*X<_Psj=<;jB3n%HFb&#AQtzej-E4Pkxw@;>vtC0qbt&5MmkZwhtc3tH49S}NN+ z4G}g0!?ify}g-0rxO`B>vF$r#;UWgG)WIwURq-DG*)I4Q<@Ov6x_4z+yz za3v3*fd2LQo$IOf&yup%Sla->#TQx56Q@HJ)^gUYl9QN2>nF3vY>^zYtao!$86_uY zhcI`?FC%11A{GhIJ0j-r$7k-^yIm7XYI7rIsBQ=SkwryidyL^lzO6pe$vwY6qA?D= zorw(~($*`V!BV2nkxPlPFTS;>v@$X2Yr%WG5j)!d&v5xKMg&0F7rKl)>E_9~hdM!W zGX3DS(cW+)A{GY*U zt_&>5DAA>DsleXg?ZQsZY&iB(PG<4c`Eff_a~?$QMs^}e+;;8(mCspm4par)Bzk-x z3tCvIS(J5chfuj^Qj*L|Zz{u=p#O69Z}|ZLFeM@Ne04wmDQlcW1J8uSi$p;ly8ij7 zOF@qwOD>F{jIq8IRz1}^)WhqR`Tpitg3x1iEK;hDNIUzj=gF3FK*?+kizM_gpQ#lU zxXkxb^u#Zi_QZ$fKE|hGIK~GuZ1Po~*U%iPxi|cVb>JE^#j?T)bnhv80>Rblmxr1 zpvIRNRwV~4Z`-NjII6eMtS+V0f}7x2rXMX~$acFE`U@yYc#lFYrT2LyzO{czvkaiK zILfWY5$C@AB_)fI*`nTBdbv?bQi>&p^DLOYeKisk+F%^RX{4pnHF&n88k?ClJmKJ9 z-Tq>v=e}NmmIi7pZO@^8PYwI(#d7XdK#dll#wPZEx%>fbQ8;8?vo)_)(k?aHP`=S9 zdQ6x>YCdH(Mb=5iLuu;mrqN|7`tQ*fG4rR7WKOr;FO^8UrQu~MGQNDCRvRn%9bCO5 z%#;&+M4W4xv$6e+)nVC;m3fa`IITw7YRbi$I-E*ag)@vN%ykw_9?DG~-fL}?lmvyY zIPr^2Rw^n);L**~mJEpw^0YGMZEA)4bL~U7ABaMQ06;jB^*@{vPy}TH`q`9HqhJ>b zJk}Qn{Ppm@4+&F$i7%Wm?!;O)ASlw8wpF8`#6&8LVo*r4`Ih3xJb(OkN_PHg>?rAp z2J7Y3cUU$&qOtVxeiKZZ?>f0C&_`msem%FDGC?{dKeson*_23JynZ>+v?FE4TLu69(5G2g?YGL?UU(gN;0 z^WM@tUDtd<&013*7q7T}2p12*GPbgjkr_EgzOpF|FHCt*Q=i$gs;EJvxrw&6Okx(dL^? z`2rDyudTz-;S6-{;`6~Or=VeKJX`@pl~7LH!Bp++k^O6mTWfS9!iP4de0M+D{v*Gc z?rw{z_;~0XwhIhnwp=Ek1A|2|O{nxUfQ>k^ImnXX12#MtFD7kD(?4O~Sy&D=JgFEd zu03TIw&^nX;n=VUPuSt*2D`B7=-eZw_e+?e!O0^ZH(JK>SM)&NL;Z!EDkd$IdvaEg zezfC$%6Mm^lhgf`TTgbDIhRWzcVOcDkVCJkH1+^4Ycfq!X1biWtS|n_tEjv(5sR3H zM=H0NaS1mC1_X4Wm~6v}$!$!JQsbKztCxa1ucS#8iw#Oa22lT?gaZ(u0y2?c)nNKz zzvBc`VGzSo{xFqdLWtm^TtT!AlGb={1&A=k5XTY&!fp_g-#z|%0>nNBO(kNr!3-UQ z*Zc((Av7O+82>;KlsNtljY1<5ImlQs#1}d~u-ZcT0dnM@nKI>J%qp1(C`{$avndJ3 zb+G`@m^cRp00tfg4i+8}76#$p&^R;@4u=VkfklCUjYH1PflJB8DJG6c#YIiSEuo4h z2@RGbLGOb>fW0%^U}S7sZLZS9r35E(^Ry`)V6q7#>Bs)=5%Xlj7FvtY?$lBVCIj#McM9?9|Y(>@j&n?@2SVK1sueyR6Z%6 zI2T{^bJ3^n=4y<3t9ZN<^h(-{ySvHJ1fe3-YPIMe2A3JWCEl0fQjH3bh+6ub*(|Cd zQ}P;xxG#p+ioxEAZ*gCHW-G_~t-|z5F7iv|wX7Bcoz}<;TWKg^V z-srO!EZ%oH8l84f_+F9CEcF zuVXqJ1h0pr-?x%)x3C~PAhc5M6XV^tGXK=4oxblDNAco;=r?+c&2kk0Sc1!Z zh!?5nu4UuW;Zi{?1^4?S8t`fuhAY~HK>N2XYx@w?R~C;Z+l4o{M8seLOsi>bff@K> zTxUXS1nnqS1fgIrXI>nlCIBAs+G>0l&OLDswSaNjKIL7Lk2*2)=v!{Rx+}2_Rm#D7 z-8QWSZgI4?ifhuSH}IHuZbXjXQRi_RD@MzC8pN+|dr#BcT$>(=|8usDG(3qMxEs8C ztz_YiqFGt)+6SrC+>XheMU7d^5YXRKV7za#o$+y-lkjSnZ7OM_jx<}%4Cmmva4fCh z=O2}2C|woyTZHh=-gPni1nxNE`k@{ ziAW8IJs4;3DjS1|K^Tx7SS>J0n7;1J3-g#Oi$O4go&l|oBbNj9Y|^mbkb*W;Uwr3p zE)WI=-$ML_Qe)CDao=>28#mN*i+Ud-PS9V=9 z$;(U?M=}U@tp<_~nZ=6A)DZ-gwelE<=<7U}Y&;W939<6`4GV6``MS_SuF$s1R|567 zZJJl!;+n{GL%aubSun+kw1)2plQEH#q=@zm81KK8-C~P}uO^g>?Y<8eDvW4$()gJy z-tOs$X4W^BjS0gsXgFB2Z;h8$KjV}V2JQ6OG#0#rHvJ}R5T+Lsq2PR~axyMgj#L7x z0D7V5wS%L!;|0%PYP3`FE6@;!f!`IJjl173x_(pqV8e@=H!ykPC>%vtimdy)si9^i zZz7(UCMi?iOFgdABUKB|wRCMxYlMJpnKgbDCmd?$ zde00f-V5bS%{ewf-oD-$S3ZRwJ4v3{r8zdLnbfXs7gknD(PAx$ZlKpyR@@Yz##-4Y zh5>c#BdlcC#!LxxS5`Kfn68o*A+XuI3*YAV!x+Fvrorm58IV87U@j0Y^b481ntW$0K_8)e)wVgUj^wcZ>_ZyT88m_IvbRY9DdG)3-}HkRMHHh4q_Y z#e6WE%4rkLB=1Ss_i}0fJsKLn?plx1X{_WYNzWQ(87k0h_NT_oOK;rPN`H(|xh1Pz zXuN*NLOxzuB62GE;n%#pXUNQ`*L2$J&@6;?lABN+LR9p!xRA=-G?+7ZZS*P`>ijWV)&!jtD zL8y`(t6Q5S@naAyb@D`-oUO--?wiwiVyv%KMh@b#>lIK{epw7@Pvh4Pk!aN!NIlZd zedI6C5mZA$7))5jAg^5)<>UdBBnHtS2*YU^dHk;C&tEcSUV;0-k&^t z8UOBWw|1f#g^K2LFh+`6rDs6&8GTrFub!H#QNGD`@menn24XdtJ8?d{aPllUj25z_ zRF$Zick&pL++4dts;tF`+*pbayq9lejNT}tIFUzhMrKxST){rjv88)Q-jlkWK5~Te zXJ5F|wO}K`^iqHvPi!4Bp`0|_+B$^kV;T>5iI6+@!!qO(NAMB4etMVeopwihx#I+{ zeKMd>#yC5z-KE7iO;Lt}%>8BVRg}GZJGf8>xpzmu4r-h+n6>8(7rMY-rFZa~@WZ;m zzIJYQP^*2(?L`hcesGSSwHcXaAeQXs@5G83?MT7bc-;D*8ugEWz#D~GVe|@Cc_CAx>1UVR}+OC3h#f{TS^S8#~ zvZsMJB*;iC*eVYzb9wg6KkH)Ge*tSd@ z3*uaQ_cG|4QB_+$)giZ-R>sKKifW*R@catzuPQqyfuuUoBT=eyKNnQM`an_)L`zmD z5fMiXDcfu58^4I*WXkX)qrem!n7h`W*2uFtiDj55^DFlm)|B^b7rQLrD%rti4H@r7 zr~D(h^mFu&gx4p3C6pq67WV^Jh<;O>yoeBh>s(EV- z*>SD2r{eu(fKhV^HvSi`Ir+I>*Hw9Y`oV$KID6aGg+|8r6Lma53)GY43u8DEUX+iO z6}Y~+%R%B6IKoCJgn?jGq=9l|(f|-f3ienp((Io6Vq?zQW9;vxq|E>=H?rD9JB2(3 z84*{o$vkO+{=jOJ4;Dn|8aSfMu7O^%(YMh$fX_kXtbFgph^I3%f*&su_gL}pW)big zKriC7ns723`xjtF$d8L(vFMbXS{}Y{Y+P4(nc+3nPw+-c_C;!iif1YNq%EP_*&l<;Woch59Gqka z8dAvN){hB-p4_fQ=l^9f0wa6d{b*P=xiMy?s7p+W@kZJo`mpDK@At}u9HrLiZbzOx zm@ei-IBvq03JT@BAB_?N^!7^!1%Xu7;lvqwVbMI(Pu{x?0nM@vw>$MgjS}Qlnw3=s z?(pPp+Sq7PBXRYR1yGs9eio zgeUWr3!>RqvKUR*kEu%E&7ZD&pwpaLlRC~w8Wva`^=57$A1(n84O!Dvb+ zE+YtN_(=IY%R-3H4t&Qrel2GKcV(X~y{9T8m!?@ib=0 zyA&3_TR8LcK(FK)c?j@Bxf9mH`Ks9*Dj||uH*_}(VStA%Yz~t{R_20p;G9l-CXHrQ zf&2wHh-!4gq;Pk@!L_Q~^HNbRO#s^+MIGAIn_`7W;zj7qY9UKQPg}w^`lzmNTSt2= zTCA$oFrHnwHMq;6f%2uWW#TY)w(gFKIG9L2-004lJubchEw4?(pFqConej%wOyBagr^GOTg_1C!$4WxNmSJ-^U<_iA0kqbV zQ%8@2y9W%6Fbbc)){}JF_PyGWdXK zI#h}Bt072b1iwBFrPLjseE*ZAM5|r66ck=?ylrJ* z<4l$eL<_@x6W09;(AnL2v~j7e%D9jbQIS3kWA1&^{LbCE`4!hW-p@9BZ}K7w~2!MiKq-8L|pD9tO?u3pS8f7D7A+Hrs&gS$Ow zi+^<37-)UwI?P#|6-b&idsj3bm`cLihgqgH*Jtc?k?i;GX3sI90|3h3_0iuW&|V7R&(-_%`1=eo{c z>@R@ikace-`F`q=dp>Zt@lEp0Y4*oanGKof(2~SoK%(UBdQJV*zLRu_CB=B_xGM;DKni=$V?_ba=5fR3hmz|S`3}U4!N}(7|oUb;44?o zT!{5CoEuAufe)aopkSe;Qg+17i+p)sSWwj`5JUT3MQp_4+FPKqyWlR+&T zG+7G~tuG~)u&%Bk`5|cWo;Y8W=;IE!b6_j(>|I;EKA z0^sJjZnJ3B@Slb{v&(J;VPW@8iMUIs1;-NQzp;wxg}xJlwIR?q+CnYJSYMq*|01U@ zhecSu5_J`?y;py04v*fuy`36-lmwbrSgqhz6UKI+xp6-ElE@XPn2T%TNqqR}#FS$Mou28|}uGcU7$2a;uAjQ#}}xgwqiGTS=Y2aIZ} z&aqy+1#lN0`26bD`iwhT3{wAI%{-j;**RA~d_mk9B!lh@mXz!2R@pCb!rVH0s&E<@ zs{4}p!Vl*u?1xXO=ru5{@*I^1`4-E)utn@ILo0kRWF7^f$@T` ziz)#X>5pLf$Is6J(UWa~cEjs7Mq~$ORflQE#9Cl&yaS)78jn?wI z7|Ljm9s0{8XpZCH6!Wh0A@?mOg_g)i#@bU8ruAcpt<~Yk}_(?|2NT*yO zE9ITyNU-GG*pop!S1cbvF}`TA+)qT(p~JhGEFoQ`s83Od%2ZDl>^%f#_5AIMsGb1v-r+K&?VT_(|ql?nUb#|HG!xFQLbib6qX2Uhacz>Y#{pu2^r{+QCoroDdONPa!_b z2tkf7eJMCt^6PIt>cNh)$F+X}o&{U`HOMJ+xM9Hw0elY&RLQL&G22_&x^EWb$_i9HJ>Un42C-bN+J8o1r>sJ5MR! zIru&GX{ysPBcEj9$=L95+I_MFYvjb6wYK=4-B&Lw&fR&xk5)*JV7iAz`%lGTUkeIV19ffRmWZPI?i(rLfoq!y2X6&^ zlPYpVQa|%>C-WFI4sZYr0{M-7MW!-sPv1wV^v_prN#Wt*@c7U?bS<6q7o~~zmJDb1pjkZ#-qd8?tWTBzJ2hDlMH;AL?Rox?yv-l!9bd(I ze33OOChXc`=xP|Gm)NSrP+Jv91=URT zV^likA6KD{UMA+<^n-~FMJd}GAbh20S;?J4BaZieP8$6MLj!R@S*`xO<+|Mi4mtM2 z6zrYHn6h09UP0ap%iPv$PJ@I6Hdl*pUA+7?5%{!M!)+|aG~swmv|WwSp6$Z?Y5>76d^5P^{yCvG)-SWNf7<41 z_VZe3a!USGW77PTKRIQgp`-xp@$vd*|I}YR&Pjb(m}WzTttM&SwQMQ}Wa&kF`f;WM zWTiOx^?Y(ladIRDvn>nVPgs(!VyBGsfc&q#axz7rIDJqbnF)1%n^cAj63*+)hYsU}qp{kli=sNPcr( z`vApt+Jm8A^x9-f5jZbs@S9PwBsp^wV>#PjE8UL~$$ngG(g5{SosnA2}tNd7c0iURN`Kxga-A%B?5J@Im<)kR|$ZC=#0puq%AqP8zhE)3c z)Ib|U7W`2Njx`-0?JPBr5J!p0MErCK7oF)ZVC+pwv}9cM0F9(@j`P9}=UYh&RkEC%olhw?o8TMEvKel#yYBXyzzaN$ayLz}g zFRk(m;9DHjV&XQ#8Xfv$2e*=1i3PbB-9~C#+mMxgEA6zK+;hm}_?TTmM&|rW^0W(7o^1QL*!9FEo|2L72TMFJoc~M!$|MECtj~{7 zAA4``BK|KxxjZE>2U|gU6-(l~YF$OK$Tyz^t>Z8)H4$i7x`qL>NM@P^?Oi&ppe@$m zK`Zlw(I7+a;r^efrN}(5BcsO*AIr@&FH55p9arg%G%sp{eS`cKVS}_bSE$HZjGE2R zkml-tQH3JAn+RuUH+y6^Yh>vuWF>sz$^L+cLUh2<6d)OG}}?; zC4Ys6wNuGujd-PFEmN$Z3hI00S$x!7&Ng<3I3=tXq==4J1B&FBTco?T}%ME@_~ zyLPQ&Ps`(<=tjmRLUk$yO`$O7R^+=DAdMqK|A{nblrV8aL5JW7Emyb-3gxd^)_)P| zKWG0%H>~LYdkH-y?di*~=W*(tab;qwn^tgr2>7c1Jq&U&X{Muh9HgRic| zU#3`8N|YbYj8#_mGemNUdKeKLhT%OH*#|^ezDrYi zkF*8z<=n2^uE=}*yR%Jp-aOFW_I_V^?q9qn*^vcY<&pg6xxdvkct9P^YulWnRePLA z(}LJuvFNP5yhubXW}t)`wy+v80Ms-W#2s9VL8G}k^s7x>U^lI>Hgh5pt%Y#R8|B@_ z-}xQ0w2H5{^4F{$_gwL-G(K2@eZP$hlQt&LrjyPnW#1c6rIdO_Tne-Iv+T{0Ud#z^ zEVj-kcscnddZ11!((e1VG>ys%e)&zycd@SVX@jmJIk5d(@#xnw`KG{@k$;j^5!4}m(hjGGh>)FXhy^PcR?V~EB7D|0NDFh& zMy5F3Y@s^2DU77SBVyJaEJZa^{R;piJ#q*aHP^j8uSPU`uE+j%phYdkb8^0Tsk?Fy z7j(AkO$+Zco@*M!m(dh|?y$1cy{BT4X%;i=TV>C&_9yrQD`7b1>(wM&(b6=`E;hH3 zva$bqhVmO_&UO`h?IsSWSPLBkV|h*^3by2o268w$z|^k>bGcfnydjPw@r4pqq9baF0z zQHmgxkiz=5Q|fAg%@*sO5uS>TC(b&U_o?o?1%SOwX(+FvPw~@WhD!*=$Z~zn zpv)F3&kUlR(qQ(Bh?oc&b;X{Ne{6E6(3;do7+ylHoeE<@4|oo)hf*UDzOD3Xk_dx> z5Z74Wc&E@<-)JY-sF2hoBAL+5uc(HZ`smUHW<1Zlf z^GJi-U`9qsC-anY(#Tw!D9}2kvXwPTId9%oqrKeJ1aHg)e+-Is^**}3vk<~N7|u!& z%-OXxW|7|AH>T9ur7?O;97+3lD9hrpTcL7_efcL`{`wI(v|me>+!-Ko{fIJT!Ag?c z=_zr&f-<z1Z1wFHh<_M{dBwZ|}N%P&a12am!EAnXc=J1t%co0i*teKHXJRFBOaKfV96THVx(V+;0L?+bgkxjJ zAg2(+!seh9S5^Br?Et#9PZZ`N&%6||(E7K`ZvvFngA3P(HebW88sjBayNsr>)q_jd z-~7J0U6aN~tZpf`_yhvVkJD#J@j*(2@Yu1GR{kpaVdP(&=8s_nf}%o=1SXeWwo0eH zTW`ylZmKx@i>GKS*jkdyk0s;c-B$u9p7`1{=szQ<&GIR^lF|hikQ&lU4!sx`UZqOu zS%(pJZGlw=p7=HdbLr$XkP@!3;Y``80vv9(7(&ELHelDT1JYSqdv6F4v^EX&g5#&( zE0w)fs+IP#q&WQPk;Q|?A62hQdvAA8yH%;|=u=Vwjy&`3*DlaHe3S2XjB1N{tU^Uf zklt5Tk_aTnxRjFXfOwYfHK{a;lGM}w9gTN1@~Ej23`e27qj{F1_{Vz|EB=d|4-rTO z*Id1$R1f){G3ZeKHhD#P3Fn8c53r1bG=x}b)P7Mpe}6GC-+|*L%W=Sph>=P)+6NV% zY|{nM(+Mc=eExH+@znYpY?z}cm8!S{vo|8<%^081ZxSGY^Hw9UhxA&aGu(Ug0ZYxB zR;L~wC9y~*VQ>o$+p%C_$ovobV6}Y>Y~VzDpbna7(2MO>ziY(7h!)9Hi^}QF&@Zw$ zTAW%=*Mfz<_&e(tTfH|{*iLz7$^}tyL>HsRb%_)R`Kwec3;Alrz5DO2_%Km$4ateh z;5RhQ4-}>J(!}IA@_YJ$Iy8LOTLIkAEQx=X)>6?%19epV|6%)B*5#j~TVT)adb;BN zYpNi7-9LnOcak8_9unk09ST0NMNQDkzrR$<*AbAU$oVF&);@dnvXzN^3gvSX8K=c#e~JcBBx+uhZ7T5qg4Hj&GE0Y z!v3SIcLk_uYIJv6D%8nx7jRyV^BMv(!R#_fKMAPd&0;Zw+5U5C8W|(g+7cH(tEO2) zFsGHn=;>LUg%#)i`&etRqcM%DcQ5%3IdZ7L-vt=dbnX@Xte@?wgI)6aO7Vgil6kfsXZkzcp)11_~c?x$^iJ2D@WHO8A) zZ1>VK^A^G*a6FO_&{sf_H#v`0D$N^<5wx&bK!Q;rm11*G#u_2bn>6ob;VqPTF0eKq zR_s8#lps@Mg4R-O8k^baUNWNY%ghBCD0YI!5GM^e_;vqv2HrZjy&G+~onGIh=F!i{ zRdc8V>swt3Nwf{t>|emAowK+!B}L7&S4^Zb<@3riTZ@2%-ao6v6ib2>)De%UyQ&qg zqAKtP16wpUFDOHBdVCUv&>VT!VQ9N8g+$#SUuE;>w=<+z===qUbdfwwh0FQ`;r}5Y2`Z3>A{01oQ1+R{3N#LDZVKqH7k- zhv`=kSz()>)1KtRMq;Fd2okxcToh0HesKJGEj)&7%@y_PC+g%+*wbw~W*vLMNaVpt zy8*$6l3%1*&zJuLsq!>fQBuWf^r-?#)W1Z<-RQnweS<<&RMbDmKM*-@z zvFQ59NvpWZ^14OlGo$^qB;-5qWi!VX>!^c^XK*D=-BNyXOPT+= z{-2yML{ZpEO>LbaEqnLDwN#ypK+6T&qIUbvG%Y#gKY{fnUD}z}wcH+xtl`mBVuky} zOkQ@q{@qGioAk=Bv7-f6{%cojp7J5zvztY`v62IW2{hh=%}0z3A-pW5xVYt2{+JOb zUE6JB_P@4VvvwSO8EiUvPa*MOqX}Q&PF2-{o|;{FtM+IN?}K_CZ%s{=GI7Q;i?Ll5 zC_?L#8zZRPC?fLWQ1~o=P|^>0`3zRN5F`-}kA}{mcCQPmlQ_lS^}#+6w&|)Y za8=sd*T1=ojnM@rN7A(I}i%OvuP>5ekWfd*XP@M*89ZUd<==d4Kkf+<2G;IPk zVpl}Mcin&x4@DsBWmT2dZ%57aj% zR&IQU0-mIdRxRHjo_9u!tq8Hh(%2R>Jl9r1`BZIr+2jwGZy$34Lzh8bPH*_0+?rd( z-8@?vpSd}o0y|E-7MyGFG4vgE_vW>G|ES{HyX%wFNOQ5*=U8QE7aq>z?u8k!;#%Hm z@vjUQzSLOUxq|B|8g%@s-in?-d)PC1RX1vxT!rCZbz%^uXquNz$~7L_gu#y0M9a#P zQ$(k6E=HICwuI_tE52S#v_hul1F(AN`>$8|3Y|Kl*FLEltHshKaI|1iWod+Oym_R;@&tME3r+>6h--{|JiQ~9a=T=qlm zR{eKyJ}R0uP1on`+#O$T#jAKZOtVO8MbBH04rG%R<|l--44U$b7Ut!XNIvb3*vPe( zXH%lgFFb0+`3zLU8g;{t{i7}{CAnMCqVbR3Mf8{IlOkG!B3hn);5U=eo`aVvlZcz@ z>X94JV7%Q6g;$-h&LO2wb-9pXNOUEP+qfuwLpm{Gr)MTHs(|*qHi@A-%69dS_P#;nZ#CjuS z%x0;i=o~G3e4terP}qDxW&33;TBty@rwDva!)rC%@uRP0as)5yET~p(!(Bye?!<#D zp$5=DR;h{xrbL6(gYMntt?K%w)_O(NwR$j0^i<==e0imF6(+x#i>g-bXlac*l(2Gq zou{4R_SXfA*5Gbpg-90in*YH6A?hul+G?V9VM;0P?vMb%-Mv7N;O-Q6DXs;IJ0!SM zf);l#?$F{TxD+T*3KT2e%lqB$zkk+b_RN{H&RS=ZwP*ITpS`C(N|{!0eXq0b3z4nk zw&5S4u1Mgmm+#C>R^f}zCaP{uD0FNno+mF&C%q+#h|^RcTvFSNSNnW!R5BZinFj8b zO8nr*oV2ub-qp2CqhGCO9hH$qwM-S?Ii^?NqRWNffxLqi$%S7-65gPXIbg_c@nFcw zv*5dy!J2L4M5g;0zq1@)-DsIYL>2gyu|d=sRMns|CZy++{pWy8FIh^)$AUEZJsfY1 zZocpKP5Q^l0Sf};WApykI{D>p%Fw^Egq^w+TVF!}&~r1bRbu=5FMnMOUYXJz>t~Ia zJSlJKy{`%#Fq#~$Lt|HIXmS(MACyhVb?!V}WD|TRN4MwfC2B9WL`TVuic!&>i|v-h zf+Q^V1*SOl9NrbzS^ih>!2&IsWWB3tJcK4LHC~~~>6NTi9KMrH9wvESrkRh3o)0n+ z=tHG3z`J59kqBw3o;g%=p0g=(xlb;+=rWYABnTC`JVP_|5Ms^7O!@q%_pV@_c| zi1{Cq{&n*H_s`v9?S6$vx%}_2_&d;+32-tz^mY#_o0@ta4Dj$QZXX=h>n&Ajo)jCO z{f78h?FfPVNT_j?eFu_kV8Y)He0=Ii1Pu(x4{Jzbs%SK8IlxgVP2Drpa~J`- z^ z#vK|f>Lx>0FyyCObL)gc?b9KT!TX0FiKS?5eSNtO=luZ-`xSG4%2a(7JG zCMPEmIu8$!^^)|{Q>R=u)?8tVj+p^S2?9X3|9h;+R#Gx&(qy&%4fsPEqqjls!oFT= z8;N;S)0|mveBaudov~!*tILxX19FpBKM_8Z%K7gq_p&J&Uw_F#7@1>bR4rpx1c2@= zr*`{%Y^^Fgl$-XWt2Gud_PbI3AqhL0a>Nu~eI>6P_|rcH9{6!GvpMG&MRWwGH8e7E z=t$3KJPxnw2okc3erLX0@z+45(3Z&YP(y3Q^Q%a^Z3%eBOf(wTNTBN%hh#b#74}4; z@3&d3GDYSA8xZ~m#B7?oYQ<_OdS%q*7yNW5STkQl+l(62%%$l>Qv9Nz4JPaH_Dx;x z45&i%HdE5M9-aVxTW`BB56KQ_u1s|0@UIeq>gGAIef&gALd?piX=PJ+M%>f#cj*dU z>>IZ>i^tu!eSDTS{!g4-$3PUtFu+@#E<;!?M3nlJiymh7y-?%7nfHEGg+ofN6RgfM@5s-?%`wIUZm+=-!~Oe_x%*DeqoK^8HJ?M2fRYXq?I!&;F#mqMQ3)(d{*4 zni@Xh(IxJS^3FAgsOo-(!sXD(){#j2^IDK}i{e$jmA_&?u8XG#&t>#FFj-x^?wp}< zfpS;kujM}^&7r(2tcnCZzWnEq>3y@w9aAoN0DIL}a~l0JPXnpyEoqYe5N52xY3~&0 z57SwpSO*#re=9k;migT299>FyV1LZmZ*Fl*ONp$c*inRy7P=m%1&JJ^+8P8rv^~uq z^Q7dPU7)_-dc?I48~-6WTu1#w!ZCRNq3?I4oz(2D+r-=N2ifKYNf+Eb!KcFVqVC6i zysaNT4^juiT`3Ze`$u|4!+Rq88kpKm)| zWr@j?99%Z3?UeKoCEr_PbFfZfCfSn#i@`a0L>sSS>b#u#ZvTevX)>I2Gj0*<)Y_Q+ zL&9~LxvcynwL5ExG3k{{!!>|&(Xt*Jb7Mo719lNXMwQb~LTq$gt{)3oqKyPs%V*+f z2o^G4TpoNRe&wwy74q!}N=9WsZu;L+)sca@YoLxaUB?aYn+uuJtA{^j%)mSE489!J zh3K7qsQQO=WZ*aXvF0&|vxq0#JbDG^Yr=g&%&MemUo`84cL2Nc#f1s=&-C5|rwI1p z{5zJY<|(eG6)T~>@Kt7SSx>E3f34x$d9||ijjm?_F$STg!3rj&&v5avTvueRb3=I08IXmp|9;p&R zLrg7roQQu&^R31^b<%A@#>anISi?my#Jp5MgG8NMha z_3y{W33|3Z1}%V$!QgbR7;b~x#0(Vf$Ap^0*I$2qS?TpzPH1lbI*IyCsJ5sy8dB)= z;&lpGX$mDiY^y7BU0J{VI<>?SYhpLOE8v(LdE4jUvM1|(5yRX?yVZQX@wQ83%VEGi zOw;qJ7~>0-r+%}n@FOJA`ed7{sJW3eZoy2t zRT_Ir?AW1%n@IJ~zj%1bE1YBJy|Gn;ZV;VTdYvZTUyI6=<#j^dt)n=e@JbY*cWhKtKdD6O=SXRM?WRddYQ1jH%+Nv<^g;RXO(ZL z1N8ZcbcU{u(avDMEv3NLZmdOgy}2@JrC5sUdfHyV516tq8AYI0w?BLN^lE-cuTJQM z6>+TNfM(l#QT6d4u_%^Bz$7HVJ7@Hr!-30T?>F92yQ_B&vw@sF0zO`CI;!}VwxK3ui@Qq*17@9|OuvxTeBtNfJb{gvQpuRP987!vF=*(=Le*39%b$Ku3`HFp|w zOxFsX?E@Sq3R+FxdO>~>N>yfJOa$lPV@$LiRU(i29Q z^=PU5RT3APrm8@_-{PlYo!lm=kNvq@EX9l>j2)8$=%V8RQ&7pYS9Fqt;)Ho!5`Vp- zuRlE1B9;TQo$5Qiq8gVm>D3+|Sm;PzKW}TnWutQH_)#r2UW{W+69)3xpF=JMx)|XL z+wVx1alTqx$$PKP8oZYB9*5oYjJCv!iX^9SoD~ohBH{L#c|&QiJbhm%%0OvV zWQSzzk*y@h@(aA?sle$p0m$D(sNudXMon%87sxk@tEcLiSW{1r4DX*SGN_aVa5vNb z$woEF^@@sXdXPyW6gAdFgM`{Pi!oq@5~?^^x=eVaGKE`c|2nyREVVc-F_&_BgEXHv z7jv2K+PPil7gP8<^kdE3E&=WZ#?$Nd518>^sq=p`<%lyhMQb}Lu-~gY1UxWwi$Ob- zOGpzo3^0G|-&cM0Q7(EuUou+jqd^#v|I|H?tDhRZBi+Pi4!^TSF$*yko@}%FUC2N= zz2Je#*yd1b*ORXBG|z3SJV_Aq=Ir>@lFU!5p#5SaF{1gavO5VPQy~LYiY56E4j?L3 zj&QeJ>7A5HnR1j|(|L#=<1N(E&hfi*HIgYUQ`3NhV*;)hMV9wgfvdgaVeVngB%=Yg zbb$4yQ&XLLHg6LTe!^gR(1{!baC=sq5MOOU9ml`CZZ0D+%qS= zRYcDZul8Ffr!vkrl72>4O-|l=_TN?48Ky{%qU}$k7L&>@>&=aoF*Xg+==gz#BVFR0 zyXN#<0>_eH$I~GT+Cd+j$jfmJgG@C z8T=-@GBliyjqXN2`msr z3lgFWIjBd)YhcsndZXY^-$#RTzlYD8iE`aAPqzUPXC6VNH>oAqXJ6;({8tosfjttq z6^0uwZcL-@oyWP<7gS<7wVkydleA2Fyc!s_De!4(JD~nCeVxmw6Ugmy!-VQbyEryL z0EG3)?w+%?CfmXv%BES|0nV621oCEl_u(p054hA+j_2~w-mE1Ze!)cXhkj#+t3mlx zX~A5bGebN+ z&sNh#6K4dGzq2P#MeFhu5Z?RL+ORcmPogDOS07#@oYCk*!z%{ydw-|D31$|ovw)_a zT79UteMFDoP#qcRVwsP?5C0Wi@pFYi1O}R&t&P_#+(mfOV}ZI)8QOadOdi?1R{ zn^Z35LiC!+TRg|RUazY<4P7K%SP-n`ws5Gz;ThFm zt06|ZY2l-&Fw_$Ergb6TFz}hoiFlAl{gd1x5)(xq0MrGvJ=p~b4MLB#~ z^3f0PP#mr!xMULutR?g9Q2sl1r)MU8QAO~loLFzu9!#NghEYQ3&NNkG@-`lj550^N zQsLl)(>khtqb_awa=yV}BnY+<=|rN@O7&7@cCa^8|HzdylQyhc*6&bg`P)oC?mG7s z8@0%sSL4E*lB)*pSEI0W*5JR=2^?*T-i_qTgVTXh&eB`ISofA(bAE_^v$mV})~51S zk~N6ckskgsBtllKm5XT1dlXeertlsAcKhisIK+~SmHsY2WU39fE_?&^nEb3oL8NUSYBcr!!OV75yro#Z;6f5Si_R5r9-lC>!>aTg%j$c*dyNj&97%Q$ji9LRDK(aQ4 z-)2{#@K}?1kuROj1XbLZgLu=OUI%0-lWN)|j2ffIS5^U%V2$2}!;C07>pvWp&k zY@q{#Mch|$_PF}E(e`!l>1XbBlTW{W7_;(ddp+Zc-I6`XyTF)EdT9T&5F?PGjy3{ zyTPT+f;&Z%d#}aD3|QRo(sE~+n2MwoF5Pt%&{Q-3K)m1kYGV(mi8dE{e$pDgt^E~I zC^jv?W+f;}pohi+{q}D=l{5CmwUNvgX_-6}J}u#`smfhw z7IJH-auDaY`(-8+Brf({)}7+}Cv+lY8r4i|R616O9Z&Hc#Ev6U3O%R)B9#k>56v%) zdnACYsJrLY%I-#P@x;6%`Y?C~5by%fjYKm+CI}Yf%A3^RZvw`hnX=A!#(&b63YAl; zd%wl`9Bt)QMie^IG6QX*5ULp)eAGd9A%s#L7uNju~?xbM{yO)4QVjw0TR zW7X<0N1g8{*-E%nOY1Eak}@ezsj^Ghg;8?X5$OimPdfcr@(^C~XkU`&@QN`-)ID=g z|7S6u!5^o36E3;#U%H4QzB8*2Q(xjPxh|NeyT^-o&Gt01>x3VtlKvs_nrd9X6a&Ai z?k{>9$F0}K_qF;RD@OnOk&8bi2;dTae6eZd{riCVECdAyj0AD`%MZQ`-T}`akJxU^ z+X%-@SZSDadPbBSgxacRHV{P3(GRhORb0Mwy7hf@O0iyiTc}^0Tz9S_(lp)JD1QCk^(^d2sSn zp$(ze9h@ytRv>WZe%`-s_Zj_xRh{AE;~v8HTQ`$b7gHs7dC8$gpIo4#P%dD<-E1#S zh94_l*10D)hE0|ADq{~$t6ZPzs_f$^sFbF8m$6BF^lh>pp!JO{Ej^1sz2~4#b625U zN7pOf_Mqw~gXoF@U%AcNO3;EvSDmfuM0X!HU*YV_eEr_gi(jU))~?%#La!&G7l0$bw>8|m%)W9t-Smk?K+)fmyY=NhUIr| z`SvR*(z7(3b#z@zru6|qQ=2cpb#)yp7gOkq$*tG_NE-i%+iyt+_>}b}!X&rQNevS# zAm>bih>c4qkQF`LsgZL#j(~f+)C%(!gmk%72K9qzFq&j9572(;A+>_cPZ}kCAXOdJ z*^B#SFn~<$Buc;8O5kg+Gawca$EM?cOD{J3T0p~CDX!~t6E2(pbo5m$AlVjZiUQpg zHRuJ!=0Qs;Bg&6UB$kZJ-(_z4Ial32e>`y`Svp@bGe7S0d8m#WCL>$Gtqx(oF+WSP ztDLXutlxO0VnOxDxfz;Df>G#r5D1SvT9VPU6;}9yBDf4xgnJ*bPiWGCCn8uK zDi;nDM^wtYiZ>H#a7t^uSd}IyzP-bAMRhD0t@=12F3kF-X7;Nnv%1sAaxKHE@F+~l zlw{H&T|dR5LtJC_C$f{)!N~zbPO`2qBNgz4IrGC-J+5or=i@EC`svPEGLr{3PSRK! zp2QEfJ!c#gnU@Ay?6$)?PFnolSp*6?W>&gl8Ag?zkkpz5?%n*~plZ?Ly{-k_XC`1` zUlekTz!6*d8{NmAcJ-Z&+`^spAMdMnQTsm8R?k4q7R}{1th97T;-p0t4+4@V< zBbdyOYR=Ci!-SX%eX29IJF9N*p6h5cA?(L?MaFYN)N{he$Lff~?xyaFIy9~~N}=Gu zsHXFQ;X#j@0}{hC`N97w{b%z3m48U`>!Wv?G$>9KD;mW~hxt-x#9w{3N3L|JB;>im zSscyGa$eS|<|QHfbhM2EdFgIxKIlq;`J3-6o8?0Gfovz=UhbIJTUn26vu6!npPC3U zTj|N5r<4Ew(RS}M(miW7^PG>b7dI0F%GAAqyH^0)Td9QF<|6q!ufy&bwgLBBuHVlI z-J$T)jl=Htdj^*GS7r-e$X=NC@*C1~e(L}AhzbazYN#J@k9y->EJ&VSA-011z6(3G zZuE*-d{AxZ87#>-e_AHo)n$)m6A9$vJ?t2R|Da7s4CG4X-^Y_-FZr%eNw`1Skwv*{ zsuJhHB{KXW%R6@^xmtX3g|9?E-f165u^0$ro`@ zgL5xhs{Hi}{%dXfzUoCG83*p*-H+LqpJfVkRl(`2s|prkOu||{&voA73NLJz#l%?t zyniEFN7$jf!yfrRLMq`usR94LeGT}wAAHB}f9sw9JNW{2cVD|T$gn{J`?W?XtHDFf-n((#JHH!ygORf`GI zF5jQ~#lGVLBGHYm$|S~Ol#biW!zo|ve?zb}tw$nT_eSSACE_56ElRVdrnWni+{}Jz z!b?|gFfYm3KQ8rfXG>?gstSHTvq3$Hv$&y?$^VksM8gs7$BDH&2;M8wK7K0qoSK`G z`HCMenTc*z`o)FKhL42&A14C|_5X1)UJ(FzWwb2uJ;Gr0#f<~!e|YA0-fI4TsY|2* zI+Z8dO7*bj$y>4q0+c&Soz7ikg}IbnwkuOStz@D@-Ay#clF>-#D2n(({3YJ zK7dx#9l{uBB72nAmtRvrg`QVH#gLFeZzIawGo+g^Q|OzxI~ zku3avz&nd#STH?CM2m)m)M{$26rTmWfiEdv+m~InLUK>}Sw3@=z!UVNF~3wUFIz}5 z8AmclS@xp8YM2X4-hlay(=>*@aU&5c!3}Vpq;eQjyF3@bX!Ru`T_5a-?%DEA5u+RN zwkStlxKY>n0mnkcrGPlSiY1KYL`A_}fp>C|XwL@0v;HA`$aP)DmI?hLdW9j=O|_6O$IlGB`-_uHKrxhx=9y$7oL&%v`Noqndf%Zbu=aqRSATecIX z9GZ`34jdQn7N6p@^JA*RCP>l08NpFq-3TX>Orc?bzm4p4o&cSYCvsP1t&_YS!}Miq zMTEd<5GI>Dx2viL6-ToIi|IIszPEWa@5mP^q zr7&i1@1{~b#Lrl zFF*wav7j|4NnD6_aQJ60T6uC)KjzhBRpq>Uj>w*2l$maZ#*Ne$a6P&~cLV)x&)Nfk z;iiGuN%H1C~qTKXU4==AVX*qDO35-|+=y>-^nJ=4dhU$iKoBKxj$oJ z?b}pI*qGAZMZi%|ab2JYt#jG6uM(?xztgTOdhrkxMl@~T2b09_CSuhzW>e6?Y0M~F z4-Q}PLIf$Mk$Ec&L0r2Lz5^YUgv#%EK&d__8WA6$k|w7boH91J=@>22C_u43g*4pM z%nzA~gU*vHv2V>3DrKqHW-UwIPfuL9n$?Z2tPkg?aFm;l5)$j0YyKiin`h(w2uBCt$FT&n z_o)vOZa@+G*>?$&^kG1B`WW?*IIJRpDb=vvzXsGpzNf!-flmb@9y ziQ`dA;=?nNO;--!R%Fo5EKbRiweAR~f-<3hpoz|yjXX+D8q`}z^a!Vs=h*<%?!Xb5 ze|bN1$+tt+YYlVz+YVdz!cp1|i(%_q%#z*&zqXTmQ<#hP8*M|u=d<3^QiFPB!-Tn! zo{-pdu}TRnGxWUdUep3&@R6P6bMktb=>&Nk4#P?6t0=>?8ZwrIwqoO)GvEk=4;BK> zSK&xJb8o1SqWxkrf=$pJj9wF7BVCo+5pWDH`!caaglk~u!G29Ez3`e_D?Gd*_g}uPgxu7_}S4KL{Qwp!*D zfE_?X<;e$d6lQQ9d+n?K4~YS}r<1J2XnY#)Ky^zkc$`qYi_w+;`Dy`v+x#hWJT>5! zuKyX2yXrhenwO`7s>yiqHnsI_lEpFzbsOB>&@6JI%H>b7J*$zK25a-bWUz&G!$f>N zOIXR3PVhf1H%<^EW^*Qe-O%W0MO5 z`4lJ3nD4CZzc&GSW>eK3gav%J!axaZbHd^Ct>dP^CD}6upXVu+!aW5hDReI#JYW8V zm(xY`*)oi1K3qp57mgTx09ZEr_y8}p4*T{YeQLTlo*(*}?QIY!k8 za~#9yaZB=&CX?J>9Exx^-G~H4{yscbeyma-ZE$a;Lj6 z2=B2Itf1)-K*v#&7A$dOaQ%A>ZowcWdOTS#Dp!ZS6-u%J4&b=%9%t~=sgBM1<4`@7`|4Ke6`>|$a0)%MNp~X<>9oKBSwTkI$!UDO{O$Tj` zvBrj|G8_ZGRYF8zUsCTHR~Yl%WBtu%*VQ-EnZ62=SoxT1)y%p+M=)M<9Qg+`Gn4ME z6gK=lC?cu0<<<4(U>|(XKx4bxAqSV_83y=R7SD;D9n)~VV2d&=gPhbM)w+=wxz~1% z8?$cK=R8cOB)Bqm&vMtu(Kb^TWZ}kgjz2dfF_rb=I-AynC|G4#WWCu?0o{iJSk`Wt z3cN#Omi*LjSg-8M(yXjzfcQ+bs)#6n_`<|~ruzkGp(5+eU;1L-e@OAyw>>nI1@$ly?ZKb&a8>*2w9ts5MKpCmuvEi_aU*V z;CmRpn1!upUZ{*eDW4a|Ut(1N!9*?!2eTm$*qhj+BgYCOdV-tC2}1Du`{E4;V-kKm zgSNs?ARNBEjad93hM@(Eu1UZzz7itblVL8IA~ld2|A|nJPRSt*fGWNPl~_it_sTiZ z5#|VumlxH@e(WwmLrHr{QIV#wF~+Nw;)&7v8Pa^tGV~6MxmjPnrX54zlCiiSy3-t# z1}X0yDnR74XMC~0>UI;Ltb}8|-9YU|L^h?ePZ8XJtQdEpN1voBVOVflCmj8n z#h>-e%;d!Sy1qmN+1Q3j7&s%OHP|~=J`TzzXLcVC^l`4g#Dbw1ug_*zH3cF2w*56iq+&fW^`Oi5;TNUW1mL_at_0AN&n0x6#p zn9=fPFrF8b?Qs0wD~)i5-=a)-nP-Grv+C-qLAx)krzo3^*-071Fm_GC@njEDR{>Oj zO6V27g4dizM=LWz6a%XiQMk{?D~z7qq?w-0H#|5agQa~gIsOa%l<>VadFGDPk1q+( zGd_Qs6BP>Ua9D&6+IWt~iP_&bO;7nV_CIZD)or>?@{Yu}ny8vP-k#bB+k4%}rBWBZ z8~1z>4}jZo{Fm=DA4(_%P8T)WE1FmrcYq+E4*Z*a;GU2qp?^8WNJ#PpM5lHRb?2<;w#u1@ylGj02vC_fBz|ja9qy;3|eH(Wh)U-i) z5XU&99?w;aoza7(Y3uh_pvFsJ!P_EOE233iFS|Zr!wN-KDNh!~qJso1dg!3Q1l^ak z3Etp`IDLuaK-vA7jylZjLAV%7R*O@ z>N37tiv;;hZqaFS#k|osM0L* zJih%JpHCz-!L&>3sLY5Zm|{^<)`9r~SR?&E(<}ci-f+qS>K+y*F1jW0jParH*UbRG z)qXJ|SfRP*Zv+)sy|3;!ifuZT7+ys&pv?syCtFcR+1fgQJQz<_72l@Eksk%oDv2Yj z9LvU0nlX4%;&lf-7`k6S3`0L(jch%yWXMFlU37}cZ+k6XSZXBL^UY?gfoNCB&yN?GpJN#Ge34`G7kxvk9@hR9pnhTM(m z+h}ScK)%#Oo<@HFa?ASJ#~j`p_7r`3zNUIE4J!M+!7wsvu%YHaRE z?R(qCpzsh8_xLMbes|E37vZ{dRxy8Ao(HHSgCX0cbDm=?_OhCR3D<@DuVJ4B_aE{; z1lE&7K9;eN6>~Lrh}JsOD+oS=MfffkaI;soFdlX9Mv=R?#_8<~Y4vnfMi9-Y1kzuq zsNpevgvL?BaRY3)5?Ve~(_&m4LO{v0t zQdK^e;Vus+@f;P~d_Bm7=1E=g$0Npc)giJ*4M88EmvF&73zL=2kwxmjXB&IpoCT*BPGl7T5G$Wg%M%{f|3BaiMRIc*r*-lQD z$jEvy=T z;7A_ZSj5l1oU3S7UqZ4px(oD#PGuY(U6{CK2~2slJ+j?;Zms*1+K_~{MrSVH3;FhwdMl|mr3jv^Z zG@)i%<`9J5vc%n@GY$7Z=NlP$f}uyDTD8k7q)XzZ*7&d;djzY&Jjh2#Xf`i1u9d0N zB+|Xct+)m{M~AIp@!`KE6JO9F3m9+O%}dcIYj73`R2E9wbEc1Uhw#YdomlJz@D}|v z7yms6A2j|-l)>ttS=+;z(AQmWQMyEkfTGB^<&|{`M!eyONlplthXK)_1&X@wFs@6C zDS-6J;7_uU1GM^Q5vEy0n9_f=OD(?6t0rk2d_8M1!jNd&|>^>V}Z$e=HjW%|+QyGuDi z|B%G)rPUkCLO9mLScpAmQ)C?v=6qf?8uoV8Ab0n%8^w{Uk=gVu0gG;n)be=0#`VHvi(72_kJi#W3&KEBgYhNyj}6~}#pFIPd4bvGGOE6(cj!U*H-J<`Oe1G(5FsLSxJ@LP zA@$a7mG2Ip5s=gyFVBkc#rTRTLG)0j>C7q!HJ5I<4ZduE(6cJl#<6rHr=59|~k^DJR+zPRTA`eaX| zE8^GojIvl~%Y_KI^;<>5DApqd`k?Woz7yI%ET8q6RH*e%iC{76TNeM2hMq@`mFG1c z1W6d!e6ky|9C(@9-Y!4ke5vl(nt@A-TJZ?+7xK zv?b8pzX}~q&Bf1uE>&GDNr!f`U)gC7MD>^zssQQdckm>&K;!qkp24Cl83T1nVQ8(l z3fUy4aqV~5yPPmeMmPM=&qTK-FaZY4J#Pg+s#D1>&wv01$+OV>uk z0owEr)LA7PeZ44`)F|B9j)V3UyS|d^`0mY4e}*LTFOlNwWd^8n)J&# zA$y+8K*g!fpL;fZ$c3mt<~dLIixDPSme7gj+fa-?wOy{hC77 ztc*ECcK-fNSJ}GEPD1(|#$cAW{-s0~Zf`hfEA6LL#X!fn>>uLj#C!NYdbC2NGBS>^ zYX4n8wKd41Q>P*Hs1Xy>O5-xWgmB?!AHy_gkkxP()C!iek&@BE<}Wxg=H}DZKo2XC ztjtK((xb4#$azm-6v#-x%rrDlMd{Opx2koCwEo$%Sj6^K6n1O^N^V?gmAvC;0ooQW z9hhT4zBTFl*J_@kxQ(6hvf|WK;!)AIoY7$|Wm6>XiBxoE>a&o?*)b|QshojJ{CStt z*he4*e(6+HBVznCL@_j6epuu^ddwR!%M;V*81ogzea|(?a2+LCCDk(F+=Z08(wQc{ zkn@1BT1h?uoGx(6kyR4S;`pXCUofyzHG)%e6vJ=NOWH#ym;#q+*&V*Tk#L_y+*&*X z+j^vl9?L^%n(B$o=sY!8OY7I9nUS^a>7~x5$k>DF{U$@4FogN?`QGo^(GRTVQfqVc zh}7Yt8kgSvQlAr1uWibmpRJ zKk+dVY0WWT33av<=W{HX68U{Yxtcxu5bL2#pREj?n0;I6AqMv&`BO=Q>Ahb~XsO?y zvA66^uiuR8klnk9GQ@0sYRC1y8J0yAe(A03s9L$e5 z2Ol-oK;AiIK`Gk6H~y9rf=Mf|IuQG{<%*N-R|AVIUEz=%QO}ouNORa_N#d|)>-O1L z>)A+ZcjZ8CumDLFw;kW7bl&fV1zVAl)+&wSL+D?qPDE4pPtwKvUT^0zwa6Uqs3p0m zU};rFWi|2F=5F8rxTTwKb1Z&a`uo*1Kf>?34ya(aDFog+FEsU<<@`csoiSUhnqxaD zTA`5-<#&IjbMF2WsMviqHzXmcELXD?pQWiRAzk_5tc}IfdQ-(An}V^4x${suygX`F zC{h8O=b~4|m`XJ}J3|T)hUElds#Sl=kCdZofSt37wv5W(2$5zmtuOa4vAFM-ll)?` zh+j738bcF9c(q^1%JE}ZYAgz7r*&RxZ10hLh;@%WRX)P=@T3fLC#gU{tW*g@OP~gw z+#bE5x0Il@Q(@C{;UEJ~;-_Ia)gwSyVGmLNnx(&kE=@Sw6#6-a21Sr4yGVrUU16dC zzUGcX9Y%)W1!av_=~h_PV8~!%lDOd(z!<)CC3CHKE&%Z?jdk)&s^bhZo9{1b4`ckC zL8)K3tFM=#NPI`(!(SRAtEQaRpo!x6n1xVzYp5k4uOR4?evA8q_oVT!3K-L%@{dIa#>H}sAnJnfTafT=^u!N-y!-j!klh4})Dw^q zpQ-MHAfdR9trv%z7T%}7sRc6)4^LSUcS(G)zzf#raP{ARt&&&*=+I5HCQOO#XvY0j z+jA&+0<4rG+QVq62+u9;ztas|A{QlC#||Qe)#JQ_CykFJD;LKNF>}58OJG9cLkU4{ z`71NRsoA#YyJnY57$-zr@GT97EIkn+OUfk>sfs)o$dEjQMRU6(nQW8k$OoD#w9*oV zO|?s@-bW#CutR?419l2m%07(0vtdzcc(-D`vqGG3AP_M=*Q|?dv1@cE%-PB29Q$`K(%;0(beZyFjxm`4kjot}dkKe;h!ER+oRuf=rbY}xT0K#u=x*6Ngtia-9$FBaF;_I27 z#hoe1N#*SMX~blA9-~L}CV0`LC%&PB*N451QPMA^QsJ!Ep<&w2B@4bBI?OZT%^XH_Vzg(`urQYb+9KP0)R zg2dA}b^M(yQ%u@T<I`e`*BYXYDi|++xMlR?j}`+*;ra5J$Mr5nKD?#qZMzTuEPJ;<;WM z{KPQc27}(&Lo#}8uZ9;0!A=YvhOKm1cz_e1{zsPl{HLg=hI-s}`V-`6xdxI+A=(n# ze2Ou|K}{|$g(CkWv?X>Ydy>{x!FhuF323s!m%2QjnHe1ktMqiwYXXaOVZetDiz4jL zg~~DbGutB~HKE50s_R6FP5j%zkO86Zb)mBSC(5!#dDDyOQyprJQu6`&(t8p%{$pv> z44Ggyq7$*b(V0j_*4SE^m(!s%Ki}0PJ;h{{9YP!m2_&~?e$bDGfa92P)&sP!Y&@SU zwiR#_U<-_=Bt;UwIfc_p3f=NrLJpk2P0pB>KdoZSkHlWQ#9c+512PYDIlaPDy5u(Z z{Z)CdoZ{}r`9Ci!0Vg1eN{MWna;%IxrqqV%`Ve(!&2m3ewoT{Xu^fh9DiLX{+dwCR zMRbh3uO`|KaHYjo>P@{Y_rmEk*gJw^baH{wmzb;`P(EU#YV+}Vn#^u(O>)Eo$|M(D z`oU6?Cmsj)>hnWF9YMzq`?40rg9lShBY8UpeCH{F}z7RrpBTV#c{)~or z$Red(IFU0>BJG9#sxK8iq7<2r-;-$M233sBQ%3MFAFuo-3p(OKzLzG#Q&N;gTiE#6` ze=Aoqv&Q4d;ZfCAsws{~^z0gGAFln4WFMGoIUsm2%8i3&9rFF%DW`PMn@r_$18Yx+ zxlR-TqXni8!&|YQc((G?2xG#zmQalv7nI(2z}}7Q#YHcsw^+;kUR7`6zQTvQ?m3z6 z1&4pij0`^zE8;c%fzmo3Pf}azIp-5bEi3b8GIDCb{?9oF{yHLn!I3biQBp<@51jiz zv~kIFs=9NS^pHN=tR+C8CIZWc#505UsqqwRN%M4t(g-YMEM(PQI!0P-5 z*2K()Yl#YLDIgTQ-B7U2I|XeK7TgBT;J4P&s*1fQk;2nD7>H)p=FdOoE>z$_anyoX z?a4h<*bL&+sQ_(gKXk`vqr%Kr?{Sxp}1g2yY?!X zJq2{f^Y={F_|(H!l`1#vm4K8f2t$qt-^{-f4DRFGivX`#_^@YBl%TuFS@GP49`Po1VLL3 zJ(d{ED3E-Q<(A(5LGWK%kA-53Xa2TymXCeGC;7_}`!KHe9%HP;^{x?_G8S`qF#IIDx$vU0LIxH;P=D0@wY;3pLrRR% zM{RDyIXYPB8>IX0RzfiL+VJq|Xzsq}@J$^-v0FymS&)?YXSs~l59f$&-9G3BI-i_f zD`u>VT+}Us@R7uO?ToU=Tg+%BDBs~{NrSUtl@nc;F)>lUzx=7t50XiGc!3h%p81tX z_fYX<;%rv&0nXM((bmV1nF50s+E(Cu0MPXr-AgRnQ)D1Os&N`HpY_Dj} z2kJD8T01am8`~OtOD&i0yE&9Fc&_5|)kav=>NDECI&H|1KzBtna-+(s1g+u1o6V2& za~a?Qvj2G$Vt1)vJHe%*vpOw{1lJoX)+Ae#K3$VmlPaAS8LU59(9vR39I6@A%Uk=? z`98Uj*^x?Bw6%2B74;cij3^0|oStCsy;XKP%hrreEO@-ant@~?54g%1F{I-Jrxjc{ z>RWTG5qMwOVUv6>%T*!C#E^4fKSLC4Gh&{d9Dfi$86bJOpE}XFi^yCmLh{eOq}G!m z!Ay8y*o$REW0ehzzqg|QK9qFkXaC8RN-;RrQCjutQaB{4t5q=zN{I+S|Jb%|QO*&9 zoYspd?-v|p3XKpbV`I_Sv@4NzhA2TRTTg-!j57!=6a~J8Bjl0xd?2b-n)n@u@2yL) z?Kz-`lpbsbUMnvq3cTc~nxt=pxWW ztw<@n!S|4QQAtxMoZA3Oz`CBfRqaFKX3|%;T%aW@(SEcu?SPWYTu9FWBH{X zVWnMTN|q)cv{AkV>F>P6eSzSsxJg(cYPiwyiEB*dnx^Icjq}jxW@uHgX&|AHPbU*< z4Z$*5umqs`my!Rp6`2h`>g!YyuG~?m$E`2b?ZE40W1&zYF}KjE34mMHR4C`5i5VV zd&DI=`_A#6l3*zyZIiKdFP}kKino|E(-ngH;R$P@hqqq%i~W#1(~t4>^29ZD&!qJo;Um4hmJ=V&*N-KL_gb`rSLw8W-)(N)f1hA_71 zBWPn8+f5Jy7&9|Re3+77trar-p~Za3?mkq;BCeXiy&!aKpzh)8!L`$W;I=Ptjw0$V zC<>7@gNJe$-`*>qh62=H-hcYkxu>m!qg_ut*;!wxMuHem=xMM2J5Y4~lPhh_(s#;x z#W{c6Gl|7El%3fj)d#8IyWS<2D~N~&klVxOPr^z&5KVBat6B_O2ngFVlN&xTKi(+^T_QN<6k zZ_zKv#hb5KeJ>QDb`eAZ*VW69_ENXqR zyb#Nyie%WGw9^CK??e8<F;J^2pcYF6HjpiU@}6ul$&133#z(iMV@NNtqeTU$r;4 z=#rAIrd*)^pB86aM*jcTQg>s%`GR@?Q^5C*;Qw@<43R#j_3{hSGZ#@SN`S9KaS({0 zRSgN&ygAgZ&lD1`$OS$xDY0|WgL6*Va~j3>iM@b#x_aP}#4flh@t88I%^%I?^JlTVx(Ae(p<#X3Ur;`ji_qM1!vWdHgMsS5fKUCY_NeZ-Kr!GhJ^@ zVT&$~d&qIRkbN@TR^#L=Z!4AQJu@%;59>4Nt}@EDb|fabFfP9GPzOgkIxe110|CQo z`Z$ZmLxcj)ZYQZiY?Hj&ae<92J`FA9*kddIp*VU0uiXH?hq{P8A>JRAhWRwwj1FEa zNLp>x`W1`OPd}@r7ql)vw(cEi-nJ(Q-7koKtprkh7oOS|B*AcXcV@kqC}0;6UefsH zRn+>i;bCF%dvJRwa^s3NQt5A!`CpgF>{ac*XgvAD#IVV|Z}D*f6nd0-)3@v+VhUlZ zs@X)=n?>&uNUv$7)IydLX`SWWY8_x>%vFBN{7b>lw+L^EynN*aQrK%t1{$r`43n(b zDH9QTpe@k$iZ4?bhK?dlQ2dA!&F_c}v}_=)n5LHdN-lVhqQN6ew>?|~ojyDklY=eK zzyVSmpHMrhru z%=@!140#eV=6|cJJT#KLhZ{$?+T{br6d)d|W@hA4i2)q(AQsbeGB{6(LAeFQ>Grg@e z!3)9o(=WG?A@GWe^6KYS65uSasXSU`utVy6USbauJGwMAJB^p(C)J`hH+$)fG&aHW zl(gqawIp0v+zdV-n=8CxLW_*7;VKiY?OdjGVqsF#mTHGc3CUJ1uG6NG4TqacN5RrV z5F%5`LqEZEIV4%WROD=5xe-N|zg$|~W{#=!y%BMgulmwpdJD=8tNCb1OEaq)dMG~Z zy7^NlWh^R3AoV4HR?(8+^zz$Cp%IP}tEcyi{9mL<>_Hl371P`w1S0N3_MKnyYznFu zmsNIp(=OVM-o-g)sWP;#m~H!@;ae>;E^)BQbsnxCVsc0ff#=#`2CJGRYbh%ADYZ6o zMAHn`Sx`h(MmrL!1XCe~!^H`CQk8N%u7Z`40)I7}P2WcOVZSqnTJw@nv7cm^2fNBV?Pm_gWHgR9OPAykRa6;cBk-^LXx zbzIzYV2E}8JFIn$CtAT2pz+6I8{4#O7EzDR=!JD^@CiT7VNtuq?DtSrgHmsZ+S{B% zXe-)FC7Jf_&N=dxq;cdW#2dbD)~30X>}&93Iv;+^I%Ji2_F zon>j25C|gP7hrZ?dfgc|7c{B$uPK#?BK^yL4$WL8E5*aD<4^EPr1t3togeRdVPT|1 zUr(9>(>GFh>yqt_BO=kUg7E@7<3L9^2n z%*vf&BM@W;Y-Xq2ctp3a6dQTIh0W=-DZ8^}_c2JjZm~EwO%^>4Exw5p(Ic(Mj`B=p zvhmQ6TC_qVrI4e#-WQyo>55nCSVbiDwi6uy`BWnpB&fh!EzTW&Ae=E| z2+!WFFo|D?e7hqF8)NoPhTdgj4>+!F@Gf;lqD^+7K#&fOsNhr>a zO*jNC8f3}*N-s^O;uh7#oSw^_Zuxy^PehI+qisBxuVz8<9W#T->MVZZp-vN+v71Kw zjgM4*aP5P8KQ@|nTRMqT>6@Wg;{}6~mb4#T7CqisU#V4!)VM7%LN#LvzTUy6iqw~D zGDXVgD~2CY@Bd!Y=DdF|KkVTkh2#L5>oj2-wo7-HzRZY%{)z)A;i`>E>-R4G)3%z^ zG;@>43puk3i&>?phS$u4wL;};Jc{czuh3WJvJl96{tZY}f`;g1L((%C+y3?3Lj)J2 zVonkIY_Yl+f@2*x)h#ou6$Fa%8E(3$}oqi z3Yh+sH4Li&eH}>=m2|#wf>E;IUJkl{ASLq`m|>qRIIV|-AJryd2`Ez{Jn7C_Km9{? z*6t>ga0?|VGo$UAPe36%46yLj9_CV1RwAa&Oit&F>@I|w;$;W3dr9GEw8U1ICnznDK>?x#@F#4c379yFABoO>V^L1IJ=Y)~i&2VDYlVt<^k9qQfR$d``Zr^8sNC;d z8iIi`vA6T2ehX*X156mhaefDF3J(PsW&%(#__uj9T+KtX%(&}6JBXC4eLhx17N37P z5BI*26(uu6nv6Y`j_0a;GM(&o&=Snj5T-ih56EPW{S)Hheq>BTxP_;dG7>7tI)!9m`^MBK|lAZI?mkYvpAR^&5nsmj)&YY)w(Z<@^6 zE80Pcwv1V3_MTZQL5Vvze8MR|;wBO{e|@Hs*Va7DOxNylbFL+(*?y97GdmTC`HPkB zia4HyE9~-2+7g(wlR?Aku^X2Th9!A3Dv>Gswvh>yCrn!h&yp*#rQ^@>MagqP&9yu- zGrz6txwWAaB~nJR@GHAaPhxm5RR8S$5esNUXIIY9n<&HB>(%tqWmHf<4ENT=L!*(m z4p&7cOYfj7ikeo#R-~FSPW?dROXiYHyo8BTCB}7OGuK-r0?O+J*;tR_mR8G&Vv1n_ z$H_2hB{u_b=n1_K`0r^^EPAQr0<-l*bzZ=*Ix5_nMq!>Gr77(^kCZdxs!7U3g^Afd z!C)E>kfjq2}ANWN1g{;aqY5= zssn@%CIgs5@m!#KvR5?Q2tqXxV)gf`N33_SIs)7~+ZPT9+oL7P!@2Zzs&_1Xw%PLj zhDsxiCr}LeHK04VO@B(295D`>j%t4gGn$$t9u!$S{uJuFT`4@<5C6@0#vCsY`dzQ? zyz$vxUL)iRQ!3MAPEI)7I5O*TFHEF&kD(A5mgb*bU?^c!FJt<}fA}7zdmhun8=s5dDrs8Y8f+xB?jnd;-O0dcSJ$+wa&^(W1)|4L7A7az(Rqi%9ixQd;oLK%2 zEn0iRjR4rOEx`ka-Z8ASd3&D|s_ySO7L1Nde-dYStLE@gN{i{=>X$-iT6qN6d_EE4 z4t?f6aTeJ5>TdUyT7mJm$)1_-AY#B2SyS+RhFqy9K`h~>@j+t`&eSSd*VSL(7f z#nCuvc1Ty>AM?FW)&zf&g=I=(xJhBdoHDP_l;PL4z^xf$!BmBNmG+iE3cRKge|r# zl9Q?64P^ixS#9N8T#MQvJF05(!6GjSDcjcv;`Hv*JhJZJiI#nHEmc`sAG>6&OJQ5Kg+fI3{Mvf(w|4X(6vOCrtkWC?VfWz=^`|BEFg5+l6(K4D%jZk zT9J@*p}J`Lbndn{*FRC-(L!Jujc@dmDZ}N=y!JllXO2=x-4)KmA0=7!ps&vv8VDyB zZSIVlLD->AJl=fQC!&w;dR1BW=%cchX_vRST#2|}%y&MqMn9G@+9)QQ32OIy?>L!6 zt`pz&-@Wud{AM88e-oIqaR=&DrN;tqTn0Bj%zBiadK2cVP&MZUn~7z5~(B5 zMHhZ$D<5(CO8`|-q9-{ApHmFiO!&GuZg11l?XU-)V@1tI74GKzMno3|L=W+co*`=_ z9KTwT5C83zEoF)dY&G8(<;Q2$cPTRDZP-D+GirpUgErrD!9?#Cpi0k2E9>!fj6JQ1 zwR(E&rscXR&nxvq2c#9X|M>10R3~dDhwatsjMU$a#pwk%6xY1o{$lVQHoX5l4cOm!(1imjx-lN?hc3Jui(W@>Z05Eni!!C;BcusEHl{GKT%)S2j!JZm z7URhzi|hV~#3EiG`VU;lf30sj68;W*x~cn4y52xOo*Wobg?+%T8aTiS;QHNj$Noeo z+v#DqP={XlKgL6SPleMG_DLo>#g}ldpU|GbBMTu7D+jzf1sOYycurFvr3Bvxk@9+{ zDtb3m-(y2X@^8#h^}HJK^M@gE4+Qw&amqG$_uo68n%pSJKw_W2PN{w2jBBp&4y*5T zw~|c_!Z(~XwUyuh9q@n8miiaeBRT_Srj+>F*gehsm;@-0 zi-b-ss!Tl~O$FdJGbYCC`hSf7a({0<=*|bM4-4Qi^;5g*e-8DsyY!U#bpmZis*3A0 zdy7|*#d-bTcfMpg+ijH@_d)ynBTT*_^GyeBy5=%=`1~FCq-}P#R`2QI9 zp#M3IWe1Z?X+LOhTn@-o28n_-FRUf#+%4YZXC8}U# zt9jw@xC%OVUO4(}--qP^AS0Zt65^z)Z5f_;n_oY$1eV7$l?fAN!c;otBTmaV>5MM0 zKBw;!)a?Gj_W$J~y`<5qJ`l>c;5rN+-Z0!8YbEdP_SD?EQZfaQh;NCvC(FILm7S}s ztiWAQJ!QD5KCqx9ag_;n;}nfR9YCWl@;n5=|CWkiq>OtU{rCGAjX2c(`b+d0Dv|BuGN|4U^62%_fZlCsp4bie+eO7{P%VE{SLn6|*PF*A%& zS}9+S7(&Z|`%J}c=L*x8jx_=%%`95bY6zdYGWj?fs@WFuJ`u(GU_@OV9P(lrK_yd8 z%CNz}7%0xKnvS{_NhD4>{yO!Ax@E^>fFX+?Dh-SxXWHCv$!?Wcrh%OJEyKz<=oskP zA(b4&5Qyz;GvN`KAi9A`;0r+|a4~Ai0n^?lq3TDWWG=0WdBazY1ZLSZXN6kO??aW~ z{(s#nJqJiJZ1M>`64wE8c2<|=;$`aAfoS!=Z&K`UJh_pY!3ehW$Yt-@(k5&w;%^^E z+tDgH(2wJeSV>@-dCqEl*rTnMIF8X8K7Hhgl`PD*IF6}c8F0Jb3_D)RU~wNYUm5OJ zTcY*GlBLAbGTw|=_dx8E&+$6Q$?^?}^wRqLX%zfGBkKG7f}9Y~prfN3A&nu2e^1`6 z;DY8ueYc<1fyqFIwgFuiK-<4W zi55Tz0DW3&hTIEmwgX^tax_J0T|U`!FR)4?rj}N;fQI%4Zm6FQ2~1$|S`@uP1c^_u z3=yoO`&UPbFdp38+IjAJUH*C2ZO4-5$gNe00rUuq%aOJe5;(BlAEj&9K@gBo2_SZN zcjt-AZi42cPRaU$PyU}*D%9IkW|=@_XX2(=H}wm zElncIBA71C-n9uUTbPPAa?F2U2*ynBcmpE_2A?D0jvzv90&aDM zXUYJ<%XcZ{dnh5@-O|@HAXKTPWy?_cI0}TG*)W2(wDU?yQpv2upq0%YIMxmRKZi68 zty~frpS>%qiBJ631D;8Fy6$1iAMMpFTG^xMunuQBIsOLi&rc#4Y{RyeKo=HmJC&b9 zJseCwmgweV$~ZoTMwVj^Z8_aY30CQURSeqiMpp_b2f#$)Te z)owdAH8sPu8T}qxycS2Ddj3Fr7=)8{%X$6Y`xcav+Sb*|jm80#rez$CX)abN14f-H znMmUUqlnYLOM|$Q@`+=uJ%{p++ANVY`RH1pm2aVb28Nd;u`qF`p_c2GzYFh9i{`&h z>)ma=`=$Tuwcv4qAZ}_YE=@~!$=3hvwf-xM0*o+-0F%*;fzY8KPiay+t8yEX&N=H? zloJIu32b8aOhOxHTE|uvdyupG4tabwUPHI0gY`Q3NY&wh2V58&S)u z#vG28Hkba3Zi@LKN3l%{;=l)k<>FEzto)?%+^wzgY#69WksbmGFQeW@XjM}>Dphh0 zZ#TAZOWQ5&?*+u5DE-7-*L~&^e%1!nK~yX!O+=CEmpnSu0|{EzJuywl3-x!^rO4zE zh;wnbRJwDweQc{HKcvihNjdpV_-F}*Pa5d&=c&V@5iHC6g1exldYuxuc_Z^wd@nVe zNr>K*q$P+8At!ew*f_qPINT$T_&tHoJKKhr0gMC-@k!CDcv)S1Xl*CUP%#-LDJZsg z939bd0hQqx?l?QkkkUz}+UuOphzNZ9aGobCg3B91_l^?g=0<@|&8L>dRQt)`Ios_9 zjFD1W69P|SiJcu}X5gBao7+4|nBGIcM%x#UJO21e1}`GCo->E-sMxYm zSa~0~p6I4-NLI*ftQ8x$>sXdLm2YXmGW<}f)K9QaO0?@i_)IBFBHo48A+h&j6guY4 zztvKMZoK>m1jOxPH+QIWhv}W>zc+l8Q|XWf0MPN#F>|YBqe4F9e8+aqD?3mth7QWN zmaqHp0MNMy=27S9PuxCv+yJyb4inX@CJpNkweFKKkdrL&%xB4IdQPN_jK-ck^cB+WTreIoieOEQ^|#ixn%Ha>iu$HHgtNfkviAzsKXf%F!= z#144`;8NveFOg1&ZO(Vkr~WFuh@ZyQ+gx^R{?`i7qdQE@Y27zmIz1`_khD|>xJlJX zQzyPp9xw`oCIx9c#^q5304OYlJ3=rz)G+)~rhYCBx)0Ehkt<3pS+^ej#sT_OGTl(2 zUl8Kl>p%Rrxn3S@4Yo6mM7ae+g>EB*N){IC8XGcJ zS;EvLsyCbvsyE^}Q3-56&{N=tcp@s2>jl3faif6Pu0;0oOaKR)b+Js@M z%yBi9Qzq&hTBAb+T?Mip7N{O#k=GO=H(qER6Cx~(am$J@xybpKOeyg#RG3h)Ihp7~LTf}>Xy+>E?P!$v$UzD&*V zlNf%H3Ia{tw*9ND>Y8VGY=_EH5uIm!6p{JnyeQn6pI3PJ#K4vHcvZ#!f z>CPOFh)y85nk>SFhRcK7%7BlqVvkm=LoA&53z;Xx9zDC-<4KSOh>e`~Q5R@o$V3Ls z{DnUzXQD*KkXsPNwJB+Jh-vPMD-TLe(dxpOZ?QG5b<((We2!m$d)GheS+X>xjW2)b zmyxXkSeY}>u&jQ>+{bN8AER3OVRqE#8$$!_M6(wGR`$ik?_M}nj;${S4QI&VC2SD} z)^N>iT_ZPxw%zVsmt(@tepM>r{ebm zxGT0#vN=~9w+{N#(_?eOe4+eH{Mw~K?63u^o1c^k>h-k@Gv^fArEtA!oCQfsVc86K zlai#0HRoP(9)=%Ce^R(GjKTJ1zt4@7S)Km2M+7gmfYe2h$wJm|$U0KuJU57KV4Mvb z<5e<_jIa?v^|!FLD(oGap>Z8RDn{8>ip4j~r@2l+)PP9a=0DI{`m02Ff94pTKoQqtBn+ntW=m(5p5zQP z2TIO{(iR-{VO1idvY!p$#l|JCh)qPgE$?cD|o=z_#9N9jX zxrT64J(gyr(XAhNHWzEB{*8GN+sn^&+FnN&^N$f}cJ>zz?n25U>Z|A8qgLJ_mG4m5 z#lSCCgsAHM^;CVAhmUk^m27GA@hiF1{a3idU7EddA{DQF45!q0VJ%Grq~HOr zU%(HRWqvG)xX48GU*gS$U33K$>=!)dA|})3)d@c4=oKa1N9~<>yf)}cwut1k9R2x) zsFM{jhca`LWz$IVn^_f$=6N*N(K2pPf15C~*e^33Hj-#Q)#38rqw~Z(Gb%|9lQs3o3_S5ZkI5s=jc<_ z)lrT;swrOU6lg<3QzP3zwbO@IK%|V^%J900ed#>r4O;~w052TGs&w~Obw4w|ap3U} zcNQXen!GH>qJE|HTYyN5K|iK1HhA&eSR7B!2po~*y%i}XoN z%gNbiwqI(SiG*@m4I@8^3A&EaWpj4R?z}1dMJ18QVlZ}C{sK+XzN{b5n_${upWZH~ zUoYOVByF^0+j4X#P&t--{}AWm5#fPq?U`5;(86gJF_SO0%1v5yX7m)D3i-y(V;KaJ z+ekNPDYBH-xE>Wz_aM3fz|144FDp z)`DSz<;$26{4W9G-7~~vz|xsPPOa4C7!Iyj336Q+$(-Xi^A43hGXo4aa#+J3$0tFe z+NTXl8D~T+=NE&2!y{F7jc&>i*BN6A_&poytsfipym?=PrO3{@vnbAVT0X~_VLMXE zGrfMPtS?CR#1a*^FefBH*$qAf_rH}x0OKsN5x6>jxrGuBpdl%M-B`=v1O2#duspCi zOT@QN!o8i$CxH+R`}SwV0JXOA4Y{RR$&RCc0%R-1g|YRR-h=Si{2x6hGxGd|$iLHA zPL+z&5W}NT?yl+YT#{>nW7u#$Ny4v{9O5^ff~KcG1%GQrN;nveoYD7$Y7Q$^A5)*= zki^rQ55uw9jSXXnUn?X3frBjORW0bkbLq1x{<|T1rq2EwU(c7I#1gNErg_>;ABDw- zxPFREku)mRnt1#Vh_dv+xsNOL+58vUG&|8CUPYdMSjf^x8A$zJC^xY7tJA+0z3g_s z;N4f;PHLu|QwU@fr^taALZ z`zVj6eAxt3^&zY7h?z9kZA>++Jgh97*PPqV=TmXYsRomPFp{&{91_yN1XaZdrcg57 zn7X_u=@+=o*%w|e%qGQLv*biSGm#oir}$ds^GU5Qa=GfBnXW+FmOvKUOh1b+zN?ba zzv9Mb-Ya&ap5{&mXCx>Lx?2bDLmLXuN3Dm;aAn~W9cct*Rd?;?*Jhh0kKsIIN@Pi` zdw7NDSoZNN6;s1ft{6U;+hjxcxpksdobNm%=qWc)n1hQ(g?&xYxPBq|_ezS#W zYh^@eb+TOZB!=U_i>5}y(U!&EQ0Rt$zP(roJ<*yNJaU$BHdG!`Ee3ydLG+!>3Y?Sj zc~yZY{KMsrOwQEbfP60H`5@V(ZSZ-F=g+Ou>Gc>s;;Ql)7ew3;EhWy3=bbX=lN-yAEBbGRlZ*75w$yFW&prF&X%khUGCKnCi?sZ z-BLfOHZ*4`(;Jy{C0x3A#31vBvQ#Z(m2uq(34KYYp^hMvD`+A)Ma<$L#L}gKzM+lVK07#tmM`kt z0oRqMHsuxNR3++)@S97g7!>bx8nY<3QXzfzmSfn^Fm z9nrZfrCTmM-*5=UOf5AZktKn(9kKpN@_vA%7-?WRYunF}BJg~;FSdV9ORTk*a#LXL z8r;!zsd0#EKl}k-#fW1HP3QC^2b~E{M;3o)Y}Oj;OJ=HERPLr6pca@Vz38nx!htDy zt|Yv&PbjUGX4?Ic9&4$nC(`#j35*E-(Nc$16G%-}m6YTTJ(rxHIa_6UWHZfmn%pP+ z)?}Yp(rRMTvR3CY7-t>M>vG^tP`Px%R&!|1+gdEhUsuyN^E#u??i(xlGN)%E)v$5= z$?!mAVZ+S!0Cz*)pzO#>QAr zU#8sK8p*}-yhIKv=S+kaE9!6HcAtG>r}lC?R^IR|^4f*rIO-ftB;^f}vAL3jJNF>+ zq;UkS5zQReVVHgSWweT31)~s4`WKvk#fF37=V_Qm-6^LPk(YI_xjk=?f6>1lnAtlW z0VaDBQ@6>+{_|f>sMJ-0itCIFM53LmRDI%Oj{Lce~l$DjsM+QYU{gioy@E}1b3@jb3yGs{D0s-$%R1r}JhJ#*`w#Ll?4tCBbb5IF9kvmrcV{@S zoRCi@N$Lgc$(P4RBCJd3i`%nVIv-hH8K3^qoTJBFko2WeG@I`ryWgpIf75BDW+DU0 z%Y!?Y1O=#H`92?R(^-#(dqTbiTzZJl*4NbxI9HSeeU&LR6qPhI8yjcni;`P+%#1E_!`iP$g-6d}%_w$g{<) z1@{?TW8IvSmJ4VHiXpN}?lvI_*Y|^PJDdE#N7q@9+28V**cunw>J{IC^gYYK(0ZUu zZ`Y4no3O}dL^sclyM!nWq2}uivy{MRfhrr-;G<8&a%={OtAQrSbqC1i{;O!%?9P*d z*b85zFVgG#XXn;exg0>qPJbmLy;1uW>$x1bc3YHZA^6XXNHq#A=gbN4g%k&Ue4Jd05xNE~R#? z&A#iQOL|!;dTo>76D4kGa(S#&`>T>ZBK$OW@Nn!ViAyiC)T{dqZ}(m?5u?NMHr5&; zQdg^-i^0!!^Im0W4YXibgXgTIgWeCc;X{uuU#>Sc&nd)szZuNs?{iucA zU&p^wlEd^G1s3BmorZLjS7QAg$;~85dQNl7z20-1oo6}w90$1IwSZ&+r0=AeYNsry zb0kDQ8V*-9^g+v5L13vgVF|ob$x+NL*Bs~X{IUB2bvqN}po{aKcgIWEE%mvJdERu7guIEI`~MLo$B;C>v`u_+^ZLM%EQre=5k) zpbVfqgM-5PUp|F$)w2Ka%R%`1Iv42uOC~CKnBDmpez3sxqSIJ6tM81Z=I`8Mvp3Pz z-MY{g!X+cu7G9CUPdaKekszKDHxHZapYz&o_+BR!bJNh0*SR%sxAm=M(tJoljU|g| zaCsCz|6;AR@>-5Orxiv62lZ!4tH$8(duk;`HVp;J|K=z~+A@9WJ9mH)>|c8zK7-uD z0YAuiSo>X$`#p)ClEVg?6;4C~{^VtwcXt!p_D+c6BNk4GI%&53YFf^YOoWZ;Y;Mhj zl+4;oM{U%EOEXTunBz5OR{9;T58Q!Q7 z?nF8%Tc(?ED~z*7gKyX@l1EBCQ98HqAl4XwIZUDe`WA|=y^zyc1$Q}I0)v3+kQ0sB z)EQP#zXPY0hX4H5jVA)%MZWqjyg%v0wTi+xa?nsr(sA~;p`KuihP!UU=6lc8h(xlB zoYjht_@Mz=SzF`M9~JsG#`u}Gb#0t(PzkAU=QNDNNFSLcuS^;+cWr-s@L6t!0vL+> zJGHazUs$3EH?s;j!rlB$M#e&r4rbk1$CfQWf;7xaO6uf}`I&V4J0J7qh@u6!gO)rh zW?^BJ3T~F!_D!jSYzR<~-yPivB8k#ybiHd>VPfD~pGs9!@k7nd+N$G4Gi}#?!vOn| z77=cPK8r3c)O;H^xU+^#IcEU*&-QhQ5x&X=`fLqJJYv|Az?Zh=wozn(AsBn|r5SZ> zj^2cKKjL*nc zzuJp0H|O1m%?J?@4&f5#>{+5w8c?26LhKs&$L8QiUc55hh5Hw5yyKHLh>;sYJ5&sC z`r9r)=0uIgwGaiym1kR(X$S|=Gu5O>Qez_v>zFdy?tLMG*)Gm*%Xou;csXgBz7-=#-~302bq2&uI^{&uU0i)QfjP^fJ8&uv5sN; zqwzVCcYfS9S-FTq6oC4h`5)*L5Q^OR@Js7>k5(?bU{XYK!!@OY6A4ru(pHBWnW*cz zZ<#FplY4i((#r5oD}L?g0T(qP%OaH!^jE^w|8>pUc>rYcO3>vJ>!n9*~=;?lqRDTMsXvKM%jAqyhAJJO>fe@DowJv zVgJp$dM`s2C~s&U7mqn`EkaCwzB0#I`chyb)bSKCmxzBA>DlhXK{3;>+ZZ9WTYdA~U2uG166u?)~tkvcnZ67QfR-p@@!gHoq_}1FE zLpb#JCxG3MpfbQjHP~N&AodPEym9MbqLk^^!Dd#ue?Mx?=5f{H*9LbV6@Vw7J4$Ar z3gH=_j6A}H)^cNE=Dx|GR)?6wF}VRpj<3cH&aTqJxlQyAZtTZfWgSCT#!@0+CBf1% zyg}8I`JAGpek1XXwubGYE#~Ue_%>@6v%)JlYMY_ayylM~8d>kL*(K4+BRN6`+?=7y z8tgxC?eyB1o&&kh5ujAF6g^~;P9u+FCdwu_!IKUnemxJZ20gE+nNQXv(7N%DK=ESJ z(6CEMc!gnq{NyxY7xwJ^;|q3HCZ~Y!;Y~5gUtojPZ2< z{#D9=!=Y9>{rsKQs{vQymMhaKH!xv4y4rztFIK9`ah8Ti1ZUguRVoJ2tUTQ?&ml-D zBFQWsH1oUE`|a3f?kL>^$GiF1gebvya@(dsYqadwv_iL#k0Hz8YUo+~*ivl=W|f{oaB21k7lhzYSyacoQ^tRbM;IH6F9 zxOj9F$1t4G=HG+)ou38%O*W1MKj(uTs58Q)uYtSC^P&9{*Kz2!>!wR92K$#>8Ya#!}mevgsIT#9~tzZ5TZ4 zfqWx*gM@50dkKX5Bg)=(bAnl#3a**B>=~f+lEY8SwY-=EVR+e#GI5Z~Zx}7ngt6d&5WDG$jB^%l@ZH z>@uj&v9QcG9!x00i^WaR&yfG>imoKcPGBzr4%WpuV%hSMtj?6r(T4kKD!Mue_x@2w zoRZ`G)1^`pBf3Q6EI+92>=gA=zrNvMxc=#1YW+k@4U1m!YkO{trrYcKtV3ez1joZ; z$FAX6av1Xd6(}x@Kj=d@xrWu()&wRjZ+lJF9u0gxkAFv*8^`RSiLR4FptnAEWHY}o zNp)7GpM>irFNr^ zomzcsv|E6-n&+9r3q8Z}OKbD(M5WOq;$R<2sB?pYXNtd_gs@rL{{o~yTfaKrDc$*f z6SDlHW}lXJUzv9dWz;w6`G-at{{WLJ*nG~?c95qgW!7NC9K_f$6v(;cOLuQLzj!KE z=n7_m4%%15RMN7VFiiq@&D31Dup6fs->G6_UZ*nFlh&{O2^f3!!S1 zFe!m}OOs9E08&}#TqB>fg1526Y+&qYkE2(u}4Butm8Fqud-PuvZWTja>YOe**S>Z!0lq|?#A?COairkXY=wEz z!5Ei#feBg^9YF&EJdRHh3mZ9QwgXpdxp{adYb@GsV;l7yLXX511;3oR;$21W7#VCB z)UewN9%ajKiJq)HvGT$><~rOkcZAQ92PIr=AYY1w@=NJab*aaj<{_ngnLWhtt>EaM zU?P#dP~6BzpDn*JXm47w8l|H(L_zW^GbwU)sxt9^M-XZO(>LuHY@FUf@dRInkoOWQ z742>VdSSca{$`&At0dBw_55x&`$5T$Vv zDQxFRgpe3ofiYuQ%L%d%m#KOvD5i7!k0B=*YCkzP-g6mL6gSldd&4x!XrBz>u|tp8?vPlKyR%= zRf*Igpow_RA7~Dyc)X$Lv%5Ovw;5%qYK%S^;-%&5IS=ebnt6bMCyx`lM5mB5s>mU!3CGq zrU(}xcEc>#S9So>tx-)(4FS5mkf=mlaA6FfO0=I@w*^dWsOUEndrs2rX^TxK5=uf7mJjh7R1{d3P1C)5+TUMTp^q%umEJXZ0#3 z!{q{l#3i0;6{()BsG@*%tpkzg1+$%C1aU!FmZUZgvq$`pPy6qaTe$U!CsLEBYj@fmTe_kiyfFXR=#1<<_m!M zxGjg`JF}}%>Yp^GY3LoVP9DE|O&rFLao zrc|k3=b4_LPZ1}?rv$9sha@6|;BPb6rF5LY|7QSx+UOY}A{ zDgZv>rGZ87aSRH0%mHE@G~5$xPN`9=hdsy@pSVgITT0EDj6p(xOt?bgrtUom>axkg zt}CJUS1rj)ccv^5N2Uu0YMqX~N)_W>d*)k7s#1x)2EmbEkogdc}UM;3t`xGYORYmd_#DyW$|3yoim0pWO6tw z_YY7;2M33K((6+IOaL_-xU_D&LL42%E;9xR*=)WEn6ecDQIpRJ4=XSM0*ebez#J^^ zULh3_W^iu4U}bKbXz|jfb{@u+1JEll&22Vof9fK*DL(O+shrZ}I~^b(Y0gCKk#U~$ z5v9?1?E{ELD0@h}2DpeXXDsPT&zXm~^j@MG_?etMK}u+VMbT{-H=l@KnHOrjMC?7^ zsexzn{Z4nu{-83SiSxdC2WR1bF~eWvKJya;lor9%(sv~d1{(@O2eduQ@T54pVkNW= zZf3Tt;#GBHwaS}KbgP2B4lsx)4&i5L9SfM@yjtClav9Yt(%2k2F7xpV#(Kj&e}(-n zUB?l8&!4By_*^FC+Mzi5DnIVD{>K|2uMb6vQCw8KU&HLN;Xx8kBXFCr-M5FM(G%W?tA+Z$57cKxMz z1Cy>vLBYe)P_wfLL0ib`9QPtIc+lQ;#1};w#gd(Z!s8sQ=j5C&Q*;~YS=7V}%-Ak& z*MBm#Bmk|Ce8cke;#jqYu9dk)UG}0V0xQY$0|xGo`nT~Z0A8Pni9R#%$2|}?_llL*Y`<~%9k;?ZJAkyc%ybn&8+3Aw51Aahksp*L!}^FkK^^a=-$!1g<4Ol`2$Ll)8|x9ufNyD@hRP>RBv9 zv@Fni&IZrSDX1%q;t)y~xB#(rpr~4)z4pq{Vx1=EqT)nMr8cpA;$H5`y+JI3oUmNN zV~#ZaU;J7iy#L;w?Y&eN=^DRBgR%wmMd(3VC^~9%Tdx_d%)2!LWcFd^Qcy1J; z6z!q)o-LonN!jN4qbVTQo^2iA*=;?s6omw=d%=xE?mE*{{Vyj zJpB*+c+BPynx(FhrWiQ8semZ>H*hM=^tTfxg7hyk{8MW82}gqG~!-we=16rc?>7a7T3>PG^~FJMK*S6h~rY@(M~jeyr)mlm)}qc!sZ4UD;U zGqxF^>&~UA-E?y*(luJMiuyn0QGy7OAcmwQ5V3e4m^;l%yaTMQEl!L-=?#+Lu(|y% z6fFaQIG9F-`%9EfeqOI=RUv=2)gh@UVJIqeN(0Vgnan5o(kOVQAMiQ7d#ou+|_7qr8rw)hO1Ck)dEG zU%a)cQm>>$&<#J#CKayiL$INPv-HHWT)BTsm-N4-{{Y}J;LDc=To{Jc4>*Di*!91} zKsAoc64a`})@7>e3({i^7gcsINUFdb+G1I2JXUMwB}f44k`>#aYVi?$7R{S^mu!22 z5gJ$CRiety95TyNfZKL~Mh8OM<`+Pnl+iK(gQ~$RW=Fn07y_bRs>ycLr$&Ausk~rg zm~72n{Xs2Sp4p5_o5i#}McAsTPW(zFDA}drQ+6x7HagY2@^EFdp=k-RUVPh?!xAja2;Y9 zXNKWjV1b&S+J?mo4}^Dz0iiY#N4Vv7A{%TAb><%p54=?_mi#B1FtceqZ30 zF<-VA9Ui5R#TJSqA=axDGf*oiU_Y6nTO6-fyeDoO=)s!xlW$<32jDv8Sl8eqX=sDJ z9sI!emC$y;oCF>Srfn(hDpj~4iCGV!Ql_;7>0fvk3}z;jv*o|s1P54medV0O_r$qp zNI1gAvBn{T%+Xbu#rue7604SJ$7lR6{BB&o^1r430F}e(#JCt8k^|UQt<~T0EjpNN zN?;P&y3A6sonuglHD>mbc7O?&hlQ-%~tjrgbS{W2h5LVewjU}B2&ZS^?fVUo5tj-OlRc@;5{6zvOe2EQ=Z9w8_WTw)Ku7Z4c^AK%n4Y_z$66s=fZ2mmM@>&Mmq05(5Fl?V59N~SuY z*6PoQ-u$q{x*B}SBd#|Q>*m4F=@tDQH1c<&2}&~O(H&SBsJfWQzGhbJyQ$IsLZ zza1t@j?XpFb|Mc9=`QlzG(SZ{T6PH8ev8GoW^N23-^8>Qt9(pt_b_w@RLGU`cZpVo>f(i<;+7?qOv0n$Vb@oZ z>M=}>DE;*;3Ub;H%t|Q5c)hJm0HI0&f4P1R;roc~z3PfbV zaSLEjTK-csy^Wsn6@k=jma5JYhs?jTruA3dFJQF-obho-`reQmy?s^2rp~!2o(1{gR@ys$dmk%&F=>&>|DpYbtGNnqK{VH*n;b-at zcDF9@!3xF4sY$D3MBUQ>bC^}D7^E^41!^~>3NN)t zw!hq<2)$qraT!dlfsV1QU4oYSEL{xZm7U2$dd+b7s5egL#T@}I%2X&SKf8m$-L+-8 z^D>&IwA5nux~d5ANCwvO%(_;X$ZN+D(4h?TQ7u}?7qRX3b^(%6xT4&riv~?Q% z!xdrX{{We0!e+@ydq7Qqal|!FDyp9*qfSn)%ZQ3PcCZ}ibl=6rky(1AA}vY>KU%28C&b95#0&sot0iluM^9F7#(2|I)b+hvYmqQz3_{WKz zF2_bbAOLp#@zMnsMvmTK&o{zzEBqPH_&-(!cZ7U>7$t{HuRZ9xl^*QBq~Z}EsYA>u zk!-vJ%hFy(&GG7VfrbsNU=Y5NuCroj_XGoA3Yh&B5+taRK9v$wew8tg zc1K1prS+FCU;Y;^T)&|RSI}mm3!l}_P*BmqE|m&7=`&lm4I6OiC@mx8K8pCRuvQb5Ym2bcLg4HQqrXMg-V~*sZzIuv9({Sif z@iPT4QTq@>ajB>0F>nUsAonT=9tueV!ktSch`C-Kpx|6ihk%#hQMz(mbx`c8{L46D z!F{^QwvI%0XL5iK(-Qfw>th(|KUe7eLD)4r1nm>BihmUU0D%y~ne8cQ=E45}P!k1R z1gXLCDBwOKb|7_#5hY5A5+q2HqD1;v(2Mbp%7$Ig&RPgGG)D|zi&?7g%o|}ZW^4{+ zdRyWErCmtfqw3;fpEXj!=Dv!4We^3zwa*{!FI)Af!LrwIewY3=E(1CqSR8jMFKf~F zfxV~xpe6kW>2PJsfDY~@z@RwAg+ex4ysqry>_Xj#!!SGxb5$|JOC-s*K2ue=-Jxso z282feXS@>NTj8fp;XxLSh8=%#T`uDxGL5C!7wwK2hXUnQE$tn|H=d$=+qqd2*^~B` zRgU=l#sxq)Q>hPXO0k31!pxU&a&84gW2sN5UZVPQ28AyPU`Xt^n9B`d&U{9w940kT z@;QA{Bz}+idzkGp)RuLZ-Y?Pj8|eH`pNRN=B0U*TMpM-?Z630AnDtTXBLmGzk9hN- zmzcMS+`+LdI)T<#)~5>n*uSVZ*IBZr0B6=%t8`aZBNq93L2}hgi^0>p1#G9O8Kn=q zj;V%Lr5sRV6gJK9vcL(N;PEOg9%UwqJMjMii!=Gu*DojXfh&A}n_i#_02~Ckvh2}8 zuY~!Aa+BbX{FnX&AE6JSE-YHS+JXr^8TpJfv^nGV5T=!!rV@*Jv>Fdo%Wy&1jVGsR zivob}Z`uf3MNq#miDez78%-T^5*RRX4jKUD51dOTE?!&vN-j`0X&6<;F6{fn7T16k ze|^Bt!$KF`iDR2}j3TLR1=c&9_`R4A0LV%{>;P<-V8iC%wHjSf4D^9fEI3STpsXF< zWdMacHHmR>Wnjg6E^%NTOc?fHgf*} zbpQ%({YE8=cNuw76Vz(JcDsPRJVj!u;_K9I6$DX&2U&|Cao_k1)MfK65G|pD$I#6t zqs@06KQFlNkWkvS<<3}dELG)y1Lyw$JBQZg{ZF9464r4c(MtNG9NW=pFfG~AYBa$d zXAm$}8>je<|%p@vk+8N0D^Ha4vssI(}&0E9ehgyH;U#r zHx?9drh=QO?ViZ&pgCGD<=R%(CcMDE0;^l0`&>r$Cg>a&d#+=Rq%@EVyjl{6IUi)J z7&?hEqg8zo`;d9|UBPm!-F*kqj0sR|RITC>=+4A67O7m8CqQL}74B~T0I0-RYfv;5 zOZdz-P)ko=;y7tYXEu-IvxW4D^fZ;`{{Ra8z(oNII0Nl0Hkll6l#Ud~!5wP+ApjNR zE?ZVURL6*b(R$`3l&x?_fFq#W+)N5z2^{YCRu}hT+JX`#;PH>B{VShesq{@~To2vo zN0GLCKApcRgy3pk2*_PwJPdt-{{W%>C)D~Y);a9O&6c&6k1+_Y3I>DGH3rRJPY^4u zhL`%ni>WtPP$j;0tNCIt5IBo4XF{xZW{F!?j0y$WV1DC=0)-v14LLS$BSX|${Kel9 zqQ$``i_S;$9?wGc*#2T_z3Wee2Fy|eA2RIWaYgzf%d@fYKrmXQ{JE7zMlc8Frf4h~ zoIfxE*-C4d?*VCptG^MSxDEOn^#yh?3Y%LR#xW4uJ=6!6 z9k%2E3%r!-HuJWi*A@@>4ETXT5FZfshG4cYW;!vk3cwZ3(Wskl z-W8&rGrJj?sW#{+*Jw0VLo(1_t#BN|*CT3>=Ox}L7;;DEFw$45{?5Hy>qLjB@85%Ch5r^(DHt7nJ-T$q$r!PUhCu{p8!fn;h_S=5y3PM1d8tG~=|Rl|lJh|}arR?P zggrqGNsCY9mIxf0#} z$NiWgSgNB$Oc!|I=*rGvtgOYBMp&Oxjpw@b_=V0=VYpAZ&d z@iW||_e>4o+jkYrq`0_%Go5VpQ@ShTrRvNPLY5mQ9AgE1kTEOZZ{eT3*$B}wOa)Co@1m=WS zLTmvU_%0mI$CwltJk>p}E{0iEuEE_<9wr>6b+vkV;tdU56hH%Q2UTFXoL9Ik$m38! z7z)V+2c-n9Ab|*Gy|7cxbxcvguqshh@wg~2vK>W^aANl=wWAp+lbkw$0>EX^H7;JL zkZp~FjcQgP>8|6avt!2*m6fw?s)(#LPKtfw_>aUkOnHBdU+P>m9wiR%FbCRL9Xn z>zP$bXR*7~bE~qigCA+uv=7*SxWEdEDyPI^P06_L{44(ejQS9Vi1Zic7)UIAU|Sy_ z_=4E@gc_P2hI5ou0PiRz-y%AewI z9R&|KQWQW+E~*ake37VgqNA-VePVIU6CvQvj1cIx06L+Xl?|nsN}%8_>!b^^IJCOP zFExndR=NjEZ#8fyG`YCE35Y-;9MTVJnJZZ6rFvI=zzRi9hD0v0xRq(&PI>Op z%K^GpWL;Tm=2q1!3#BZ-OcJdnP^+}P1|?S`dbv6P_2p`&1BzDJXc{@=Fpg(Tmj&Z%ijDit0}jWRZY8at zZhQb!eQsvqZ2I;yf;z`)=>5yxMG~tm0|Po!GJ>s&ZxB&*{L_B^oXlZ(uP#|u3OR*q zDy9;a=F+tFj}Q+L>#M{Cl$qW{>yl|Dyi{WbJBhbYAwc+LBL~*weO1l~nv}z5W>j}SA(H8MV4&>hiJ2&SP;FDPx&^!fvYP=V~FpX>B(X* zdSZU{!^bJcj1l-1mI0T*3rw=-l_hF@Zs5quO+>{8S6bIGY87d-2uISNiSatoCEq)4 zF6hl!vo58B0+;9uBGAyQwN8#ASjMF=ww#AKJHtn!`fKTVYv%-o%>-)b;}VOf#{kf7 z1#-IU}Z<#orx2`48|R^iTvPYioRq6s3i(!KiLQcZ;|k@V8fJLXml_62(KScP*1+ z163?1q{&w>peAo6!|z^9G0+L1K@i)BP$+77r`rpuzUJBETFnJS#) zFRRohxq`H+i(|JK`IclAa3TvmFL0*i5T@KPG2@W>WIdxBilC5Cf-!W3A)Fl<+X zTC@)sUl63r?5MF~ncH}e$ze=Zvj_>AHR;x;PYQTDJAz{72H0c?Zm7{XX36{{ZdJ(E1aI>1{Eb zIt)Dx%*98tED$fLrr4o^__KcENk0QoEk$~`_Z-q|Jfm5r8lo&=msSQgR=A2>zH+`L z%?u5@_?K>iZv|9qS-Zc)L;w?ci=CWaH{w<41%m}n9ha$9@hsYa=G8g4II2WMGOR0R z6@&$0Rz7A{c+r*e)ULE?2c?izflHN2=Z}d)P?WaY3IH-&(-Q@dIkTVj7eHNnO{4VM z1Ar}78G9Rz?qxSH3ab>1x{A_w0?X!@aZGZPP3K8S%FQuBqzL0c#|o}B*)BUvs<(n; z7Yqm%4}fj;GaENWRaskf@76NP`|B%ddI|}2=nIHIc^bAZN1Cdbbr7Pcl&4(BT_l%V zDayEUsFt}Bt0SKI`@@}kMImd^O*xdtASZP8jURQC5l6`=Zdf-&74vRxh{iz`A}yZg zFWzn8tXKwLq8sAw6o{9t7>LoSQUEO0C z)O+W2-Wx#lM3qm0nk$ZJp`6GYnhJae+_CR1kR44dtwlaux$ST5G=rY2(RIf4;82e zsdsCPS3Tl^4X)G9OdI_~J}5)9KZop}Z3h1UV$$GxvIUKISJE3>t%&YQMo5>pBu7e%w1*8tC@?f$i3~SBCg{zxJ&lM?B<;v0CrmJ+NsPpP%8XW@pS5X>9 zn`_8LV)aV8KJa0&IJNQ2BGbD6085!9i|J1u_!DwfsYYQ=wnt8oF0~@-o-_luyG;0eP)eovv!U zOY0@G1+g2Xj-NV;mbl}%Ms1XmpK*eP#o#CkrYB82Bj=D%|xLDqd;`_ zl?BQGbw&cHmf9C>R=1jjINadHH>3ipH<0C0={lEExoB}~VRZiha~lVZ>|D96W+S{@ z#-C5TAEv{IwpZYTOJ#Hy$Y!9JV~x#0!^UMyBN$VY7~2KqY%4<)Hd}{SE-s)g+f|%# za@KW?J=>$)bf3B|Y}gXCUm469x~JE))QmZ;*VKOEqBhF#Of9zesDjvBnM8uC0Ethg zm@0jl5|BapCfKG$pn%9P{S11g(p))qDUXOz04c0=vaO`7L8Wy#0-GNwC840Jp+kyb$N}WV- zd-%A0#6+)QufP7@zsb<9=U}erC;+TvzqAUgxWCM7eX%9$ucmL74{y#!rWOlBg1kXD z_J`v$6uCU6eL|RTZkOSSav0#lmY#WFuL&5c#BCz3IYcTHTo!(1kVZDCRX*KBy9L&; z_<}0$99y9kO-T2v?o_$_fN8^nMtyQdWXBJ}$o;tizgQiwkD7T8&^ z8F-h%g~5?Sk{M`xEWl_y%q(Tg&0wRhu3SipZ6zCO54^JJxBbNYix88O#aZf7%f7$M z1bvBy=?*G`aE_#?0MHAdvC;O2inW$)Z+hQ&{?(HN%dNH!Vg>B%ytQ9Tjnj&_hLbeV zx|MNjN7xm=nL~F-u;sqG#w9GUQm|EX03|7QlAH|C>9^J zF97ip54fia9{O3RL1r^TUZ|pV=`X;aASmU6RudI5c(4-2Nt?X{W3;(%-SVti1uSN~ zwTRja>lkh!%5GWYtyU&}lBJ(J&9%Ku;2y}uI~=g&>-a2V^(=NvTk22Lc##%+A>j6! zSjM?9fJT+snPS%7!v?vk;J~Z5ExRBJz_NmvFzSJR=O|k?wg_@^%R%c=x}fwZ{6ZV5 z@<08d^dkn%esO>RJK{XyoM{S{Tjr1E0JdIfNHz+tu||PooY&$DF0JD(iCs#)+*ZbB zj%%B#Vx_HgN-IpxDPL>2w$5}be)5D>2+>cf&&*zdO{)ub;_HXn3!Mve%UcgPwfBmw zJXqw60(R(sai(fK8~K^1KopbBN0vJutQrHTc0PZI0oLqgKXItpL6*$MXF$~^{{W*3 zpgjAV9PJ;YHj6;i7O{7P4lVS=cwQ8&xbWyfOX|0X51;N2XbKF17l5V`m2MnpAp#+h zA={K>?z>-zi;2zwTN^CSVC7r>{6}Xdu7n(+oItt%0KZ5;bp39blkQ(=mor zA9$)b-qg&fP#!7Q_^l&Lt52WtTo}^23`hvdr~~}9TCrAXJADL1+h97qKg{}s2tp zbvA%F*F*}cFL~T7BG@bqIl8`^G{PhY=+$F3IO#4ljjBZ!|jpp4Fo{l#n`g0!YH(2@4R++w!NHREN96S z0~kvbwM?%BwRm96HE^){TurL9T?U%$Y+xgrIJ1$Pxqao#B3C(0CXu}Mmh}J$!#FKo zqdEPMJ@)BL!$)9PJ^9>1?R_;1V|TJTrBCLa(?zqmwQ5g>;)sH0p1(rLCne zXol>wqbgVcn$8MzjCb!ECWF@Mb>`RDWE>q4@2MJ?x9SIWchfP_ z^ktL~PBRLY30)Xbc=Ak4FDvyHt40^(Ux{$L1aaRrDNhr0e4pV+c~zv^avzy{9qy1G zjC!cCw>ZVdCMfUB4Z}1Aflds{1BMgnQ>TxjCU-3-1tozB$`4}G3xI|o$RB@jCynW4 z(cpZs$pvsfy<$aTluosl4sbTW`i2?(FGc_`uxsiYgOY?`b|Va@8|t~z@8pzuenk+I zU=u3P1Dvw`W{gh-b?tE%gVf}zuD6Jv2UT08YW>6lb;47T>GdHBn|;Y~UY-YZ$+IT0 zsIzx=ldT?&32@HMQXb$n_m%@~d*HBm_bJ{}&OIO)TIYl_RYgL@?{J`7u9|*gxUt0; z^_cLNqOD5x9EyatseWPynNeTK8*@WVgw4kEAT7Y^!uy*8)eqsD9T`fVl^$qKRo?lt ztkNGq72`JwLbmOL>}C@b5K_hGnNBRzW??N#>k*VWi{QjbM|gw)V#*xb2C$AeA%v3d zsu#sa%a%YRXgMz|Qlo39zBLEraUk6^U3iF8h%~J<^Hf09-@I4$m*aiOVf12Yw5S}c z8x>N9uCW8{4IsS^4$u)6IULfZsD%kaO^0|pZoaW8nXMy5xdPW5%$IxL`Q;jho(4rO zn(rSqg38xW#mYZ-^TUt1ww~tiya)HM?gEuVOA2cFtXx1`Xj$7@nSZJCDV-szo|8U4 zbi(o6dWWZI*5<;>?gDI$o5NQc%&$YYXlV@M>y;qYbrj6&ne1ZI%L8I_FpNr6_>@FG zfNB#}-qCC({7h(vilKD!RIo(}Hto ziC-06e}T!>A1xl!@$}+0PZogr{7UsFI%vMeeq(f5^)CLtiV4)HysTr1D(FvzPm&rT zngw7MwAqS|Yn&~IvZL;zrUg_o%d+?xA|!De;8!dD3Z;xA_LNPuD#wVjJ%l9z67+&s z4Oss0Pv|<&_Pa3;pjRb=&iR567RzSlDFStd5!|=TRc&o$4?9hvQu^YLN7VWeXBWmC zaGq)`-H&%RxpK8*9MJQ`46CD(2Bf*+MV%hm6Cz&Jhq7jZ0*H6oI5|7#_<*RP$LPoC@9NA) zQOtkI`mu~8p}{{Vtui~iT~4#&g|Y`KRFvht3QL6(aTR zGvVS`2RloZhP%H(kLagP(bjb-=8^nGKdH5u@T%Xg@qX$qzSaPIvfoLjt<<+oj}q$t z0BCujiO|FkM4=_eBVE${Lto|CU@8O*p?5GBzK>Qng$n{v+5?+j+J>yFgcB;YtGJQG ziUc&Xm0hbdFO+g>SH?R10s#80uo=md?H*q9W!j?)-owNm+)>G!#jWedAK}C!ri6?@ ziP~+Xy&xUc)}mKh;-z|C^%aqz=C>Ne3&w9TX}X+>5F!apt)8Q0bY%=9g=cn9Er$O9 zrVuTjpO`{btW`mj7llq(?PU`6mK!OF$T}!M3IirVY!I~{0hy9Ta+JVK>361m#_SUA z)%V<36aml+<|?}!^99(Bv=?N?fy&-^aRnMf%Iye15k|gJG5QM!R3hz%bd(ENT}-Y_ zCv%Dnb1xEzR5r9=^E0}3%UiJ3cZK98&L-^O&obAA1*1CY<_tk+DlV$^-VAgh1!MyI zLCENlRwzbS=1VmggbIL{i3$tee=>`wiCNGMrklb@a0bs3$F+kZ1=SAOQ*@#iRmpcR zig>_xOSlkLtPX1Hbu4m@|s@4wi#Bm;Mzp zIV&Pd`2^ojm^;?{#4xYSMK=3kr!M^^9N~J)Mx6JB%vajs0HAe+!m0`jQe7CSrv;2? zZwz|>0O(&44cgs2J;{G}F21c*>Iyl6w^rJ(E6>-YAr_%*h~!th2+&zJ77%P3M!{b* zDr|YM)MEb1Bc<5smxAXZ`kdMB(pp5Vuzay05bl`Ji4<6v{7W1=pi5DR!ga?9Zd zg3i>d?-C0aaYL0ampsy~LeS3y77;kHedQ_*c3Q9p14=dsN|y~@C3%+hhCw&?m~Bh) z-w>-qLNF5DR+i6uh=P}9Lxb+%I9oPu1HroF>K%JV4vnGZERh|T^y?GZe{Qf)AWOcl zn1@tbv3kj}2*A3<)zahKI_B|lY&iPgF;hE%gTM&?0A0>A`@Q7@L4V(Jy$AQ}6)CCy z+ko8*#xs53O@;0Ju&F@x{{UpoOM3qRzHDUcpYt*ccmDuvRcm^`%MvPHR{sFZEt2e$i>H8=ARQ~`; zK!sph+*BLNO~~-_+zm0DCG?$o6CUcTbt&94B@M8TGzlKklzWvcLqn60^XG=2wJMYdzY3fkRNGsh_UWL4U}bYj6tSF z&gJPsm8w1^nt@fSOBJMQ&U4xsItaCuv)n3#x3>`tUocJ#KM*xxLSwa6lIH&awc=Hn z3&vY|$^9J&t2bEGZ2ohp_fE&&c0Ti{edlEPoiO=j_@cbe2g@Gc%O1zeKe1!3zD(>7 z%<)A!edmgJrQ50EmdB6p9khMrJG0_iZ1|ni;&;!8uP4M%7Gs*sbY1$LWcZbEzY>m5 zh_ayXARS-~Bfy{WlQ-)_7%qV??+DF+1KH=Z3duV}@)FrwieKQV$|uAPSD}=7uOtvv z2`gX#v+Xa~pD{_d#9e}?%t=7C?*d+$;PU?f>OO=%tiL8ZjQ6==(xn@Q_}dUR1H7~> zE`%V8V!q}DLI8`gS9-YPJLU{SE@@GjHM5qe=`smMg$5RA-cxKw1EIUF(Lkd5AGDwV zSYERj+C3)U24+Nk1NR4maOg_;oL4rMsMUzA)m!mU=?BPxay89y6e%8ClTRdW|(diUzzrrkwhZ@C7 zaBB#mTKgkNG|8t7uV%}s2Fjzvh10}?q`-MElmjQq${YLhCAoXCcRzAGdKK%A$U-mmn4Cjs?>WF0zF>#UUmuxCp!yPg4D4iNMu|}2iF{0eTYc=BH z6KYeO%Hl^IfAxpfphpxBec~uEJJXg8liL!-0^^jxBkZ^$U=p>i+LUa!Rt!+C_Phu(sM@=~P}wBt-=1Q)xVQ-QiDofgs!WPjsL>F};{j=HMl+E8R8`Y!ilUEj zd2Vj*K97n~Z}AO>tsA8`_i z7*zJQH4EPLdS|?@EYpL9N*cvz(ddLbI#R*#n8BpQwV!tm5jF=B{apeXIaf6s;Zb*L zc!P>?4OcfC7G(j!d>tmtw(wNK5RLO;#q$=@3$T~cnQK~kHGFTFkSk`ao}v&|s9d;d z0;sjsu4i=IH0y93rZ>C3(fw~xAcQ1Ri7d9(v&vg8TuvA>LG4VF$V~u z;eRuPqtc<)72ajA z%BoNt))g_rui2Ca(dt}6^tII#gj9EE3aL6MuL(^iWdIbsSi}vD+%${Q)L^;F)!=+b zDAkt0fYDVHu*@9bn;tKTKy{Ye;EIrG)1SO+jvKmX%ua>VBEHZv(>um9A>A3SVp?mn zB1>}`(Rb9NFEpF5Vb8`-m=w`mSbXG{c9yoQ0k4nD$v}78k^^NLtxgbS!vhX5nI-P7 zH0u8VPLnLFsJ~F&u>iMhwMP^HJwc*^HWuxOXdU<#+)+(AYX_nsI1;Xy28Y5%U6c(y zJw`T{%&udICdO4kfly-EgO0alb&NoW1P3T zR2^YxRemZA0#O+>;^qL02u5Z zz(z1uMbZ%xvtu6NEz-#H*Lmzm%k;Rg)bYyuAuu+ULq=N3{r>7*)V?Ei1L;Z#uYrYF zs)}40K&;RPZux*8u@^bVrQ##p?K-C$)GkGb$NvC0eNU+mrK~Rh0NOmlhk_uA)olDF z+KG7T`HX2-Y=mQ(t&PS*=T5xGpp2&RD9RU*wC@@r^}wPSyomn*d&?CV^O7ySCI#?8 z5RszF{QhSjuu)(GW!F9~E&zGKe{mqwu2Wf1I>^~ z8>+2(>2R_XcSz%hq|*zG0`|`neBsNU@q{y&s4j=hUgC3AE9|-p2lkLuTG{xE6NOy7 zOpvLVtgxuSbrw|acZ!FomBdtrhblZk8;W3Dy5eh?4w2$Eizymz;_6%>U7N&7vFoTN zu>)8}gI#5G_G>)3mVf>CNmdPjDq*Lj5UwbtE2L~#Mhz%>Dv?8XyDw128#<1Jytq^f zEAtQJ#~={jxp^o8rF*;e1vlCdPk+=ykf?O#rWsvOE#!j51U3WhP(?9#&!EKBMA==B zsP2{v120)@Ow^*Sf0!E6Zkp{e{ss;^%Y_LFEUm=Tk-%$IL5&eb7tC&I(NOD{ij52H z7G8H2481vj#GpBxOto12Kkj0=M7x4ukn;m5=y$j`d-Vv$7tB3)z3eeFo_Nos9jL* z5s57)Wr1Vgztm+O(M88BLCwKs)xe-FvDdW44YW0qDQe){ zi_@ogh_Hn@UddWJfN-ZCV9hGtKyPtm@Y!hdT_f8Cfc-F=L|kls;(=WCM(D=8{6kl6 zl>-%P=!&I`*x0zF?J&y??Ue*lOAAi3Fet0Aoyn1s1!Qv6Fs;qttmEw-5HcF$1R@!O zK;fRV0E^ZrYpWbRj0Vuer#w~*mvVp$E>*drmd7R?WEki`1&Ly?b^SwmT`&s9{18#? zjEI&003g7GEn1UO`w>EoFIe-)!o}Rdpb1(Vnl2FdCF5{o(HdFC8Q%)Byw5WSd*)hSdhUe&q!!GPx}!HLHFuU8@#9V%Gj36f8Hn zXgE{Sg??Z(E#o`E9jLd=aAw$;4!?< z<-jf%I_;= zEzZy8DYOk0Fvhx*9cQ!aa~*&7xpMr=m*!t*;!~sXDbe_zKM7y-!~R$o#E8B8*yqTY|W5VG?&1 zcV+qP)OqOw7U@!@s&_n-H({@!)IY;nM#yz2a@nNO0^o&1T){J2ubvyGN6jPYLMS*u`$Q+tII zNED3~)qxxn*>yhy^Zsv9Xn2?6`0}@4V3YE@x(kxIvW%Xu$}NM1UX5 zhy|k_Tt(Xr_U3G$UN%aq1-jC}E0liEam=mgTz8o|yj4+-w-9oU67C`t8@t2-b?3ss z(ll>cVG)UnR0P5Y5#at=Y%8qkjYC4Bi!PahmsuMgC2>)uzR+(Krol9%ttoC6Ob3Gx za{SmBZXCssTCC+iJj5~2yC>(Q2y?T_zVrI4^9-~5{L2aR!p@e5*|_fJ3=P7fp|CQqau^7zC41Zv9oL3I8zV9V$r zty+$2EobA)9D9T*(*d8-iM!uOCfC}+z3;|ys`nKETOCML1nRnaAf1nlxfY!m{*K{< z6jcvh&_yg_tA z1FHOqSi*4R5x8g5FtAw9Qrs+}>)k8-O+mG1{UUNp8O;hclFg>zy-g%JWv$RvaS;V-yHrBmeNkgqN0{`fPBl;z zHpmjTAKbtO#SAO&7RsrEikpf;z;VsR1DJP8vfqHTIQWGCS6ON3#~C&ku#L@4(}E7@ z0%;j{m}NQq9)S66I>9%Zq_AW2Z2ym(&LIz)M-0Ag>itnuTfHRe-^53DNtO9Bu==z9j@y zxbmhYIx_=*EW5hf0qkDY6c8f&#g-26C|0jAYEf_~R0dMl0s5F|pufb+MkSS$WklH= zSZv)BesUvG;>%ec+n; z(*^y<@jve;{lxzOyqNDFl*yZX=o2x+%N?ciy4gOMq4w&gpUd#YUsIxW=ts zVM5kI?>m;f+;`R&!mtId2o~drAQr3D^8%1m$(&aZsRtRlh}B6jQD>8wK!P?>{6{grE{N$gp^c5g z4wg0=fMl`7%FeROdWYqlD#p{iqAbJxZa-6%g73`4m%PY?0ou~6)lurcnWbH5@v;$e`$P$Y|t5tKq)Km~HUE=pqT)tD9JVz%* zy6kf)t3g?L%%QxmKg0ml)>6ixR6jA#HFE~b6~+%!BS^tUVT1k7?7Nyl^5$!Kr-*CeX56Ai85aWM$DJE zg(z1Nm4pMNweH>afi6b+6Fa3$*N%Uc zRaCdk>hg$Vg8a9b0{|Y)#-{x?YDMBrj=lONsqlW-824oE<8m1E7xi6AY zvAkwkbpv}dE_Us}@6;Bd60fX6AZDTGUX4uH0*D}J1y^;t#67M^Z4omZSgn^EuyWQ7|jdUP6SPpA&yW+G~-ml_p zDzU+9kB`i1=~gMet^1vP-bV#7VV* z?guLYd$^n29Las>C1s7TxE}yZ+#N)mp;Y4$};!!g1?xT*r_Z)y8SR}P^ zxKdUhc->Fi6TrUZ<_DUA2Kjk$6Gc_t2KMa@L^=?iK9aY~qw^XHYb0{F3BZTp09_o+ z?9O1q5YfyxHoWzQy-rj1gmNw+MmT`Z522~_0Id-YBm&roV+Nqq**1HX^rQAoj%8j^ zwB7>*{Lw61Q!KNHOSD}?rK?(-UTbijB8ntotwipcUo{e|R$Maqo0&DY%xr|u5CLIO z%Y%-P1psbo)*vW{&zKGn-^_LKKe6dP`T3huPd(U5x`}TPwHrk2f8jG%oUs5E-IvP% zKv6)$=6&PglT&|}<|*;=er04dR%y0j&2Sh#CM7YRAjIOB^07=HLf~x7LgCo=nH~-D zc_s$2V{+Vv**wAk04kkRm`{K16Nf4HhCd8_ffZ4Y^p4*@LE<}uY;<{@CdAqkmJ-+_ r%ow6=n1-V9#3eW(HUsKELBv+J!eaz&MQNA^V9o*YKWIM?(Lev$hpa@H literal 0 HcmV?d00001 diff --git a/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteTest.java b/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteTest.java new file mode 100644 index 0000000000..c829baf24b --- /dev/null +++ b/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteTest.java @@ -0,0 +1,24 @@ +package com.baeldung.docx; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.junit.Test; + +public class Docx4jReadAndWriteTest { + + String imagePath = "src/main/resources/image.jpg"; + String outputPath = "helloWorld.docx"; + + @Test + public void givenWordPackage_whenTextExist_thenReturnTrue() { + Docx4jExample docx4j = new Docx4jExample(); + try { + docx4j.createDocumentPackage(outputPath, imagePath); + assertTrue(docx4j.isTextExist("Hello World!")); + assertTrue(!docx4j.isTextExist("InexistantText")); + } catch (Exception e) { + fail(); + } + } +} From 491649a866bfd65d276bd77ab78b55f5eee3b28c Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 8 Oct 2017 14:07:30 +0200 Subject: [PATCH 003/197] Refactor Docx examples (#2716) --- .../java/com/baeldung/docx/Docx4jExample.java | 31 ++++++++++--------- .../java/com/baeldung/jira/MyJiraClient.java | 14 ++++----- .../baeldung/docx/Docx4jReadAndWriteTest.java | 23 ++++++-------- 3 files changed, 33 insertions(+), 35 deletions(-) diff --git a/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java b/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java index b3db8d0284..d9c87b3889 100644 --- a/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java +++ b/libraries/src/main/java/com/baeldung/docx/Docx4jExample.java @@ -1,12 +1,5 @@ package com.baeldung.docx; -import java.io.File; -import java.nio.file.Files; -import java.util.List; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; - import org.docx4j.dml.wordprocessingDrawing.Inline; import org.docx4j.jaxb.Context; import org.docx4j.model.table.TblFactory; @@ -26,13 +19,20 @@ import org.docx4j.wml.Tc; import org.docx4j.wml.Text; import org.docx4j.wml.Tr; -public class Docx4jExample { +import javax.xml.bind.JAXBElement; +import javax.xml.bind.JAXBException; +import java.io.File; +import java.nio.file.Files; +import java.util.List; - public void createDocumentPackage(String outputPath, String imagePath) throws Exception { +class Docx4jExample { + + void createDocumentPackage(String outputPath, String imagePath) throws Exception { WordprocessingMLPackage wordPackage = WordprocessingMLPackage.createPackage(); MainDocumentPart mainDocumentPart = wordPackage.getMainDocumentPart(); mainDocumentPart.addStyledParagraphOfText("Title", "Hello World!"); mainDocumentPart.addParagraphOfText("Welcome To Baeldung!"); + ObjectFactory factory = Context.getWmlObjectFactory(); P p = factory.createP(); R r = factory.createR(); @@ -53,13 +53,16 @@ public class Docx4jExample { File image = new File(imagePath); byte[] fileContent = Files.readAllBytes(image.toPath()); - BinaryPartAbstractImage imagePart = BinaryPartAbstractImage.createImagePart(wordPackage, fileContent); - Inline inline = imagePart.createImageInline("Baeldung Image", "Alt Text", 1, 2, false); + BinaryPartAbstractImage imagePart = BinaryPartAbstractImage + .createImagePart(wordPackage, fileContent); + Inline inline = imagePart.createImageInline( + "Baeldung Image", "Alt Text", 1, 2, false); P Imageparagraph = addImageToParagraph(inline); mainDocumentPart.getContent().add(Imageparagraph); - int writableWidthTwips = wordPackage.getDocumentModel().getSections().get(0).getPageDimensions() - .getWritableWidthTwips(); + int writableWidthTwips = wordPackage.getDocumentModel() + .getSections().get(0).getPageDimensions() + .getWritableWidthTwips(); int columnNumber = 3; Tbl tbl = TblFactory.createTable(3, 3, writableWidthTwips / columnNumber); List rows = tbl.getContent(); @@ -77,7 +80,7 @@ public class Docx4jExample { wordPackage.save(exportFile); } - public boolean isTextExist(String testText) throws Docx4JException, JAXBException { + boolean isTextExist(String testText) throws Docx4JException, JAXBException { File doc = new File("helloWorld.docx"); WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(doc); MainDocumentPart mainDocumentPart = wordMLPackage.getMainDocumentPart(); diff --git a/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java b/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java index 62cce56532..ea1d73f52a 100644 --- a/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java +++ b/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java @@ -52,7 +52,7 @@ public class MyJiraClient { myJiraClient.restClient.close(); } - public String createIssue(String projectKey, Long issueType, String issueSummary) { + private String createIssue(String projectKey, Long issueType, String issueSummary) { IssueRestClient issueClient = restClient.getIssueClient(); @@ -65,30 +65,30 @@ public class MyJiraClient { return restClient.getIssueClient().getIssue(issueKey).claim(); } - public void voteForAnIssue(Issue issue) { + private void voteForAnIssue(Issue issue) { restClient.getIssueClient().vote(issue.getVotesUri()).claim(); } - public int getTotalVotesCount(String issueKey) { + private int getTotalVotesCount(String issueKey) { BasicVotes votes = getIssue(issueKey).getVotes(); return votes == null ? 0 : votes.getVotes(); } - public void addComment(Issue issue, String commentBody) { + private void addComment(Issue issue, String commentBody) { restClient.getIssueClient().addComment(issue.getCommentsUri(), Comment.valueOf(commentBody)); } - public List getAllComments(String issueKey) { + private List getAllComments(String issueKey) { return StreamSupport.stream(getIssue(issueKey).getComments().spliterator(), false) .collect(Collectors.toList()); } - public void updateIssueDescription(String issueKey, String newDescription) { + private void updateIssueDescription(String issueKey, String newDescription) { IssueInput input = new IssueInputBuilder().setDescription(newDescription).build(); restClient.getIssueClient().updateIssue(issueKey, input).claim(); } - public void deleteIssue(String issueKey, boolean deleteSubtasks) { + private void deleteIssue(String issueKey, boolean deleteSubtasks) { restClient.getIssueClient().deleteIssue(issueKey, deleteSubtasks).claim(); } diff --git a/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteTest.java b/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteTest.java index c829baf24b..7c3f779931 100644 --- a/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteTest.java +++ b/libraries/src/test/java/com/baeldung/docx/Docx4jReadAndWriteTest.java @@ -1,24 +1,19 @@ package com.baeldung.docx; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.Test; +import static org.junit.Assert.assertTrue; + public class Docx4jReadAndWriteTest { - String imagePath = "src/main/resources/image.jpg"; - String outputPath = "helloWorld.docx"; - + private static final String imagePath = "src/main/resources/image.jpg"; + private static final String outputPath = "helloWorld.docx"; + @Test - public void givenWordPackage_whenTextExist_thenReturnTrue() { + public void givenWordPackage_whenTextExist_thenReturnTrue() throws Exception { Docx4jExample docx4j = new Docx4jExample(); - try { - docx4j.createDocumentPackage(outputPath, imagePath); - assertTrue(docx4j.isTextExist("Hello World!")); - assertTrue(!docx4j.isTextExist("InexistantText")); - } catch (Exception e) { - fail(); - } + docx4j.createDocumentPackage(outputPath, imagePath); + assertTrue(docx4j.isTextExist("Hello World!")); + assertTrue(!docx4j.isTextExist("InexistantText")); } } From a48a401dc2188eba9164153bd9b207b8f3b9758e Mon Sep 17 00:00:00 2001 From: Sergey Petunin Date: Mon, 9 Oct 2017 18:13:46 +0200 Subject: [PATCH 004/197] BAEL-1208: A guide to deeplearning4j (#2717) --- deeplearning4j/README.md | 5 + deeplearning4j/pom.xml | 33 ++++ .../deeplearning4j/IrisClassifier.java | 80 ++++++++++ deeplearning4j/src/main/resources/iris.txt | 150 ++++++++++++++++++ pom.xml | 1 + 5 files changed, 269 insertions(+) create mode 100644 deeplearning4j/README.md create mode 100644 deeplearning4j/pom.xml create mode 100644 deeplearning4j/src/main/java/com/baeldung/deeplearning4j/IrisClassifier.java create mode 100644 deeplearning4j/src/main/resources/iris.txt diff --git a/deeplearning4j/README.md b/deeplearning4j/README.md new file mode 100644 index 0000000000..729ab101fd --- /dev/null +++ b/deeplearning4j/README.md @@ -0,0 +1,5 @@ +### Sample deeplearning4j Project +This is a sample project for the [deeplearning4j](https://deeplearning4j.org) library. + +### Relevant Articles: +- [A Guide to deeplearning4j](http://www.baeldung.com/a-guide-to-deeplearning4j/) diff --git a/deeplearning4j/pom.xml b/deeplearning4j/pom.xml new file mode 100644 index 0000000000..a39fabc3d6 --- /dev/null +++ b/deeplearning4j/pom.xml @@ -0,0 +1,33 @@ + + 4.0.0 + com.baeldung.deeplearning4j + deeplearning4j + jar + 1.0-SNAPSHOT + deeplearning4j + + + UTF-8 + 1.8 + 1.8 + 0.9.1 + + + + + + org.nd4j + nd4j-native-platform + ${dl4j.version} + + + + org.deeplearning4j + deeplearning4j-core + ${dl4j.version} + + + + + \ No newline at end of file diff --git a/deeplearning4j/src/main/java/com/baeldung/deeplearning4j/IrisClassifier.java b/deeplearning4j/src/main/java/com/baeldung/deeplearning4j/IrisClassifier.java new file mode 100644 index 0000000000..bf341209e1 --- /dev/null +++ b/deeplearning4j/src/main/java/com/baeldung/deeplearning4j/IrisClassifier.java @@ -0,0 +1,80 @@ +package com.baeldung.deeplearning4j; + +import org.datavec.api.records.reader.RecordReader; +import org.datavec.api.records.reader.impl.csv.CSVRecordReader; +import org.datavec.api.split.FileSplit; +import org.datavec.api.util.ClassPathResource; +import org.deeplearning4j.datasets.datavec.RecordReaderDataSetIterator; +import org.deeplearning4j.eval.Evaluation; +import org.deeplearning4j.nn.conf.MultiLayerConfiguration; +import org.deeplearning4j.nn.conf.NeuralNetConfiguration; +import org.deeplearning4j.nn.conf.layers.DenseLayer; +import org.deeplearning4j.nn.conf.layers.OutputLayer; +import org.deeplearning4j.nn.multilayer.MultiLayerNetwork; +import org.deeplearning4j.nn.weights.WeightInit; +import org.nd4j.linalg.activations.Activation; +import org.nd4j.linalg.api.ndarray.INDArray; +import org.nd4j.linalg.dataset.DataSet; +import org.nd4j.linalg.dataset.SplitTestAndTrain; +import org.nd4j.linalg.dataset.api.iterator.DataSetIterator; +import org.nd4j.linalg.dataset.api.preprocessor.DataNormalization; +import org.nd4j.linalg.dataset.api.preprocessor.NormalizerStandardize; +import org.nd4j.linalg.lossfunctions.LossFunctions; + +import java.io.IOException; + +public class IrisClassifier { + + private static final int CLASSES_COUNT = 3; + private static final int FEATURES_COUNT = 4; + + public static void main(String[] args) throws IOException, InterruptedException { + + DataSet allData; + try (RecordReader recordReader = new CSVRecordReader(0, ',')) { + recordReader.initialize(new FileSplit(new ClassPathResource("iris.txt").getFile())); + + DataSetIterator iterator = new RecordReaderDataSetIterator(recordReader, 150, FEATURES_COUNT, CLASSES_COUNT); + allData = iterator.next(); + } + + allData.shuffle(42); + + DataNormalization normalizer = new NormalizerStandardize(); + normalizer.fit(allData); + normalizer.transform(allData); + + SplitTestAndTrain testAndTrain = allData.splitTestAndTrain(0.65); + DataSet trainingData = testAndTrain.getTrain(); + DataSet testData = testAndTrain.getTest(); + + MultiLayerConfiguration configuration = new NeuralNetConfiguration.Builder() + .iterations(1000) + .activation(Activation.TANH) + .weightInit(WeightInit.XAVIER) + .learningRate(0.1) + .regularization(true).l2(0.0001) + .list() + .layer(0, new DenseLayer.Builder().nIn(FEATURES_COUNT).nOut(3) + .build()) + .layer(1, new DenseLayer.Builder().nIn(3).nOut(3) + .build()) + .layer(2, new OutputLayer.Builder(LossFunctions.LossFunction.NEGATIVELOGLIKELIHOOD) + .activation(Activation.SOFTMAX) + .nIn(3).nOut(CLASSES_COUNT).build()) + .backprop(true).pretrain(false) + .build(); + + MultiLayerNetwork model = new MultiLayerNetwork(configuration); + model.init(); + model.fit(trainingData); + + INDArray output = model.output(testData.getFeatureMatrix()); + + Evaluation eval = new Evaluation(CLASSES_COUNT); + eval.eval(testData.getLabels(), output); + System.out.println(eval.stats()); + + } + +} diff --git a/deeplearning4j/src/main/resources/iris.txt b/deeplearning4j/src/main/resources/iris.txt new file mode 100644 index 0000000000..8b4511f8be --- /dev/null +++ b/deeplearning4j/src/main/resources/iris.txt @@ -0,0 +1,150 @@ +5.1,3.5,1.4,0.2,0 +4.9,3.0,1.4,0.2,0 +4.7,3.2,1.3,0.2,0 +4.6,3.1,1.5,0.2,0 +5.0,3.6,1.4,0.2,0 +5.4,3.9,1.7,0.4,0 +4.6,3.4,1.4,0.3,0 +5.0,3.4,1.5,0.2,0 +4.4,2.9,1.4,0.2,0 +4.9,3.1,1.5,0.1,0 +5.4,3.7,1.5,0.2,0 +4.8,3.4,1.6,0.2,0 +4.8,3.0,1.4,0.1,0 +4.3,3.0,1.1,0.1,0 +5.8,4.0,1.2,0.2,0 +5.7,4.4,1.5,0.4,0 +5.4,3.9,1.3,0.4,0 +5.1,3.5,1.4,0.3,0 +5.7,3.8,1.7,0.3,0 +5.1,3.8,1.5,0.3,0 +5.4,3.4,1.7,0.2,0 +5.1,3.7,1.5,0.4,0 +4.6,3.6,1.0,0.2,0 +5.1,3.3,1.7,0.5,0 +4.8,3.4,1.9,0.2,0 +5.0,3.0,1.6,0.2,0 +5.0,3.4,1.6,0.4,0 +5.2,3.5,1.5,0.2,0 +5.2,3.4,1.4,0.2,0 +4.7,3.2,1.6,0.2,0 +4.8,3.1,1.6,0.2,0 +5.4,3.4,1.5,0.4,0 +5.2,4.1,1.5,0.1,0 +5.5,4.2,1.4,0.2,0 +4.9,3.1,1.5,0.1,0 +5.0,3.2,1.2,0.2,0 +5.5,3.5,1.3,0.2,0 +4.9,3.1,1.5,0.1,0 +4.4,3.0,1.3,0.2,0 +5.1,3.4,1.5,0.2,0 +5.0,3.5,1.3,0.3,0 +4.5,2.3,1.3,0.3,0 +4.4,3.2,1.3,0.2,0 +5.0,3.5,1.6,0.6,0 +5.1,3.8,1.9,0.4,0 +4.8,3.0,1.4,0.3,0 +5.1,3.8,1.6,0.2,0 +4.6,3.2,1.4,0.2,0 +5.3,3.7,1.5,0.2,0 +5.0,3.3,1.4,0.2,0 +7.0,3.2,4.7,1.4,1 +6.4,3.2,4.5,1.5,1 +6.9,3.1,4.9,1.5,1 +5.5,2.3,4.0,1.3,1 +6.5,2.8,4.6,1.5,1 +5.7,2.8,4.5,1.3,1 +6.3,3.3,4.7,1.6,1 +4.9,2.4,3.3,1.0,1 +6.6,2.9,4.6,1.3,1 +5.2,2.7,3.9,1.4,1 +5.0,2.0,3.5,1.0,1 +5.9,3.0,4.2,1.5,1 +6.0,2.2,4.0,1.0,1 +6.1,2.9,4.7,1.4,1 +5.6,2.9,3.6,1.3,1 +6.7,3.1,4.4,1.4,1 +5.6,3.0,4.5,1.5,1 +5.8,2.7,4.1,1.0,1 +6.2,2.2,4.5,1.5,1 +5.6,2.5,3.9,1.1,1 +5.9,3.2,4.8,1.8,1 +6.1,2.8,4.0,1.3,1 +6.3,2.5,4.9,1.5,1 +6.1,2.8,4.7,1.2,1 +6.4,2.9,4.3,1.3,1 +6.6,3.0,4.4,1.4,1 +6.8,2.8,4.8,1.4,1 +6.7,3.0,5.0,1.7,1 +6.0,2.9,4.5,1.5,1 +5.7,2.6,3.5,1.0,1 +5.5,2.4,3.8,1.1,1 +5.5,2.4,3.7,1.0,1 +5.8,2.7,3.9,1.2,1 +6.0,2.7,5.1,1.6,1 +5.4,3.0,4.5,1.5,1 +6.0,3.4,4.5,1.6,1 +6.7,3.1,4.7,1.5,1 +6.3,2.3,4.4,1.3,1 +5.6,3.0,4.1,1.3,1 +5.5,2.5,4.0,1.3,1 +5.5,2.6,4.4,1.2,1 +6.1,3.0,4.6,1.4,1 +5.8,2.6,4.0,1.2,1 +5.0,2.3,3.3,1.0,1 +5.6,2.7,4.2,1.3,1 +5.7,3.0,4.2,1.2,1 +5.7,2.9,4.2,1.3,1 +6.2,2.9,4.3,1.3,1 +5.1,2.5,3.0,1.1,1 +5.7,2.8,4.1,1.3,1 +6.3,3.3,6.0,2.5,2 +5.8,2.7,5.1,1.9,2 +7.1,3.0,5.9,2.1,2 +6.3,2.9,5.6,1.8,2 +6.5,3.0,5.8,2.2,2 +7.6,3.0,6.6,2.1,2 +4.9,2.5,4.5,1.7,2 +7.3,2.9,6.3,1.8,2 +6.7,2.5,5.8,1.8,2 +7.2,3.6,6.1,2.5,2 +6.5,3.2,5.1,2.0,2 +6.4,2.7,5.3,1.9,2 +6.8,3.0,5.5,2.1,2 +5.7,2.5,5.0,2.0,2 +5.8,2.8,5.1,2.4,2 +6.4,3.2,5.3,2.3,2 +6.5,3.0,5.5,1.8,2 +7.7,3.8,6.7,2.2,2 +7.7,2.6,6.9,2.3,2 +6.0,2.2,5.0,1.5,2 +6.9,3.2,5.7,2.3,2 +5.6,2.8,4.9,2.0,2 +7.7,2.8,6.7,2.0,2 +6.3,2.7,4.9,1.8,2 +6.7,3.3,5.7,2.1,2 +7.2,3.2,6.0,1.8,2 +6.2,2.8,4.8,1.8,2 +6.1,3.0,4.9,1.8,2 +6.4,2.8,5.6,2.1,2 +7.2,3.0,5.8,1.6,2 +7.4,2.8,6.1,1.9,2 +7.9,3.8,6.4,2.0,2 +6.4,2.8,5.6,2.2,2 +6.3,2.8,5.1,1.5,2 +6.1,2.6,5.6,1.4,2 +7.7,3.0,6.1,2.3,2 +6.3,3.4,5.6,2.4,2 +6.4,3.1,5.5,1.8,2 +6.0,3.0,4.8,1.8,2 +6.9,3.1,5.4,2.1,2 +6.7,3.1,5.6,2.4,2 +6.9,3.1,5.1,2.3,2 +5.8,2.7,5.1,1.9,2 +6.8,3.2,5.9,2.3,2 +6.7,3.3,5.7,2.5,2 +6.7,3.0,5.2,2.3,2 +6.3,2.5,5.0,1.9,2 +6.5,3.0,5.2,2.0,2 +6.2,3.4,5.4,2.3,2 +5.9,3.0,5.1,1.8,2 diff --git a/pom.xml b/pom.xml index ff4b490c6b..c3915e4fce 100644 --- a/pom.xml +++ b/pom.xml @@ -248,6 +248,7 @@ mockserver undertow vertx-and-rxjava + deeplearning4j From 0f3df12fed3d4498d6515493e1e9a3fb1b9f3a40 Mon Sep 17 00:00:00 2001 From: Dassi orleando Date: Mon, 9 Oct 2017 18:19:26 +0100 Subject: [PATCH 005/197] BAEL-1157: update list of author names (#2720) * Different types of bean injection in Spring * Difference between two dates in java * Update README.md * Simple clean of difference between dates * Clean my test article * Improve dates diff: for dates and datetimes * Move difference between dates from core-java to libraries * BAEL-890 - Kotlin-Allopen with Spring example * BAEL-1107 - Introduction to Apache Cayenne Orm * BAEL-1107: update formating and version of libs * BAEL-1107: update properties of Author * BAEL-1157: Apache Cayenne - Advanced Querying * BAEL-1157: Fix imports * BAEL-1157: code indentation * BAEL-1157: Update list of author names --- .../apachecayenne/CayenneAdvancedOperationTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apache-cayenne/src/test/java/com/baeldung/apachecayenne/CayenneAdvancedOperationTests.java b/apache-cayenne/src/test/java/com/baeldung/apachecayenne/CayenneAdvancedOperationTests.java index ddfe9325d3..cd563b6270 100644 --- a/apache-cayenne/src/test/java/com/baeldung/apachecayenne/CayenneAdvancedOperationTests.java +++ b/apache-cayenne/src/test/java/com/baeldung/apachecayenne/CayenneAdvancedOperationTests.java @@ -151,20 +151,20 @@ public class CayenneAdvancedOperationTests { @Test public void givenTwoAuthor_whenInObjS_thenWeGetAuthors() { - String [] args = {"Paul Xavier", "pAuL Smith", "Vicky Sarra"}; + List names = Arrays.asList("Paul Xavier", "pAuL Smith", "Vicky Sarra"); List authors = ObjectSelect.query(Author.class) - .where(Author.NAME.in(Arrays.asList(args))) - .select(context); + .where(Author.NAME.in(names)) + .select(context); assertEquals(authors.size(), 3); } @Test public void givenTwoAuthor_whenNinObjS_thenWeGetAuthors() { - String [] args = {"Paul Xavier", "pAuL Smith"}; + List names = Arrays.asList("Paul Xavier", "pAuL Smith"); List authors = ObjectSelect.query(Author.class) - .where(Author.NAME.nin(Arrays.asList(args))) - .select(context); + .where(Author.NAME.nin(names)) + .select(context); Author author = authors.get(0); assertEquals(authors.size(), 1); From 47783354dd166601f023e301bdbfd0ee18461397 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Mon, 9 Oct 2017 23:51:39 +0200 Subject: [PATCH 006/197] Build opt (#2721) * Refactor JettyIntegrationTest * Refactor RxJava samples * Refactor RxJava samples --- .../baeldung/jetty/JettyIntegrationTest.java | 13 ++-- .../com/baeldung/rxjava/SchedulersTest.java | 65 +++++++++++-------- .../baeldung/rxjava/UtilityOperatorsTest.java | 25 ++++--- 3 files changed, 60 insertions(+), 43 deletions(-) diff --git a/libraries/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java b/libraries/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java index 151bcc78a2..28d4f57e77 100644 --- a/libraries/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java +++ b/libraries/src/test/java/com/baeldung/jetty/JettyIntegrationTest.java @@ -7,7 +7,9 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClientBuilder; import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import java.nio.charset.StandardCharsets; @@ -15,17 +17,16 @@ import java.nio.charset.StandardCharsets; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; public class JettyIntegrationTest { - private JettyServer jettyServer; + private static JettyServer jettyServer; - @Before - public void setup() throws Exception { + @BeforeClass + public static void setup() throws Exception { jettyServer = new JettyServer(); jettyServer.start(); } - @After - public void cleanup() throws Exception { - Thread.sleep(2000); + @AfterClass + public static void cleanup() throws Exception { jettyServer.stop(); } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java b/rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java index 35714566ca..05b86e52b9 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java @@ -1,7 +1,6 @@ package com.baeldung.rxjava; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import rx.Observable; @@ -16,9 +15,11 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; +import static com.jayway.awaitility.Awaitility.await; import static java.util.concurrent.Executors.newFixedThreadPool; import static org.hamcrest.Matchers.hasItems; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public class SchedulersTest { private String result = ""; @@ -31,7 +32,8 @@ public class SchedulersTest { Scheduler scheduler = Schedulers.immediate(); Scheduler.Worker worker = scheduler.createWorker(); worker.schedule(() -> result += "action"); - Assert.assertTrue(result.equals("action")); + + assertTrue(result.equals("action")); } @Test @@ -44,8 +46,9 @@ public class SchedulersTest { worker.unsubscribe(); }); worker.schedule(() -> result += "Second_Action"); - Thread.sleep(500); - Assert.assertTrue(result.equals("First_Action")); + + await() + .until(() -> assertTrue(result.equals("First_Action"))); } @Ignore //it's not safe, not every time is running correctly @@ -59,8 +62,9 @@ public class SchedulersTest { worker.schedule(() -> result += "_worker_"); result += "_End"; }); - Thread.sleep(2000); - Assert.assertTrue(result.equals("RxNewThreadScheduler-1_Start_End_worker_")); + + await() + .until(() -> assertTrue(result.equals("RxNewThreadScheduler-1_Start_End_worker_"))); } @Test @@ -75,9 +79,11 @@ public class SchedulersTest { .subscribe(s -> result1 += Thread.currentThread().getName() ); - Thread.sleep(500); - Assert.assertTrue(result1.equals("RxNewThreadScheduler-1")); - Assert.assertTrue(result2.equals("RxNewThreadScheduler-2")); + await() + .until(() -> { + assertTrue(result1.equals("RxNewThreadScheduler-1")); + assertTrue(result2.equals("RxNewThreadScheduler-2")); + }); } @Test @@ -90,8 +96,9 @@ public class SchedulersTest { worker.schedule(() -> result += "_worker_"); result += "_End"; }); - Thread.sleep(500); - Assert.assertTrue(result.equals("main_Start_worker__End")); + + await() + .until(() -> assertTrue(result.equals("main_Start_worker__End"))); } @Test @@ -102,8 +109,9 @@ public class SchedulersTest { .subscribe(s -> result += Thread.currentThread().getName() ); - Thread.sleep(500); - Assert.assertTrue(result.equals("main")); + + await() + .until(() -> assertTrue(result.equals("main"))); } @Test @@ -115,8 +123,9 @@ public class SchedulersTest { Observable.just(1, 3, 5, 7, 9) .subscribeOn(Schedulers.trampoline()) .subscribe(i -> result += "" + i); - Thread.sleep(500); - Assert.assertTrue(result.equals("246813579")); + + await() + .until(() -> assertTrue(result.equals("246813579"))); } @Test @@ -135,9 +144,9 @@ public class SchedulersTest { }); result += "_mainEnd"; }); - Thread.sleep(500); - Assert.assertTrue(result - .equals("mainStart_mainEnd_middleStart_middleEnd_worker_")); + + await() + .until(() -> assertTrue(result.equals("mainStart_mainEnd_middleStart_middleEnd_worker_"))); } private ThreadFactory threadFactory(String pattern) { @@ -159,7 +168,6 @@ public class SchedulersTest { subscriber.onNext("Beta"); subscriber.onCompleted(); }); - ; observable .subscribeOn(schedulerA) @@ -169,8 +177,9 @@ public class SchedulersTest { Throwable::printStackTrace, () -> result += "_Completed" ); - Thread.sleep(2000); - Assert.assertTrue(result.equals("Sched-A-0Alfa_Sched-A-0Beta__Completed")); + + await() + .until(() -> assertTrue(result.equals("Sched-A-0Alfa_Sched-A-0Beta__Completed"))); } @Test @@ -179,8 +188,9 @@ public class SchedulersTest { Observable.just("io") .subscribeOn(Schedulers.io()) .subscribe(i -> result += Thread.currentThread().getName()); - Thread.sleep(500); - Assert.assertTrue(result.equals("RxIoScheduler-2")); + + await() + .until(() -> assertTrue(result.equals("RxIoScheduler-2"))); } @Test @@ -189,8 +199,9 @@ public class SchedulersTest { Observable.just("computation") .subscribeOn(Schedulers.computation()) .subscribe(i -> result += Thread.currentThread().getName()); - Thread.sleep(500); - Assert.assertTrue(result.equals("RxComputationScheduler-1")); + + await() + .until(() -> assertTrue(result.equals("RxComputationScheduler-1"))); } @Test @@ -229,7 +240,7 @@ public class SchedulersTest { .delay(1, TimeUnit.SECONDS, schedulerA) .subscribe(i -> result += Thread.currentThread().getName() + i + " "); - Thread.sleep(2000); - Assert.assertTrue(result.equals("Sched1-A Sched1-B ")); + await() + .until(() -> assertTrue(result.equals("Sched1-A Sched1-B "))); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/UtilityOperatorsTest.java b/rxjava/src/test/java/com/baeldung/rxjava/UtilityOperatorsTest.java index a4fc62aaf1..0b38f0387b 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/UtilityOperatorsTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/UtilityOperatorsTest.java @@ -11,6 +11,7 @@ import rx.schedulers.Timestamped; import java.util.concurrent.TimeUnit; +import static com.jayway.awaitility.Awaitility.await; import static org.junit.Assert.assertTrue; public class UtilityOperatorsTest { @@ -40,9 +41,11 @@ public class UtilityOperatorsTest { + Thread.currentThread().getName()); }); - Thread.sleep(2000); - assertTrue(emittedTotal == 1500); - assertTrue(receivedTotal == 15000); + await().until(() -> { + assertTrue(emittedTotal == 1500); + assertTrue(receivedTotal == 15000); + } + ); } @Test @@ -63,9 +66,10 @@ public class UtilityOperatorsTest { + Thread.currentThread().getName()); }); - Thread.sleep(2000); - assertTrue(emittedTotal == 1500); - assertTrue(receivedTotal == 15000); + await().until(() -> { + assertTrue(emittedTotal == 1500); + assertTrue(receivedTotal == 15000); + }); } @Test @@ -86,9 +90,10 @@ public class UtilityOperatorsTest { + Thread.currentThread().getName()); }); - Thread.sleep(2000); - assertTrue(emittedTotal == 1500); - assertTrue(receivedTotal == 15000); + await().until(() -> { + assertTrue(emittedTotal == 1500); + assertTrue(receivedTotal == 15000); + }); } @Test @@ -210,7 +215,7 @@ public class UtilityOperatorsTest { value -> System.out.println("delay : " + value), t -> System.out.println("delay error"), () -> System.out.println("delay completed")); - Thread.sleep(8000); + //Thread.sleep(8000); } @Test From 741971de9b29e8374d2c34584e789210a941b1cb Mon Sep 17 00:00:00 2001 From: KevinGilmore Date: Mon, 9 Oct 2017 21:44:39 -0500 Subject: [PATCH 007/197] 1155 README update (#2723) * BAEL-973: updated README * BAEL-1069: Updated README * BAEL-817: add README file * BAEL-1084: README update * BAEL-960: Update README * BAEL-1155: updated README --- libraries/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/README.md b/libraries/README.md index 74766fb828..7214cd278c 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -41,6 +41,7 @@ - [Introduction to NoException](http://www.baeldung.com/no-exception) - [Introduction to FunctionalJava](http://www.baeldung.com/functional-java) - [Apache Commons IO](http://www.baeldung.com/apache-commons-io) +- [Introduction to Conflict-Free Replicated Data Types](http://www.baeldung.com/java-conflict-free-replicated-data-types) The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own. From a6324abbc6d1efc4e89290fd1de3a2ded7f4dee4 Mon Sep 17 00:00:00 2001 From: lor6 Date: Tue, 10 Oct 2017 08:35:35 +0300 Subject: [PATCH 008/197] Update README.md --- mockito/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/mockito/README.md b/mockito/README.md index 6de2fb0c7a..2407a5c3c5 100644 --- a/mockito/README.md +++ b/mockito/README.md @@ -10,3 +10,4 @@ - [Mockito – @Mock, @Spy, @Captor and @InjectMocks](http://www.baeldung.com/mockito-annotations) - [Mockito’s Mock Methods](http://www.baeldung.com/mockito-mock-methods) - [Introduction to PowerMock](http://www.baeldung.com/intro-to-powermock) +- [Mocking Exception Throwing using Mockito](http://www.baeldung.com/mockito-exceptions) From c1933c68197e3a232d0286a2666bfb03a5761aa7 Mon Sep 17 00:00:00 2001 From: lor6 Date: Tue, 10 Oct 2017 10:54:15 +0300 Subject: [PATCH 009/197] ormlite example (#2722) --- libraries-data/pom.xml | 6 + .../java/com/baeldung/ormlite/Address.java | 37 ++++ .../main/java/com/baeldung/ormlite/Book.java | 49 +++++ .../java/com/baeldung/ormlite/Library.java | 58 ++++++ .../java/com/baeldung/ormlite/LibraryDao.java | 10 + .../com/baeldung/ormlite/LibraryDaoImpl.java | 21 +++ .../com/baeldung/ormlite/ORMLiteTest.java | 171 ++++++++++++++++++ 7 files changed, 352 insertions(+) create mode 100644 libraries-data/src/main/java/com/baeldung/ormlite/Address.java create mode 100644 libraries-data/src/main/java/com/baeldung/ormlite/Book.java create mode 100644 libraries-data/src/main/java/com/baeldung/ormlite/Library.java create mode 100644 libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java create mode 100644 libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java create mode 100644 libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml index cae8a725a6..90b1f6bb1d 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -36,6 +36,11 @@ reladomo-test-util ${reladomo.version} + + com.j256.ormlite + ormlite-jdbc + ${ormlite.version} + @@ -144,5 +149,6 @@ 16.5.1 4.12 3.6.2 + 5.0 \ No newline at end of file diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Address.java b/libraries-data/src/main/java/com/baeldung/ormlite/Address.java new file mode 100644 index 0000000000..747b0b0b12 --- /dev/null +++ b/libraries-data/src/main/java/com/baeldung/ormlite/Address.java @@ -0,0 +1,37 @@ +package com.baeldung.ormlite; + +import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.table.DatabaseTable; + +@DatabaseTable(tableName = "addresses") +public class Address { + @DatabaseField(generatedId = true) + private long addressId; + + @DatabaseField(canBeNull = false) + private String addressLine; + + public Address() { + } + + public Address(String addressLine) { + this.addressLine = addressLine; + } + + public long getAddressId() { + return addressId; + } + + public void setAddressId(long addressId) { + this.addressId = addressId; + } + + public String getAddressLine() { + return addressLine; + } + + public void setAddressLine(String addressLine) { + this.addressLine = addressLine; + } + +} diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Book.java b/libraries-data/src/main/java/com/baeldung/ormlite/Book.java new file mode 100644 index 0000000000..ed7b813b8d --- /dev/null +++ b/libraries-data/src/main/java/com/baeldung/ormlite/Book.java @@ -0,0 +1,49 @@ +package com.baeldung.ormlite; + +import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.table.DatabaseTable; + +@DatabaseTable +public class Book { + + @DatabaseField(generatedId = true) + private long bookId; + + @DatabaseField + private String title; + + @DatabaseField(foreign = true, foreignAutoRefresh = true, foreignAutoCreate = true) + private Library library; + + public Book() { + } + + public Book(String title) { + this.title = title; + } + + public long getBookId() { + return bookId; + } + + public void setBookId(long bookId) { + this.bookId = bookId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Library getLibrary() { + return library; + } + + public void setLibrary(Library library) { + this.library = library; + } + +} diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/Library.java b/libraries-data/src/main/java/com/baeldung/ormlite/Library.java new file mode 100644 index 0000000000..994b4c6575 --- /dev/null +++ b/libraries-data/src/main/java/com/baeldung/ormlite/Library.java @@ -0,0 +1,58 @@ +package com.baeldung.ormlite; + +import com.j256.ormlite.dao.ForeignCollection; +import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.field.ForeignCollectionField; +import com.j256.ormlite.table.DatabaseTable; + +@DatabaseTable(tableName = "libraries", daoClass = LibraryDaoImpl.class) +public class Library { + + @DatabaseField(generatedId = true) + private long libraryId; + + @DatabaseField(canBeNull = false) + private String name; + + @DatabaseField(foreign = true, foreignAutoCreate = true, foreignAutoRefresh = true) + private Address address; + + @ForeignCollectionField(eager = false) + private ForeignCollection books; + + public Library() { + } + + public long getLibraryId() { + return libraryId; + } + + public void setLibraryId(long libraryId) { + this.libraryId = libraryId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Address getAddress() { + return address; + } + + public void setAddress(Address address) { + this.address = address; + } + + public ForeignCollection getBooks() { + return books; + } + + public void setBooks(ForeignCollection books) { + this.books = books; + } + +} diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java b/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java new file mode 100644 index 0000000000..fd8f5f40d6 --- /dev/null +++ b/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDao.java @@ -0,0 +1,10 @@ +package com.baeldung.ormlite; + +import java.sql.SQLException; +import java.util.List; + +import com.j256.ormlite.dao.Dao; + +public interface LibraryDao extends Dao { + public List findByName(String name) throws SQLException; +} diff --git a/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java b/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java new file mode 100644 index 0000000000..af313101e2 --- /dev/null +++ b/libraries-data/src/main/java/com/baeldung/ormlite/LibraryDaoImpl.java @@ -0,0 +1,21 @@ +package com.baeldung.ormlite; + +import java.sql.SQLException; +import java.util.List; + +import com.j256.ormlite.dao.BaseDaoImpl; +import com.j256.ormlite.support.ConnectionSource; + +public class LibraryDaoImpl extends BaseDaoImpl implements LibraryDao { + + public LibraryDaoImpl(ConnectionSource connectionSource) throws SQLException { + super(connectionSource, Library.class); + } + + @Override + public List findByName(String name) throws SQLException { + return super.queryForEq("name", name); + + } + +} diff --git a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java b/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java new file mode 100644 index 0000000000..eaa21b6eaf --- /dev/null +++ b/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java @@ -0,0 +1,171 @@ +package com.baeldung.ormlite; + +import static org.junit.Assert.*; + +import java.io.IOException; +import java.sql.SQLException; +import java.util.List; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import com.j256.ormlite.dao.CloseableWrappedIterable; +import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.dao.DaoManager; +import com.j256.ormlite.jdbc.JdbcPooledConnectionSource; +import com.j256.ormlite.table.TableUtils; + +public class ORMLiteTest { + private static JdbcPooledConnectionSource connectionSource; + + private static Dao libraryDao; + private static Dao bookDao; + + @BeforeClass + public static void setup() throws SQLException { + connectionSource = new JdbcPooledConnectionSource("jdbc:h2:mem:myDb"); + TableUtils.createTableIfNotExists(connectionSource, Library.class); + TableUtils.createTableIfNotExists(connectionSource, Address.class); + TableUtils.createTableIfNotExists(connectionSource, Book.class); + + libraryDao = DaoManager.createDao(connectionSource, Library.class); + + bookDao = DaoManager.createDao(connectionSource, Book.class); + } + + @Test + public void givenDAO_whenCRUD_thenOk() throws SQLException { + Library library = new Library(); + library.setName("My Library"); + libraryDao.create(library); + + Library result = libraryDao.queryForId(library.getLibraryId()); + assertEquals("My Library", result.getName()); + + library.setName("My Other Library"); + libraryDao.update(library); + + libraryDao.delete(library); + + } + + @Test + public void whenLoopDao_thenOk() throws SQLException { + Library library1 = new Library(); + library1.setName("My Library"); + libraryDao.create(library1); + + Library library2 = new Library(); + library2.setName("My Other Library"); + libraryDao.create(library2); + + libraryDao.forEach(lib -> { + System.out.println(lib.getName()); + }); + + } + + @Test + public void givenIterator_whenLoop_thenOk() throws SQLException, IOException { + Library library1 = new Library(); + library1.setName("My Library"); + libraryDao.create(library1); + + Library library2 = new Library(); + library2.setName("My Other Library"); + libraryDao.create(library2); + + CloseableWrappedIterable wrappedIterable = libraryDao.getWrappedIterable(); + try { + wrappedIterable.forEach(lib -> { + System.out.println(lib.getName()); + }); + } finally { + wrappedIterable.close(); + } + + } + + @Test + public void givenCustomDao_whenSave_thenOk() throws SQLException, IOException { + Library library = new Library(); + library.setName("My Library"); + + LibraryDao customLibraryDao = DaoManager.createDao(connectionSource, Library.class); + customLibraryDao.create(library); + assertEquals(1, customLibraryDao.findByName("My Library") + .size()); + } + + @Test + public void whenSaveForeignField_thenOk() throws SQLException, IOException { + Library library = new Library(); + library.setName("My Library"); + library.setAddress(new Address("Main Street nr 20")); + libraryDao.create(library); + + Dao addressDao = DaoManager.createDao(connectionSource, Address.class); + assertEquals(1, addressDao.queryForEq("addressLine", "Main Street nr 20") + .size()); + } + + @Test + public void whenSaveForeignCollection_thenOk() throws SQLException, IOException { + Library library = new Library(); + library.setName("My Library"); + libraryDao.create(library); + libraryDao.refresh(library); + library.getBooks() + .add(new Book("1984")); + + Book book = new Book("It"); + book.setLibrary(library); + bookDao.create(book); + + assertEquals(2, bookDao.queryForEq("library_id", library) + .size()); + } + + @Test + public void whenGetLibrariesWithMoreThanOneBook_thenOk() throws SQLException, IOException { + Library library = new Library(); + library.setName("My Library"); + libraryDao.create(library); + Library library2 = new Library(); + library2.setName("My Other Library"); + libraryDao.create(library2); + + libraryDao.refresh(library); + libraryDao.refresh(library2); + + library.getBooks() + .add(new Book("Book1")); + library2.getBooks() + .add(new Book("Book2")); + library2.getBooks() + .add(new Book("Book3")); + + List libraries = libraryDao.queryBuilder() + .where() + .in("libraryId", bookDao.queryBuilder() + .selectColumns("library_id") + .groupBy("library_id") + .having("count(*) > 1")) + .query(); + assertEquals(1, libraries.size()); + + } + + @After + public void clear() throws SQLException { + TableUtils.clearTable(connectionSource, Library.class); + TableUtils.clearTable(connectionSource, Book.class); + TableUtils.clearTable(connectionSource, Address.class); + } + + @AfterClass + public static void tearDown() throws SQLException, IOException { + connectionSource.close(); + } +} From 9c0b6b4a47fb6af1e69ec387420e0f248c897aa8 Mon Sep 17 00:00:00 2001 From: YasinBhojawala <31448190+YasinBhojawala@users.noreply.github.com> Date: Tue, 10 Oct 2017 21:51:35 +0530 Subject: [PATCH 010/197] BAEL-1139 move to new saas module (#2719) * Removed unintentionally commented code * BAEL-1139 move jira API to a new saas module * no tabs only spaces * changes --- libraries/pom.xml | 20 ----- pom.xml | 1 + saas/.gitignore | 26 ++++++ saas/pom.xml | 84 +++++++++++++++++++ .../com/baeldung/saas}/jira/MyJiraClient.java | 2 +- 5 files changed, 112 insertions(+), 21 deletions(-) create mode 100644 saas/.gitignore create mode 100644 saas/pom.xml rename {libraries/src/main/java/com/baeldung => saas/src/main/java/com/baeldung/saas}/jira/MyJiraClient.java (99%) diff --git a/libraries/pom.xml b/libraries/pom.xml index c7c5da95a6..e539c0916f 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -575,22 +575,6 @@ hazelcast ${hazelcast.version} - - com.atlassian.jira - jira-rest-java-client-core - 4.0.0 - - - com.atlassian.fugue - fugue - 2.6.1 - - - org.jgrapht jgrapht-core @@ -626,10 +610,6 @@ bintray http://dl.bintray.com/cuba-platform/main - - atlassian-public - https://packages.atlassian.com/maven/repository/public - 0.1.0 diff --git a/pom.xml b/pom.xml index c3915e4fce..3bdeac3672 100644 --- a/pom.xml +++ b/pom.xml @@ -248,6 +248,7 @@ mockserver undertow vertx-and-rxjava + saas deeplearning4j diff --git a/saas/.gitignore b/saas/.gitignore new file mode 100644 index 0000000000..3de4cc647e --- /dev/null +++ b/saas/.gitignore @@ -0,0 +1,26 @@ +*.class + +0.* + +#folders# +/target +/neoDb* +/data +/src/main/webapp/WEB-INF/classes +*/META-INF/* +.resourceCache + +# Packaged files # +*.jar +*.war +*.ear + +# Files generated by integration tests +*.txt +backup-pom.xml +/bin/ +/temp + +#IntelliJ specific +.idea/ +*.iml \ No newline at end of file diff --git a/saas/pom.xml b/saas/pom.xml new file mode 100644 index 0000000000..7c8745910f --- /dev/null +++ b/saas/pom.xml @@ -0,0 +1,84 @@ + + 4.0.0 + com.baeldung + saas + 0.1.0-SNAPSHOT + jar + saas + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + + com.atlassian.jira + jira-rest-java-client-core + 4.0.0 + + + com.atlassian.fugue + fugue + 2.6.1 + + + com.google.guava + guava + 19.0 + + + + + + saas + + + src/main/resources + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + java + com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed + + -Xmx300m + -XX:+UseParallelGC + -classpath + + com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed + + + + + + + + + atlassian-public + https://packages.atlassian.com/maven/repository/public + + + + + 3.6.0 + + \ No newline at end of file diff --git a/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java b/saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java similarity index 99% rename from libraries/src/main/java/com/baeldung/jira/MyJiraClient.java rename to saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java index ea1d73f52a..ff1de5a6d0 100644 --- a/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java +++ b/saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java @@ -1,4 +1,4 @@ -package com.baeldung.jira; +package com.baeldung.saas.jira; import com.atlassian.jira.rest.client.api.IssueRestClient; import com.atlassian.jira.rest.client.api.JiraRestClient; From f8db7b02c5d8e4f7e9f786f69fd2705f1415d10c Mon Sep 17 00:00:00 2001 From: Graham Cox Date: Wed, 11 Oct 2017 02:44:50 +0100 Subject: [PATCH 011/197] Kotlin junit5 (#2672) * Fixed the core-kotlin module to build, and set it up to run JUnit 5 tests using Failsafe * Example JUnit5 tests in Kotlin --- core-kotlin/pom.xml | 56 ++++++++++++- .../com/baeldung/kotlin/junit5/Calculator.kt | 17 ++++ .../baeldung/kotlin/junit5/CalculatorTest5.kt | 82 +++++++++++++++++++ .../kotlin/junit5/DivideByZeroException.kt | 3 + .../com/baeldung/kotlin/junit5/SimpleTest5.kt | 21 +++++ 5 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/Calculator.kt create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/DivideByZeroException.kt create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt diff --git a/core-kotlin/pom.xml b/core-kotlin/pom.xml index 856a37ded0..e795d1e042 100644 --- a/core-kotlin/pom.xml +++ b/core-kotlin/pom.xml @@ -5,6 +5,7 @@ core-kotlin 1.0-SNAPSHOT + jar com.baeldung @@ -20,6 +21,24 @@ + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + org.junit.platform + junit-platform-runner + ${junit.platform.version} + test + + + junit + junit + ${junit4.version} + test + org.jetbrains.kotlin kotlin-stdlib @@ -116,16 +135,51 @@ + + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + maven-failsafe-plugin + 2.19.1 + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + + + junit5 + + integration-test + verify + + + + **/*Test5.java + + + + + + UTF-8 1.1.2 1.1.2 1.1.2 1.1.2 0.15 1.5.0 + + 5.0.0 + 1.0.0 + 4.12.0 + 4.12 - \ No newline at end of file + diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/Calculator.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/Calculator.kt new file mode 100644 index 0000000000..1b61c05887 --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/Calculator.kt @@ -0,0 +1,17 @@ +package com.baeldung.kotlin.junit5 + +class Calculator { + fun add(a: Int, b: Int) = a + b + + fun divide(a: Int, b: Int) = if (b == 0) { + throw DivideByZeroException(a) + } else { + a / b + } + + fun square(a: Int) = a * a + + fun squareRoot(a: Int) = Math.sqrt(a.toDouble()) + + fun log(base: Int, value: Int) = Math.log(value.toDouble()) / Math.log(base.toDouble()) +} diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt new file mode 100644 index 0000000000..dd35805044 --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt @@ -0,0 +1,82 @@ +package com.baeldung.kotlin.junit5 + +import org.junit.jupiter.api.* +import org.junit.jupiter.api.function.Executable + +class CalculatorTest5 { + private val calculator = Calculator() + + @Test + fun testAddition() { + Assertions.assertEquals(4, calculator.add(1, 3)) + } + + @Test + fun testDivideByZero() { + val exception = Assertions.assertThrows(DivideByZeroException::class.java) { + calculator.divide(5, 0) + } + + Assertions.assertEquals(5, exception.numerator) + } + + @Test + fun testSquares() { + Assertions.assertAll( + Executable { Assertions.assertEquals(1, calculator.square(1)) }, + Executable { Assertions.assertEquals(4, calculator.square(2)) }, + Executable { Assertions.assertEquals(9, calculator.square(3)) } + ) + } + + @TestFactory + fun testSquaresFactory() = listOf( + DynamicTest.dynamicTest("1 squared") { Assertions.assertEquals(1,calculator.square(1))}, + DynamicTest.dynamicTest("2 squared") { Assertions.assertEquals(4,calculator.square(2))}, + DynamicTest.dynamicTest("3 squared") { Assertions.assertEquals(9,calculator.square(3))} + ) + + @TestFactory + fun testSquaresFactory2() = listOf( + 1 to 1, + 2 to 4, + 3 to 9, + 4 to 16, + 5 to 25) + .map { (input, expected) -> + DynamicTest.dynamicTest("$input squared") { + Assertions.assertEquals(expected, calculator.square(input)) + } + } + + private val squaresTestData = listOf( + 1 to 1, + 2 to 4, + 3 to 9, + 4 to 16, + 5 to 25) + + @TestFactory + fun testSquaresFactory3() = squaresTestData + .map { (input, expected) -> + DynamicTest.dynamicTest("$input squared") { + Assertions.assertEquals(expected, calculator.square(input)) + } + } + @TestFactory + fun testSquareRootsFactory3() = squaresTestData + .map { (expected, input) -> + DynamicTest.dynamicTest("Square root of $input") { + Assertions.assertEquals(expected.toDouble(), calculator.squareRoot(input)) + } + } + + @Tags( + Tag("slow"), + Tag("logarithms") + ) + @Test + fun testLogarithms() { + Assertions.assertEquals(3.0, calculator.log(2, 8)) + } +} diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/DivideByZeroException.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/DivideByZeroException.kt new file mode 100644 index 0000000000..60bc4e2944 --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/DivideByZeroException.kt @@ -0,0 +1,3 @@ +package com.baeldung.kotlin.junit5 + +class DivideByZeroException(val numerator: Int) : Exception() diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt new file mode 100644 index 0000000000..c04ab568f7 --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt @@ -0,0 +1,21 @@ +package com.baeldung.kotlin.junit5 + +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Disabled +import org.junit.jupiter.api.Test + +class SimpleTest5 { + @Test + fun testEmpty() { + val list = listOf() + Assertions.assertTrue(list::isEmpty) + } + + @Test + @Disabled + fun testMessage() { + Assertions.assertEquals(3, 4) { + "Three does not equal four" + } + } +} From 31f4581de3b4fcf94e6af8812b62d8a3cf08603e Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 11 Oct 2017 04:53:59 +0300 Subject: [PATCH 012/197] BAEL-1041 Introduction to Caffeine (#2585) * BAEL-748 quick guide to @Value * BAEL-748 changes from review * BAEL-748 inject comma-separated values into array * BAEL-768 Introduction to Netty * BAEL-768 remove commented code * BAEL-861 Introduction to Awaitility * BAEL-861 rename Test to UnitTest * BAEL-1041 Introduction in Caffeine * BAEL-1041 fix test * BAEL-1041 fix formatting * BAEL-1041 fix expected/actual order * BAEL-1041 remove trailing underscore * Formatting after merge * BAEL-1041 add spaces between data and assertions * BAEL-1041 soft values example * BAEL-1041 remove duplicate dependency * BAEL-1041 formatting fix * BAEL-1041 formatting fix --- libraries/pom.xml | 16 +- .../com/baeldung/caffeine/DataObject.java | 28 +++ .../baeldung/caffeine/CaffeineUnitTest.java | 174 ++++++++++++++++++ 3 files changed, 213 insertions(+), 5 deletions(-) create mode 100644 libraries/src/main/java/com/baeldung/caffeine/DataObject.java create mode 100644 libraries/src/test/java/com/baeldung/caffeine/CaffeineUnitTest.java diff --git a/libraries/pom.xml b/libraries/pom.xml index e539c0916f..b519b9cd53 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -590,11 +590,16 @@ docx4j 3.3.5 - - javax.xml.bind - jaxb-api - 2.1 - + + javax.xml.bind + jaxb-api + 2.1 + + + com.github.ben-manes.caffeine + caffeine + ${caffeine.version} + @@ -666,5 +671,6 @@ 1.0.3 1.0.0 3.8.4 + 2.5.5 diff --git a/libraries/src/main/java/com/baeldung/caffeine/DataObject.java b/libraries/src/main/java/com/baeldung/caffeine/DataObject.java new file mode 100644 index 0000000000..2a8b60b045 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/caffeine/DataObject.java @@ -0,0 +1,28 @@ +package com.baeldung.caffeine; + +final class DataObject { + private final String data; + + private static int objectCounter = 0; + + private DataObject(String data) { + this.data = data; + } + + public String getData() { + return data; + } + + @Override + public String toString() { + return "DataObject{" + + "data='" + data + '\'' + + '}'; + } + + public static DataObject get(String data) { + objectCounter++; + System.out.println(String.format("Initializing DataObject#%d with data '%s'", objectCounter, data)); + return new DataObject(data); + } +} diff --git a/libraries/src/test/java/com/baeldung/caffeine/CaffeineUnitTest.java b/libraries/src/test/java/com/baeldung/caffeine/CaffeineUnitTest.java new file mode 100644 index 0000000000..56dbda5974 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/caffeine/CaffeineUnitTest.java @@ -0,0 +1,174 @@ +package com.baeldung.caffeine; + +import static org.junit.Assert.*; + +import java.util.Arrays; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import javax.annotation.Nonnull; + +import org.junit.Test; + +import com.github.benmanes.caffeine.cache.*; + +public class CaffeineUnitTest { + + @Test + public void givenCache_whenPopulate_thenValueStored() { + Cache cache = Caffeine.newBuilder() + .expireAfterWrite(1, TimeUnit.MINUTES) + .maximumSize(100) + .build(); + + String key = "A"; + DataObject dataObject = cache.getIfPresent(key); + + assertNull(dataObject); + + dataObject = cache.get(key, k -> DataObject.get("Data for A")); + + assertNotNull(dataObject); + assertEquals("Data for A", dataObject.getData()); + + cache.put(key, dataObject); + dataObject = cache.getIfPresent(key); + + assertNotNull(dataObject); + + cache.invalidate(key); + dataObject = cache.getIfPresent(key); + + assertNull(dataObject); + } + + @Test + public void givenLoadingCache_whenGet_thenValuePopulated() { + LoadingCache cache = Caffeine.newBuilder() + .maximumSize(100) + .expireAfterWrite(1, TimeUnit.MINUTES) + .build(k -> DataObject.get("Data for " + k)); + String key = "A"; + + DataObject dataObject = cache.get(key); + + assertNotNull(dataObject); + assertEquals("Data for " + key, dataObject.getData()); + + Map dataObjectMap = cache.getAll(Arrays.asList("A", "B", "C")); + + assertEquals(3, dataObjectMap.size()); + } + + @Test + public void givenAsyncLoadingCache_whenGet_thenValuePopulated() { + + AsyncLoadingCache cache = Caffeine.newBuilder() + .maximumSize(100) + .expireAfterWrite(1, TimeUnit.MINUTES) + .buildAsync(k -> DataObject.get("Data for " + k)); + String key = "A"; + + cache.get(key).thenAccept(dataObject -> { + assertNotNull(dataObject); + assertEquals("Data for " + key, dataObject.getData()); + }); + + cache.getAll(Arrays.asList("A", "B", "C")) + .thenAccept(dataObjectMap -> assertEquals(3, dataObjectMap.size())); + } + + @Test + public void givenLoadingCacheWithSmallSize_whenPut_thenSizeIsConstant() { + LoadingCache cache = Caffeine.newBuilder() + .maximumSize(1) + .refreshAfterWrite(10, TimeUnit.MINUTES) + .build(k -> DataObject.get("Data for " + k)); + + assertEquals(0, cache.estimatedSize()); + + cache.get("A"); + + assertEquals(1, cache.estimatedSize()); + + cache.get("B"); + cache.cleanUp(); + + assertEquals(1, cache.estimatedSize()); + } + + @Test + public void givenLoadingCacheWithWeigher_whenPut_thenSizeIsConstant() { + LoadingCache cache = Caffeine.newBuilder() + .maximumWeight(10) + .weigher((k,v) -> 5) + .build(k -> DataObject.get("Data for " + k)); + + assertEquals(0, cache.estimatedSize()); + + cache.get("A"); + + assertEquals(1, cache.estimatedSize()); + + cache.get("B"); + + assertEquals(2, cache.estimatedSize()); + + cache.get("C"); + cache.cleanUp(); + + assertEquals(2, cache.estimatedSize()); + } + + @Test + public void givenTimeEvictionCache_whenTimeLeft_thenValueEvicted() { + LoadingCache cache = Caffeine.newBuilder() + .expireAfterAccess(5, TimeUnit.MINUTES) + .build(k -> DataObject.get("Data for " + k)); + + cache = Caffeine.newBuilder() + .expireAfterWrite(10, TimeUnit.SECONDS) + .weakKeys() + .weakValues() + .build(k -> DataObject.get("Data for " + k)); + + cache = Caffeine.newBuilder() + .expireAfterWrite(10, TimeUnit.SECONDS) + .softValues() + .build(k -> DataObject.get("Data for " + k)); + + cache = Caffeine.newBuilder().expireAfter(new Expiry() { + @Override + public long expireAfterCreate(@Nonnull String key, @Nonnull DataObject value, long currentTime) { + return value.getData().length() * 1000; + } + + @Override + public long expireAfterUpdate(@Nonnull String key, @Nonnull DataObject value, long currentTime, long currentDuration) { + return currentDuration; + } + + @Override + public long expireAfterRead(@Nonnull String key, @Nonnull DataObject value, long currentTime, long currentDuration) { + return currentDuration; + } + }).build(k -> DataObject.get("Data for " + k)); + + cache = Caffeine.newBuilder() + .refreshAfterWrite(1, TimeUnit.MINUTES) + .build(k -> DataObject.get("Data for " + k)); + } + + @Test + public void givenCache_whenStatsEnabled_thenStatsRecorded() { + LoadingCache cache = Caffeine.newBuilder() + .maximumSize(100) + .recordStats() + .build(k -> DataObject.get("Data for " + k)); + cache.get("A"); + cache.get("A"); + + assertEquals(1, cache.stats().hitCount()); + assertEquals(1, cache.stats().missCount()); + } +} \ No newline at end of file From 5f1c2abc6e4ab166a6517b8f9b4fa1daceb3f03f Mon Sep 17 00:00:00 2001 From: ahmetcetin39 <30636222+ahmetcetin39@users.noreply.github.com> Date: Wed, 11 Oct 2017 10:30:27 +0300 Subject: [PATCH 013/197] BAEL-1088 Jsp page changed to Thymeleaf page (#2706) * add dependency to pom.xml about thymeleaf * Update and rename viewPage.jsp to viewPage.html --- spring-all/pom.xml | 8 ++++++-- spring-all/src/main/webapp/WEB-INF/view/viewPage.html | 9 +++++++++ spring-all/src/main/webapp/WEB-INF/view/viewPage.jsp | 11 ----------- 3 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 spring-all/src/main/webapp/WEB-INF/view/viewPage.html delete mode 100644 spring-all/src/main/webapp/WEB-INF/view/viewPage.jsp diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 1ecb824c40..6615e1d6cd 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -195,7 +195,11 @@ spring-core ${org.springframework.version} - + + + org.springframework.boot + spring-boot-starter-thymeleaf + @@ -280,4 +284,4 @@ - \ No newline at end of file + diff --git a/spring-all/src/main/webapp/WEB-INF/view/viewPage.html b/spring-all/src/main/webapp/WEB-INF/view/viewPage.html new file mode 100644 index 0000000000..71f766407e --- /dev/null +++ b/spring-all/src/main/webapp/WEB-INF/view/viewPage.html @@ -0,0 +1,9 @@ + + + + Title + + +
Web Application. Passed parameter : th:text="${message}"
+ + diff --git a/spring-all/src/main/webapp/WEB-INF/view/viewPage.jsp b/spring-all/src/main/webapp/WEB-INF/view/viewPage.jsp deleted file mode 100644 index ca638b33f5..0000000000 --- a/spring-all/src/main/webapp/WEB-INF/view/viewPage.jsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - Title - - -
- Web Application. Passed parameter : ${message} -
- - From 6655ca0ba1025966007bebcb16d8d185edebc97b Mon Sep 17 00:00:00 2001 From: araknoid Date: Thu, 12 Oct 2017 10:03:29 +0200 Subject: [PATCH 014/197] RxJava Mathematical and Aggregate operators (#2697) * RxJava Mathematical and Aggregate Operators * Fixed test case names * Resolved merge conflict * Fixed test case names --- rxjava/pom.xml | 6 + .../operators/RxAggregateOperatorsTest.java | 210 ++++++++++++++++++ .../RxMathematicalOperatorsTest.java | 139 ++++++++++++ 3 files changed, 355 insertions(+) create mode 100644 rxjava/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsTest.java create mode 100644 rxjava/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsTest.java diff --git a/rxjava/pom.xml b/rxjava/pom.xml index 783833243b..0f950914ff 100644 --- a/rxjava/pom.xml +++ b/rxjava/pom.xml @@ -25,6 +25,12 @@ 2.1.3 + + io.reactivex + rxjava-math + 1.0.0 + + com.jayway.awaitility awaitility diff --git a/rxjava/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsTest.java b/rxjava/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsTest.java new file mode 100644 index 0000000000..1af41f795f --- /dev/null +++ b/rxjava/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsTest.java @@ -0,0 +1,210 @@ +package com.baeldung.rxjava.operators; + +import org.junit.Test; +import rx.Observable; +import rx.observers.TestSubscriber; + +import java.util.*; + +public class RxAggregateOperatorsTest { + + @Test + public void givenTwoObservable_whenConcatenatingThem_thenSuccessfull() { + // given + List listOne = Arrays.asList(1, 2, 3, 4); + Observable observableOne = Observable.from(listOne); + + List listTwo = Arrays.asList(5, 6, 7, 8); + Observable observableTwo = Observable.from(listTwo); + + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable concatObservable = observableOne.concatWith(observableTwo); + + concatObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(8); + subscriber.assertValues(1, 2, 3, 4, 5, 6, 7, 8); + + } + + @Test + public void givenObservable_whenCounting_thenObtainingNumberOfElements() { + // given + List lettersList = Arrays.asList("A", "B", "C", "D", "E", "F", "G"); + + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable sourceObservable = Observable.from(lettersList) + .count(); + sourceObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(7); + } + + @Test + public void givenObservable_whenReducing_thenObtainingInvertedConcatenatedString() { + // given + List list = Arrays.asList("A", "B", "C", "D", "E", "F", "G"); + + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable reduceObservable = Observable.from(list) + .reduce((letter1, letter2) -> letter2 + letter1); + reduceObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue("GFEDCBA"); + } + + @Test + public void givenObservable_whenCollecting_thenObtainingASet() { + // given + List list = Arrays.asList("A", "B", "C", "B", "B", "A", "D"); + + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable reduceListObservable = Observable.from(list) + .collect(() -> new HashSet(), (set, item) -> set.add(item)); + reduceListObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValues(new HashSet(list)); + } + + @Test + public void givenObservable_whenUsingToList_thenObtainedAList() { + // given + Observable sourceObservable = Observable.range(1, 5); + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable> listObservable = sourceObservable.toList(); + listObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(Arrays.asList(1, 2, 3, 4, 5)); + + } + + @Test + public void givenObservable_whenUsingToSortedList_thenObtainedASortedList() { + // given + Observable sourceObservable = Observable.range(10, 5); + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable> listObservable = sourceObservable.toSortedList(); + listObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(Arrays.asList(10, 11, 12, 13, 14)); + } + + @Test + public void givenObservable_whenUsingToSortedListWithComparator_thenObtainedAnInverseSortedList() { + // given + Observable sourceObservable = Observable.range(10, 5); + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable> listObservable = sourceObservable.toSortedList((int1, int2) -> int2 - int1); + listObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(Arrays.asList(14, 13, 12, 11, 10)); + + } + + @Test + public void givenObservable_whenUsingToMap_thenObtainedAMap() { + // given + Observable bookObservable = Observable.just(new Book("The North Water", 2016), new Book("Origin", 2017), new Book("Sleeping Beauties", 2017)); + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable> mapObservable = bookObservable.toMap(Book::getTitle, Book::getYear, HashMap::new); + + mapObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(new HashMap() { + { + put("The North Water", 2016); + put("Origin", 2017); + put("Sleeping Beauties", 2017); + } + }); + } + + @Test + public void givenObservable_whenUsingToMultiMap_thenObtainedAMultiMap() { + // given + Observable bookObservable = Observable.just(new Book("The North Water", 2016), new Book("Origin", 2017), new Book("Sleeping Beauties", 2017)); + TestSubscriber subscriber = TestSubscriber.create(); + + // when + Observable multiMapObservable = bookObservable.toMultimap(Book::getYear, Book::getTitle, () -> new HashMap(), (key) -> new ArrayList()); + + multiMapObservable.subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(new HashMap() { + { + put(2016, Arrays.asList("The North Water")); + put(2017, Arrays.asList("Origin", "Sleeping Beauties")); + } + }); + + } + + class Book { + private String title; + private Integer year; + + public Book(String title, Integer year) { + this.title = title; + this.year = year; + } + + public String getTitle() { + return title; + } + + public Integer getYear() { + return year; + } + } +} diff --git a/rxjava/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsTest.java b/rxjava/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsTest.java new file mode 100644 index 0000000000..cd212a2e18 --- /dev/null +++ b/rxjava/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsTest.java @@ -0,0 +1,139 @@ +package com.baeldung.rxjava.operators; + +import org.junit.Test; +import rx.Observable; +import rx.observables.MathObservable; +import rx.observers.TestSubscriber; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; + +public class RxMathematicalOperatorsTest { + + @Test + public void givenRangeNumericObservable_whenCalculatingAverage_ThenSuccessfull() { + // given + Observable sourceObservable = Observable.range(1, 20); + + TestSubscriber subscriber = TestSubscriber.create(); + + // when + MathObservable.averageInteger(sourceObservable) + .subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(10); + } + + @Test + public void givenRangeNumericObservable_whenCalculatingSum_ThenSuccessfull() { + // given + Observable sourceObservable = Observable.range(1, 20); + TestSubscriber subscriber = TestSubscriber.create(); + + // when + MathObservable.sumInteger(sourceObservable) + .subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(210); + + } + + @Test + public void givenRangeNumericObservable_whenCalculatingMax_ThenSuccessfullObtainingMaxValue() { + // given + Observable sourceObservable = Observable.range(1, 20); + TestSubscriber subscriber = TestSubscriber.create(); + + // when + MathObservable.max(sourceObservable) + .subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(20); + } + + @Test + public void givenRangeNumericObservable_whenCalculatingMin_ThenSuccessfullObtainingMinValue() { + // given + Observable sourceObservable = Observable.range(1, 20); + TestSubscriber subscriber = TestSubscriber.create(); + + // when + MathObservable.min(sourceObservable) + .subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(1); + } + + @Test + public void givenItemObservable_whenCalculatingMaxWithComparator_ThenSuccessfullObtainingMaxItem() { + // given + Item five = new Item(5); + List list = Arrays.asList(new Item(1), new Item(2), new Item(3), new Item(4), five); + Observable itemObservable = Observable.from(list); + + TestSubscriber subscriber = TestSubscriber.create(); + + // when + MathObservable.from(itemObservable) + .max(Comparator.comparing(Item::getId)) + .subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(five); + + } + + @Test + public void givenItemObservable_whenCalculatingMinWithComparator_ThenSuccessfullObtainingMinItem() { + // given + Item one = new Item(1); + List list = Arrays.asList(one, new Item(2), new Item(3), new Item(4), new Item(5)); + TestSubscriber subscriber = TestSubscriber.create(); + Observable itemObservable = Observable.from(list); + + // when + MathObservable.from(itemObservable) + .min(Comparator.comparing(Item::getId)) + .subscribe(subscriber); + + // then + subscriber.assertCompleted(); + subscriber.assertNoErrors(); + subscriber.assertValueCount(1); + subscriber.assertValue(one); + + } + + class Item { + private Integer id; + + public Item(Integer id) { + this.id = id; + } + + public Integer getId() { + return id; + } + + } +} From 815c66c9dd5a9e7b30cb0c6939cd85afcecbee1c Mon Sep 17 00:00:00 2001 From: k0l0ssus Date: Thu, 12 Oct 2017 08:59:31 -0400 Subject: [PATCH 015/197] ASM Sample Project (#2664) * ASM Sample Project * Update Premain.java * Update pom.xml --- asm/pom.xml | 51 ++++++ .../examples/asm/CustomClassWriter.java | 160 ++++++++++++++++++ .../examples/asm/instrumentation/Premain.java | 32 ++++ pom.xml | 1 + 4 files changed, 244 insertions(+) create mode 100644 asm/pom.xml create mode 100644 asm/src/main/java/com/baeldung/examples/asm/CustomClassWriter.java create mode 100644 asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java diff --git a/asm/pom.xml b/asm/pom.xml new file mode 100644 index 0000000000..407ceab458 --- /dev/null +++ b/asm/pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + com.baeldung.examples + asm + 1.0 + jar + + + org.ow2.asm + asm + 5.2 + + + org.ow2.asm + asm-util + 5.2 + + + + UTF-8 + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + + com.baeldung.examples.asm.instrumentation.Premain + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.9 + + -javaagent:"C:\asm-1.0.jar" + + + + + \ No newline at end of file diff --git a/asm/src/main/java/com/baeldung/examples/asm/CustomClassWriter.java b/asm/src/main/java/com/baeldung/examples/asm/CustomClassWriter.java new file mode 100644 index 0000000000..d41a1a16a3 --- /dev/null +++ b/asm/src/main/java/com/baeldung/examples/asm/CustomClassWriter.java @@ -0,0 +1,160 @@ +package com.baeldung.examples.asm; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ASM4; +import static org.objectweb.asm.Opcodes.V1_5; +import org.objectweb.asm.Type; +import org.objectweb.asm.util.TraceClassVisitor; + +/** + * + * @author baeldung + * @param + */ +public class CustomClassWriter { + + ClassReader reader; + ClassWriter writer; + AddFieldAdapter addFieldAdapter; + AddInterfaceAdapter addInterfaceAdapter; + PublicizeMethodAdapter pubMethAdapter; + final static String CLASSNAME = "java.lang.Integer"; + final static String CLONEABLE = "java/lang/Cloneable"; + + public CustomClassWriter() { + + try { + reader = new ClassReader(CLASSNAME); + writer = new ClassWriter(reader, 0); + + } catch (IOException ex) { + Logger.getLogger(CustomClassWriter.class.getName()).log(Level.SEVERE, null, ex); + } + } + + public CustomClassWriter(byte[] contents) { + reader = new ClassReader(contents); + writer = new ClassWriter(reader, 0); + } + + public static void main(String[] args) { + CustomClassWriter ccw = new CustomClassWriter(); + ccw.publicizeMethod(); + } + + public byte[] addField() { + addFieldAdapter = new AddFieldAdapter("aNewBooleanField", org.objectweb.asm.Opcodes.ACC_PUBLIC, writer); + reader.accept(addFieldAdapter, 0); + return writer.toByteArray(); + } + + public byte[] publicizeMethod() { + pubMethAdapter = new PublicizeMethodAdapter(writer); + reader.accept(pubMethAdapter, 0); + return writer.toByteArray(); + } + + public byte[] addInterface() { + addInterfaceAdapter = new AddInterfaceAdapter(writer); + reader.accept(addInterfaceAdapter, 0); + return writer.toByteArray(); + } + + public class AddInterfaceAdapter extends ClassVisitor { + + public AddInterfaceAdapter(ClassVisitor cv) { + super(ASM4, cv); + } + + @Override + public void visit(int version, int access, String name, + String signature, String superName, String[] interfaces) { + String[] holding = new String[interfaces.length + 1]; + holding[holding.length - 1] = CLONEABLE; + System.arraycopy(interfaces, 0, holding, 0, interfaces.length); + + cv.visit(V1_5, access, name, signature, superName, holding); + } + + } + + public class PublicizeMethodAdapter extends ClassVisitor { + + final Logger logger = Logger.getLogger("PublicizeMethodAdapter"); + TraceClassVisitor tracer; + PrintWriter pw = new PrintWriter(System.out); + + public PublicizeMethodAdapter(ClassVisitor cv) { + super(ASM4, cv); + this.cv = cv; + tracer = new TraceClassVisitor(cv, pw); + } + + @Override + public MethodVisitor visitMethod(int access, + String name, + String desc, + String signature, + String[] exceptions) { + + if (name.equals("toUnsignedString0")) { + logger.info("Visiting unsigned method"); + return tracer.visitMethod(ACC_PUBLIC + ACC_STATIC, name, desc, signature, exceptions); + } + return tracer.visitMethod(access, name, desc, signature, exceptions); + + } + + public void visitEnd() { + tracer.visitEnd(); + System.out.println(tracer.p.getText()); + } + + } + + public class AddFieldAdapter extends ClassVisitor { + + String fieldName; + int access; + boolean isFieldPresent; + + public AddFieldAdapter(String fieldName, int access, ClassVisitor cv) { + super(ASM4, cv); + this.cv = cv; + this.access = access; + this.fieldName = fieldName; + } + + @Override + public FieldVisitor visitField(int access, String name, String desc, + String signature, Object value) { + if (name.equals(fieldName)) { + isFieldPresent = true; + } + return cv.visitField(access, name, desc, signature, value); + } + + @Override + public void visitEnd() { + if (!isFieldPresent) { + FieldVisitor fv = cv.visitField(access, fieldName, Type.BOOLEAN_TYPE.toString(), null, null); + if (fv != null) { + fv.visitEnd(); + } + } + cv.visitEnd(); + } + + } + +} diff --git a/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java b/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java new file mode 100644 index 0000000000..a3e69b6785 --- /dev/null +++ b/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java @@ -0,0 +1,32 @@ +package com.baeldung.examples.asm.instrumentation; + +import com.baeldung.examples.asm.CustomClassWriter; +import java.lang.instrument.ClassFileTransformer; +import java.lang.instrument.IllegalClassFormatException; +import java.lang.instrument.Instrumentation; +import java.security.ProtectionDomain; + +/** + * + * @author baeldung + */ +public class Premain { + + public static void premain(String agentArgs, Instrumentation inst) { + inst.addTransformer(new ClassFileTransformer() { + + @Override + public byte[] transform(ClassLoader l, String name, Class c, + ProtectionDomain d, byte[] b) + throws IllegalClassFormatException { + + if (name.equals("java/lang/Integer")) { + CustomClassWriter cr = new CustomClassWriter(b); + return cr.addField(); + } + return b; + } + }); + } + +} diff --git a/pom.xml b/pom.xml index 3bdeac3672..f44cf9481e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,7 @@ + asm atomix apache-cayenne aws From 66db01d898f701086783635a77740cc093c4b006 Mon Sep 17 00:00:00 2001 From: lor6 Date: Fri, 13 Oct 2017 14:42:52 +0300 Subject: [PATCH 016/197] add try with resources (#2725) --- .../src/test/java/com/baeldung/ormlite/ORMLiteTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java b/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java index eaa21b6eaf..26eb481286 100644 --- a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java +++ b/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java @@ -76,13 +76,10 @@ public class ORMLiteTest { library2.setName("My Other Library"); libraryDao.create(library2); - CloseableWrappedIterable wrappedIterable = libraryDao.getWrappedIterable(); - try { + try (CloseableWrappedIterable wrappedIterable = libraryDao.getWrappedIterable()) { wrappedIterable.forEach(lib -> { System.out.println(lib.getName()); }); - } finally { - wrappedIterable.close(); } } From a6e80457934ccbed91660ace5e9821655d1b87e1 Mon Sep 17 00:00:00 2001 From: hugosama1 Date: Fri, 13 Oct 2017 16:25:16 -0400 Subject: [PATCH 017/197] StreamEx tutorial (#2685) --- .../main/java/com/baeldung/streamex/Role.java | 5 ++ .../java/com/baeldung/streamex/StreamEX.java | 84 +++++++++++++++++++ .../main/java/com/baeldung/streamex/User.java | 40 +++++++++ 3 files changed, 129 insertions(+) create mode 100644 libraries/src/main/java/com/baeldung/streamex/Role.java create mode 100644 libraries/src/main/java/com/baeldung/streamex/StreamEX.java create mode 100644 libraries/src/main/java/com/baeldung/streamex/User.java diff --git a/libraries/src/main/java/com/baeldung/streamex/Role.java b/libraries/src/main/java/com/baeldung/streamex/Role.java new file mode 100644 index 0000000000..5709ca61f8 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/streamex/Role.java @@ -0,0 +1,5 @@ +package com.baeldung.streamex; + +public class Role { + +} diff --git a/libraries/src/main/java/com/baeldung/streamex/StreamEX.java b/libraries/src/main/java/com/baeldung/streamex/StreamEX.java new file mode 100644 index 0000000000..7cbfec4421 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/streamex/StreamEX.java @@ -0,0 +1,84 @@ +package com.baeldung.streamex; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import one.util.streamex.DoubleStreamEx; +import one.util.streamex.EntryStream; +import one.util.streamex.IntStreamEx; +import one.util.streamex.StreamEx; + +public class StreamEX { + + public static void main(String[] args) { + //Collector shortcut methods (toList, toSet, groupingBy, joining, etc.) + List users = Arrays.asList( + new User("name"), new User(), new User()); + users.stream() + .map(User::getName) + .collect(Collectors.toList()); + List userNames = StreamEx.of(users) + .map(User::getName) + .toList(); + Map> role2users = StreamEx.of(users) + .groupingBy(User::getRole); + StreamEx.of(1, 2, 3).joining("; "); // "1; 2; 3" + //Selecting stream elements of specific type + List usersAndRoles = Arrays.asList(new User(), new Role()); + List roles = IntStreamEx.range(usersAndRoles.size()) + .mapToObj(usersAndRoles::get) + .select(Role.class) + .toList(); + System.out.println(roles); + //adding elements to Stream + List appendedUsers = StreamEx.of(users) + .map(User::getName) + .prepend("(none)") + .append("LAST") + .toList(); + System.out.println(appendedUsers); + //Removing unwanted elements and using the stream as Iterable: + for (String line : StreamEx.of(users).map(User::getName) + .nonNull()) { + System.out.println(line); + } + //Selecting map keys by value predicate: + Map nameToRole = new HashMap<>(); + nameToRole.put("first", new Role()); + nameToRole.put("second", null); + Set nonNullRoles = StreamEx. + ofKeys(nameToRole, Objects::nonNull) + .toSet(); + System.out.println(nonNullRoles); + //Operating on key-value pairs: + Map> users2roles = transformMap(role2users); + Map mapToString = EntryStream.of(users2roles) + .mapKeys(String::valueOf) + .mapValues(String::valueOf) + .toMap(); + //Support of byte/char/short/float types: + short[] src = {1, 2, 3}; + char[] output = IntStreamEx.of(src) + .map(x -> x * 5) + .toCharArray(); + } + + public double[] getDiffBetweenPairs(double... numbers) { + return DoubleStreamEx.of(numbers) + .pairMap((a, b) -> b - a).toArray(); + } + + public static Map> transformMap( + Map> role2users) { + Map> users2roles = EntryStream.of(role2users) + .flatMapValues(List::stream) + .invert() + .grouping(); + return users2roles; + } + +} diff --git a/libraries/src/main/java/com/baeldung/streamex/User.java b/libraries/src/main/java/com/baeldung/streamex/User.java new file mode 100644 index 0000000000..e37eb014c5 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/streamex/User.java @@ -0,0 +1,40 @@ +package com.baeldung.streamex; + +public class User { + + int id; + String name; + Role role = new Role(); + + public User() { + } + + public User(String name) { + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Role getRole() { + return role; + } + + public void setRole(Role role) { + this.role = role; + } + +} From 56af2a73189a06a09aa85281493c6bd9b5efe979 Mon Sep 17 00:00:00 2001 From: Harihar Das Date: Sun, 15 Oct 2017 08:04:13 +0530 Subject: [PATCH 018/197] =?UTF-8?q?[Harihar]=20Code=20for=20RMI?= =?UTF-8?q?=20java.=20http://jira.baeldung.com/brow=E2=80=A6=20(#2729)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Harihar] Code for RMI java. http://jira.baeldung.com/browse/BAEL-1209 * [Harihar] Use specific exception declaration --- rmi/client.policy | 3 +++ rmi/server.policy | 3 +++ rmi/src/org/baeldung/Client.java | 20 +++++++++++++++++ .../org/baeldung/RandomNumberGenerator.java | 8 +++++++ .../baeldung/RandomNumberGeneratorEngine.java | 10 +++++++++ rmi/src/org/baeldung/Server.java | 22 +++++++++++++++++++ 6 files changed, 66 insertions(+) create mode 100644 rmi/client.policy create mode 100644 rmi/server.policy create mode 100644 rmi/src/org/baeldung/Client.java create mode 100644 rmi/src/org/baeldung/RandomNumberGenerator.java create mode 100644 rmi/src/org/baeldung/RandomNumberGeneratorEngine.java create mode 100644 rmi/src/org/baeldung/Server.java diff --git a/rmi/client.policy b/rmi/client.policy new file mode 100644 index 0000000000..5d74bde76d --- /dev/null +++ b/rmi/client.policy @@ -0,0 +1,3 @@ +grant { + permission java.security.AllPermission; +}; \ No newline at end of file diff --git a/rmi/server.policy b/rmi/server.policy new file mode 100644 index 0000000000..5d74bde76d --- /dev/null +++ b/rmi/server.policy @@ -0,0 +1,3 @@ +grant { + permission java.security.AllPermission; +}; \ No newline at end of file diff --git a/rmi/src/org/baeldung/Client.java b/rmi/src/org/baeldung/Client.java new file mode 100644 index 0000000000..0376952bab --- /dev/null +++ b/rmi/src/org/baeldung/Client.java @@ -0,0 +1,20 @@ +package org.baeldung; + +import java.rmi.NotBoundException; +import java.rmi.RemoteException; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; + +public class Client { + public static void main(String[] args) throws RemoteException, NotBoundException { + System.setProperty("java.security.policy", "file:./client.policy"); + if (System.getSecurityManager() == null) { + System.setSecurityManager(new SecurityManager()); + } + String name = "RandomNumberGenerator"; + Registry registry = LocateRegistry.getRegistry(); + RandomNumberGenerator randomNumberGenerator = (RandomNumberGenerator) registry.lookup(name); + int number = randomNumberGenerator.get(); + System.out.println("Received random number:" + number); + } +} diff --git a/rmi/src/org/baeldung/RandomNumberGenerator.java b/rmi/src/org/baeldung/RandomNumberGenerator.java new file mode 100644 index 0000000000..50e49d2652 --- /dev/null +++ b/rmi/src/org/baeldung/RandomNumberGenerator.java @@ -0,0 +1,8 @@ +package org.baeldung; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +public interface RandomNumberGenerator extends Remote{ + int get() throws RemoteException; +} diff --git a/rmi/src/org/baeldung/RandomNumberGeneratorEngine.java b/rmi/src/org/baeldung/RandomNumberGeneratorEngine.java new file mode 100644 index 0000000000..04d90b2ff9 --- /dev/null +++ b/rmi/src/org/baeldung/RandomNumberGeneratorEngine.java @@ -0,0 +1,10 @@ +package org.baeldung; + +import java.rmi.RemoteException; + +public class RandomNumberGeneratorEngine implements RandomNumberGenerator { + @Override + public int get() throws RemoteException { + return (int) (100 * Math.random()); + } +} diff --git a/rmi/src/org/baeldung/Server.java b/rmi/src/org/baeldung/Server.java new file mode 100644 index 0000000000..8e613cb6bb --- /dev/null +++ b/rmi/src/org/baeldung/Server.java @@ -0,0 +1,22 @@ +package org.baeldung; + +import java.rmi.RemoteException; +import java.rmi.registry.LocateRegistry; +import java.rmi.registry.Registry; +import java.rmi.server.UnicastRemoteObject; + +public class Server { + public static void main(String[] args) throws RemoteException { + System.setProperty("java.security.policy", "file:./server.policy"); + if (System.getSecurityManager() == null) { + System.setSecurityManager(new SecurityManager()); + } + String name = "RandomNumberGenerator"; + RandomNumberGenerator randomNumberGenerator = new RandomNumberGeneratorEngine(); + RandomNumberGenerator stub = + (RandomNumberGenerator) UnicastRemoteObject.exportObject(randomNumberGenerator, 0); + Registry registry = LocateRegistry.getRegistry(); + registry.rebind(name, stub); + System.out.println("RandomNumberGenerator bound"); + } +} From 5df269f171f406a2ea6052d1c2f7bc9648a6fc56 Mon Sep 17 00:00:00 2001 From: Anton Date: Sun, 15 Oct 2017 08:22:30 +0300 Subject: [PATCH 019/197] BAEL-1041 Caffeine (#2734) * BAEL-748 quick guide to @Value * BAEL-748 changes from review * BAEL-748 inject comma-separated values into array * BAEL-768 Introduction to Netty * BAEL-768 remove commented code * BAEL-861 Introduction to Awaitility * BAEL-861 rename Test to UnitTest * BAEL-1041 Introduction in Caffeine * BAEL-1041 fix test * BAEL-1041 fix formatting * BAEL-1041 fix expected/actual order * BAEL-1041 remove trailing underscore * Formatting after merge * BAEL-1041 add spaces between data and assertions * BAEL-1041 soft values example * BAEL-1041 remove duplicate dependency * BAEL-1041 formatting fix * BAEL-1041 formatting fix * BAEL-1041 use logger instead of sout --- .../src/main/java/com/baeldung/caffeine/DataObject.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/src/main/java/com/baeldung/caffeine/DataObject.java b/libraries/src/main/java/com/baeldung/caffeine/DataObject.java index 2a8b60b045..a90b3e9f21 100644 --- a/libraries/src/main/java/com/baeldung/caffeine/DataObject.java +++ b/libraries/src/main/java/com/baeldung/caffeine/DataObject.java @@ -1,9 +1,13 @@ package com.baeldung.caffeine; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + final class DataObject { private final String data; private static int objectCounter = 0; + private static final Logger log = LoggerFactory.getLogger(DataObject.class); private DataObject(String data) { this.data = data; @@ -22,7 +26,7 @@ final class DataObject { public static DataObject get(String data) { objectCounter++; - System.out.println(String.format("Initializing DataObject#%d with data '%s'", objectCounter, data)); + log.info("Init DataObject#{} with '{}'", objectCounter, data); return new DataObject(data); } } From e113541042a758878e99ca56e3b97896bc1a2795 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 15 Oct 2017 10:30:35 +0200 Subject: [PATCH 020/197] Update README.md (#2739) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 25398d1d39..d94a786bc2 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ Any IDE can be used to work with the projects, but if you're using Eclipse, cons CI - Jenkins ================================ -This tutorials project is being built **[>> HERE](https://rest-security.ci.cloudbees.com/job/github%20projects%20Jobs/job/tutorials/)** +This tutorials project is being built **[>> HERE](https://rest-security.ci.cloudbees.com/job/tutorials-unit/)** From 7fd52a69a4b89d48de4a39923f31ce15a4f1c4b6 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 15 Oct 2017 10:30:48 +0200 Subject: [PATCH 021/197] Update README.md (#2738) --- ethereumj/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereumj/README.md b/ethereumj/README.md index 54da91b4f7..d2e2753438 100644 --- a/ethereumj/README.md +++ b/ethereumj/README.md @@ -1,4 +1,4 @@ ## EthereumJ ### Relevant Articles: -- [Introduction to EthereumJ](http://www.baeldung.com/intro-to-ethereumj) \ No newline at end of file +- [Introduction to EthereumJ](http://www.baeldung.com/ethereumj) From b6451199e7788da9100f74c71446c1edcd1466a8 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 15 Oct 2017 10:31:00 +0200 Subject: [PATCH 022/197] Update README.md (#2737) --- libraries/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/README.md b/libraries/README.md index 7214cd278c..b400b1a772 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -39,7 +39,6 @@ - [Introduction to Apache Commons CSV](http://www.baeldung.com/apache-commons-csv) - [Difference Between Two Dates in Java](http://www.baeldung.com/java-date-difference) - [Introduction to NoException](http://www.baeldung.com/no-exception) -- [Introduction to FunctionalJava](http://www.baeldung.com/functional-java) - [Apache Commons IO](http://www.baeldung.com/apache-commons-io) - [Introduction to Conflict-Free Replicated Data Types](http://www.baeldung.com/java-conflict-free-replicated-data-types) From cccd72d451163bb31fd1047f52802d318234ad52 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 15 Oct 2017 10:31:13 +0200 Subject: [PATCH 023/197] Update README.md (#2736) --- algorithms/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/algorithms/README.md b/algorithms/README.md index 8cf4c35b68..011e4b51f2 100644 --- a/algorithms/README.md +++ b/algorithms/README.md @@ -3,7 +3,7 @@ - [Dijkstra Algorithm in Java](http://www.baeldung.com/java-dijkstra) - [Introduction to Cobertura](http://www.baeldung.com/cobertura) - [Ant Colony Optimization](http://www.baeldung.com/java-ant-colony-optimization) -- [Validating Input With Finite Automata in Java](http://www.baeldung.com/finite-automata-java) +- [Validating Input With Finite Automata in Java](http://www.baeldung.com/java-finite-automata) - [Introduction to Jenetics Library](http://www.baeldung.com/jenetics) - [Check If a Number Is Prime in Java](http://www.baeldung.com/java-prime-numbers) - [Example of Hill Climbing Algorithm](http://www.baeldung.com/java-hill-climbing-algorithm) From b85bb1ae1ef8463444aa1e571520203ff4fba4c7 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Sun, 15 Oct 2017 10:31:46 +0200 Subject: [PATCH 024/197] BAEL-1171 java.lang.String API (#2732) * Evaluation article: Different Types of Bean Injection in Spring * added tests & changed configuration to Java-based config * removed xml config files * rename unit tests * BAEL-972 - Apache Commons Text * remove code from evaluation article * remove code from evaluation article * BAEL-972 - Apache Commons Text - added another example * BAEL-972 - Apache Commons Text - just indentation * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java - fix problems * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * fix formatting * BAEL-1033 minor refactor * BAEL-1035 Introduction to Eclipse Collections * format * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * cleanup * cleanup * BAEL-1109 Introduction to JCache * BAEL-1109 Introduction to JCache * remove unneeded property in pom.xml * fix formatting * close cache instances properly * remove latest commit * BAEL-1057 Introduction to rxjava-jdbc * refactor rxjava-jdbc * Refactor rxjava-jdbc * Refactoring rxjava-jdbc * BAEL-1171 java.lang.String API * refactor rxjava-jdbc * refactor String * String API - move multiple classes into a single class * move class into test package * BAEL-1171 String.lang.String API --- .../java/com/baeldung/string/StringTest.java | 186 ++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/core-java/src/test/java/com/baeldung/string/StringTest.java b/core-java/src/test/java/com/baeldung/string/StringTest.java index fd83c903a3..324f4690fc 100644 --- a/core-java/src/test/java/com/baeldung/string/StringTest.java +++ b/core-java/src/test/java/com/baeldung/string/StringTest.java @@ -2,6 +2,13 @@ package com.baeldung.string; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; + +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.IllegalFormatException; +import java.util.regex.PatternSyntaxException; import org.junit.Test; @@ -12,6 +19,11 @@ public class StringTest { assertEquals(97, "abcd".codePointAt(0)); } + @Test(expected = StringIndexOutOfBoundsException.class) + public void whenPassNonExistingIndex_thenExceptionThrown() { + int a = "abcd".codePointAt(4); + } + @Test public void whenCallConcat_thenCorrect() { assertEquals("elephant", "elep".concat("hant")); @@ -21,6 +33,180 @@ public class StringTest { public void whenGetBytes_thenCorrect() { byte[] byteArray = "abcd".getBytes(); byte[] expected = new byte[] { 97, 98, 99, 100 }; + assertArrayEquals(expected, byteArray); } + + @Test + public void whenGetBytesUsingUTF16_thenCorrect() { + byte[] byteArray = "efgh".getBytes(StandardCharsets.US_ASCII); + byte[] expected = new byte[] { 101, 102, 103, 104 }; + + assertArrayEquals(expected, byteArray); + } + + @Test + public void whenCreateStringUsingByteArray_thenCorrect() { + byte[] array = new byte[] { 97, 98, 99, 100 }; + String s = new String(array); + + assertEquals("abcd", s); + } + + @Test + public void whenCallCharAt_thenCorrect() { + assertEquals('P', "Paul".charAt(0)); + } + + @Test(expected = IndexOutOfBoundsException.class) + public void whenCharAtOnNonExistingIndex_thenIndexOutOfBoundsExceptionThrown() { + char character = "Paul".charAt(4); + } + + @Test + public void whenCallCodePointCount_thenCorrect() { + assertEquals(2, "abcd".codePointCount(0, 2)); + } + + @Test(expected = IndexOutOfBoundsException.class) + public void whenSecondIndexEqualToLengthOfString_thenIndexOutOfBoundsExceptionThrown() { + char character = "Paul".charAt(4); + } + + @Test + public void whenCallContains_thenCorrect() { + String s = "abcd"; + + assertTrue(s.contains("abc")); + assertFalse(s.contains("cde")); + } + + @Test + public void whenCallCopyValueOf_thenStringConstructed() { + char[] array = new char[] { 'a', 'b', 'c', 'd' }; + + assertEquals("abcd", String.copyValueOf(array)); + } + + @Test + public void whenCallEndsWith_thenCorrect() { + String s1 = "test"; + + assertTrue(s1.endsWith("t")); + } + + @Test + public void whenFormat_thenCorrect() { + String value = "Baeldung"; + String formatted = String.format("Welcome to %s!", value); + + assertEquals("Welcome to Baeldung!", formatted); + } + + @Test(expected = IllegalFormatException.class) + public void whenInvalidFormatSyntax_thenIllegalFormatExceptionThrown() { + String value = "Baeldung"; + String formatted = String.format("Welcome to %x!", value); + } + + @Test + public void whenCallIndexOf_thenCorrect() { + assertEquals(1, "foo".indexOf("o")); + } + + @Test + public void whenCallIsEmpty_thenCorrect() { + String s1 = ""; + + assertTrue(s1.isEmpty()); + } + + @Test + public void whenCallLastIndexOf_thenCorrect() { + assertEquals(2, "foo".lastIndexOf("o")); + } + + @Test + public void whenCallRegionMatches_thenCorrect() { + assertTrue("welcome to baeldung".regionMatches(false, 11, "baeldung", 0, 8)); + } + + @Test + public void whenCallStartsWith_thenCorrect() { + assertTrue("foo".startsWith("f")); + } + + @Test + public void whenTrim_thenCorrect() { + assertEquals("foo", " foo ".trim()); + } + + @Test + public void whenSplit_thenCorrect() { + String s = "Welcome to Baeldung"; + String[] array = new String[] { "Welcome", "to", "Baeldung" }; + + assertArrayEquals(array, s.split(" ")); + } + + @Test(expected = PatternSyntaxException.class) + public void whenPassInvalidParameterToSplit_thenPatternSyntaxExceptionThrown() { + String s = "Welcome*to Baeldung"; + + String[] result = s.split("*"); + } + + @Test + public void whenCallSubstring_thenCorrect() { + String s = "Welcome to Baeldung"; + + assertEquals("Welcome", s.substring(0, 7)); + } + + @Test(expected = IndexOutOfBoundsException.class) + public void whenSecondIndexEqualToLengthOfString_thenCorrect() { + String s = "Welcome to Baeldung"; + + String sub = s.substring(0, 20); + } + + @Test + public void whenConvertToUpperCase_thenCorrect() { + String s = "Welcome to Baeldung!"; + + assertEquals("WELCOME TO BAELDUNG!", s.toUpperCase()); + } + + @Test + public void whenConvertToLowerCase_thenCorrect() { + String s = "WELCOME to BAELDUNG!"; + + assertEquals("welcome to baeldung!", s.toLowerCase()); + } + + @Test + public void whenCallReplace_thenCorrect() { + String s = "I learn Spanish"; + + assertEquals("I learn French", s.replaceAll("Spanish", "French")); + } + + @Test + public void whenIntern_thenCorrect() { + String s1 = "abc"; + String s2 = new String("abc"); + String s3 = new String("foo"); + String s4 = s1.intern(); + String s5 = s2.intern(); + + assertFalse(s3 == s4); + assertTrue(s1 == s5); + } + + @Test + public void whenCallValueOf_thenCorrect() { + long l = 200L; + + assertEquals("200", String.valueOf(l)); + } } From c3a45d072a7063708521bee1e14e28832db70e35 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Sun, 15 Oct 2017 13:37:47 +0200 Subject: [PATCH 025/197] BAEL-1171 String.lang.String API (#2742) * Evaluation article: Different Types of Bean Injection in Spring * added tests & changed configuration to Java-based config * removed xml config files * rename unit tests * BAEL-972 - Apache Commons Text * remove code from evaluation article * remove code from evaluation article * BAEL-972 - Apache Commons Text - added another example * BAEL-972 - Apache Commons Text - just indentation * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java - fix problems * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * fix formatting * BAEL-1033 minor refactor * BAEL-1035 Introduction to Eclipse Collections * format * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * cleanup * cleanup * BAEL-1109 Introduction to JCache * BAEL-1109 Introduction to JCache * remove unneeded property in pom.xml * fix formatting * close cache instances properly * remove latest commit * BAEL-1057 Introduction to rxjava-jdbc * refactor rxjava-jdbc * Refactor rxjava-jdbc * Refactoring rxjava-jdbc * BAEL-1171 java.lang.String API * refactor rxjava-jdbc * refactor String * String API - move multiple classes into a single class * move class into test package * BAEL-1171 String.lang.String API * BAEL-1171 java.lang.String API --- .../test/java/com/baeldung/string/StringTest.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/string/StringTest.java b/core-java/src/test/java/com/baeldung/string/StringTest.java index 324f4690fc..0e325950b0 100644 --- a/core-java/src/test/java/com/baeldung/string/StringTest.java +++ b/core-java/src/test/java/com/baeldung/string/StringTest.java @@ -2,10 +2,9 @@ package com.baeldung.string; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.IllegalFormatException; import java.util.regex.PatternSyntaxException; @@ -38,7 +37,7 @@ public class StringTest { } @Test - public void whenGetBytesUsingUTF16_thenCorrect() { + public void whenGetBytesUsingASCII_thenCorrect() { byte[] byteArray = "efgh".getBytes(StandardCharsets.US_ASCII); byte[] expected = new byte[] { 101, 102, 103, 104 }; @@ -156,6 +155,13 @@ public class StringTest { String[] result = s.split("*"); } + @Test + public void whenCallSubSequence_thenCorrect() { + String s = "Welcome to Baeldung"; + + assertEquals("Welcome", s.subSequence(0, 7)); + } + @Test public void whenCallSubstring_thenCorrect() { String s = "Welcome to Baeldung"; From 0b5fbdc53e8a80216439889939063f4323736d0a Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 15 Oct 2017 13:55:42 +0200 Subject: [PATCH 026/197] Cody756 master (#2740) * Update README.md * Update README.md * Create README.md * Create README.md * Create README.md * Update README.md * Update README.md * Update README.md * Create README.md * Update README.MD * Create README.md * Update README.md * Update README.md * Update README.md * Create README.md * Update README.md * Update README.md * Update README.md * Update README.MD * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Create README.md * Update README.md * Create README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Create README.md * Create README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Create README.md * Update README.md * Update README.md * Update README.md * Update README.MD * Create README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Create README.md * Create README.md * Update README.md * Update README.md * Create README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Merge fix --- algorithms/README.md | 2 ++ .../examples/asm/instrumentation/Premain.java | 27 +++++-------------- core-java-8/README.md | 4 +-- core-java-9/README.md | 1 + core-java/README.md | 10 ++++++- ejb/README.md | 1 + libraries/README.md | 11 ++++++++ mustache/README.md | 3 ++- rxjava/README.md | 5 ++++ spring-hibernate5/README.md | 1 + spring-mvc-kotlin/README.md | 2 ++ spring-rest-angular/README.md | 1 + spring-swagger-codegen/README.md | 3 +++ testing/README.md | 2 +- vavr/README.md | 2 ++ vertx-and-rxjava/README.md | 2 ++ 16 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 spring-mvc-kotlin/README.md create mode 100644 spring-swagger-codegen/README.md create mode 100644 vertx-and-rxjava/README.md diff --git a/algorithms/README.md b/algorithms/README.md index 011e4b51f2..91d8b55dd6 100644 --- a/algorithms/README.md +++ b/algorithms/README.md @@ -9,3 +9,5 @@ - [Example of Hill Climbing Algorithm](http://www.baeldung.com/java-hill-climbing-algorithm) - [Monte Carlo Tree Search for Tic-Tac-Toe Game](http://www.baeldung.com/java-monte-carlo-tree-search) - [String Search Algorithms for Large Texts](http://www.baeldung.com/java-full-text-search-algorithms) +- [Test a Linked List for Cyclicity](http://www.baeldung.com/java-linked-list-cyclicity) +- [Binary Search Algorithm in Java](http://www.baeldung.com/java-binary-search) diff --git a/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java b/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java index a3e69b6785..105d7227d5 100644 --- a/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java +++ b/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java @@ -1,32 +1,19 @@ package com.baeldung.examples.asm.instrumentation; import com.baeldung.examples.asm.CustomClassWriter; -import java.lang.instrument.ClassFileTransformer; -import java.lang.instrument.IllegalClassFormatException; -import java.lang.instrument.Instrumentation; -import java.security.ProtectionDomain; -/** - * - * @author baeldung - */ +import java.lang.instrument.Instrumentation; + public class Premain { public static void premain(String agentArgs, Instrumentation inst) { - inst.addTransformer(new ClassFileTransformer() { + inst.addTransformer((l, name, c, d, b) -> { - @Override - public byte[] transform(ClassLoader l, String name, Class c, - ProtectionDomain d, byte[] b) - throws IllegalClassFormatException { - - if (name.equals("java/lang/Integer")) { - CustomClassWriter cr = new CustomClassWriter(b); - return cr.addField(); - } - return b; + if (name.equals("java/lang/Integer")) { + CustomClassWriter cr = new CustomClassWriter(b); + return cr.addField(); } + return b; }); } - } diff --git a/core-java-8/README.md b/core-java-8/README.md index 4610b3c86d..690bd48ed5 100644 --- a/core-java-8/README.md +++ b/core-java-8/README.md @@ -28,5 +28,5 @@ - [Finding Max/Min of a List or Collection](http://www.baeldung.com/java-collection-min-max) - [Java Base64 Encoding and Decoding](http://www.baeldung.com/java-base64-encode-and-decode) - [The Difference Between map() and flatMap()](http://www.baeldung.com/java-difference-map-and-flatmap) - -- [Merging Streams in Java](http://www.baeldung.com/java-merge-streams) \ No newline at end of file +- [Merging Streams in Java](http://www.baeldung.com/java-merge-streams) +- [“Stream has already been operated upon or closed” Exception in Java](http://www.baeldung.com/java-stream-operated-upon-or-closed-exception) diff --git a/core-java-9/README.md b/core-java-9/README.md index f0b2e3f206..98c855caea 100644 --- a/core-java-9/README.md +++ b/core-java-9/README.md @@ -17,3 +17,4 @@ - [Java 9 Reactive Streams](http://www.baeldung.com/java-9-reactive-streams) - [How to Get All Dates Between Two Dates?](http://www.baeldung.com/java-between-dates) - [Java 9 java.util.Objects Additions](http://www.baeldung.com/java-9-objects-new) +- [Compact Strings in Java 9](http://www.baeldung.com/java-9-compact-string) diff --git a/core-java/README.md b/core-java/README.md index a251de1daa..b4b8d9062e 100644 --- a/core-java/README.md +++ b/core-java/README.md @@ -106,4 +106,12 @@ - [Converting a List to String in Java](http://www.baeldung.com/java-list-to-string) - [CharSequence vs. String in Java](http://www.baeldung.com/java-char-sequence-string) - [Period and Duration in Java](http://www.baeldung.com/java-period-duration) -- [Guide to the Diamond Operator in Java](http://www.baeldung.com/java-diamond-operator) \ No newline at end of file +- [Guide to the Diamond Operator in Java](http://www.baeldung.com/java-diamond-operator) +- [Singletons in Java](http://www.baeldung.com/java-singleton) +- [“Sneaky Throws” in Java](http://www.baeldung.com/java-sneaky-throws) +- [OutOfMemoryError: GC Overhead Limit Exceeded](http://www.baeldung.com/java-gc-overhead-limit-exceeded) +- [How to Iterate Over a Stream With Indices](http://www.baeldung.com/java-stream-indices) +- [StringBuilder and StringBuffer in Java](http://www.baeldung.com/java-string-builder-string-buffer) +- [Number of Digits in an Integer in Java](http://www.baeldung.com/java-number-of-digits-in-int) +- [Proxy, Decorator, Adapter and Bridge Patterns](http://www.baeldung.com/java-structural-design-patterns) + diff --git a/ejb/README.md b/ejb/README.md index 3b729318d4..994781b064 100644 --- a/ejb/README.md +++ b/ejb/README.md @@ -2,3 +2,4 @@ - [Guide to EJB Set-up](http://www.baeldung.com/ejb-intro) - [Java EE Session Beans](http://www.baeldung.com/ejb-session-beans) +- [Introduction to EJB JNDI Lookup on WildFly Application Server](http://www.baeldung.com/wildfly-ejb-jndi) diff --git a/libraries/README.md b/libraries/README.md index b400b1a772..90762bfed6 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -39,8 +39,19 @@ - [Introduction to Apache Commons CSV](http://www.baeldung.com/apache-commons-csv) - [Difference Between Two Dates in Java](http://www.baeldung.com/java-date-difference) - [Introduction to NoException](http://www.baeldung.com/no-exception) +- [Introduction to FunctionalJava](http://www.baeldung.com/functional-java) - [Apache Commons IO](http://www.baeldung.com/apache-commons-io) - [Introduction to Conflict-Free Replicated Data Types](http://www.baeldung.com/java-conflict-free-replicated-data-types) +- [Introduction to javax.measure](http://www.baeldung.com/javax-measure) +- [Spring Yarg Integration](http://www.baeldung.com/spring-yarg) +- [Delete a Directory Recursively in Java](http://www.baeldung.com/java-delete-directory) +- [Guide to JDeferred](http://www.baeldung.com/jdeferred) +- [Integrating Retrofit with RxJava](http://www.baeldung.com/retrofit-rxjava) +- [Introduction to MBassador](http://www.baeldung.com/mbassador) +- [Introduction to JCache](http://www.baeldung.com/jcache) +- [Introduction to Retrofit](http://www.baeldung.com/retrofit) +- [Using Pairs in Java](http://www.baeldung.com/java-pairs) +- [Apache Commons Collections Bag](http://www.baeldung.com/apache-commons-bag) The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own. diff --git a/mustache/README.md b/mustache/README.md index b616b2df8a..fa41eb4f4d 100644 --- a/mustache/README.md +++ b/mustache/README.md @@ -1,2 +1,3 @@ ### Relevant Articles: -[Introduction to Mustache](http://www.baeldung.com/mustache) +- [Introduction to Mustache](http://www.baeldung.com/mustache) +- [Guide to Mustache with Spring Boot](http://www.baeldung.com/spring-boot-mustache) diff --git a/rxjava/README.md b/rxjava/README.md index c7fd0c595d..71231cc391 100644 --- a/rxjava/README.md +++ b/rxjava/README.md @@ -3,3 +3,8 @@ - [Dealing with Backpressure with RxJava](http://www.baeldung.com/rxjava-backpressure) - [How to Test RxJava?](http://www.baeldung.com/rxjava-testing) - [Implementing Custom Operators in RxJava](http://www.baeldung.com/rxjava-custom-operators) +- [Introduction to RxJava](http://www.baeldung.com/rx-java) +- [RxJava and Error Handling](http://www.baeldung.com/rxjava-error-handling) +- [Observable Utility Operators in RxJava](http://www.baeldung.com/rxjava-observable-operators) +- [Introduction to rxjava-jdbc](http://www.baeldung.com/rxjava-jdbc) +- [Schedulers in RxJava](http://www.baeldung.com/rxjava-schedulers) diff --git a/spring-hibernate5/README.md b/spring-hibernate5/README.md index fd539fdcb6..01a1ad7121 100644 --- a/spring-hibernate5/README.md +++ b/spring-hibernate5/README.md @@ -1,3 +1,4 @@ ### Relevant articles - [Guide to @Immutable Annotation in Hibernate](http://www.baeldung.com/hibernate-immutable) +- [Hibernate Many to Many Annotation Tutorial](http://www.baeldung.com/hibernate-many-to-many) diff --git a/spring-mvc-kotlin/README.md b/spring-mvc-kotlin/README.md new file mode 100644 index 0000000000..c9bb78b6d8 --- /dev/null +++ b/spring-mvc-kotlin/README.md @@ -0,0 +1,2 @@ +### Relevant articles +- [Spring MVC Setup with Kotlin](http://www.baeldung.com/spring-mvc-kotlin) diff --git a/spring-rest-angular/README.md b/spring-rest-angular/README.md index 3c1b418d95..dcbbd048ba 100644 --- a/spring-rest-angular/README.md +++ b/spring-rest-angular/README.md @@ -2,3 +2,4 @@ ### Relevant Articles: +- [Spring’s RequestBody and ResponseBody Annotations](http://www.baeldung.com/spring-request-response-body) diff --git a/spring-swagger-codegen/README.md b/spring-swagger-codegen/README.md new file mode 100644 index 0000000000..ee6b240c30 --- /dev/null +++ b/spring-swagger-codegen/README.md @@ -0,0 +1,3 @@ +### Relevant articles + +- [Generate Spring Boot REST Client with Swagger](http://www.baeldung.com/spring-boot-rest-client-swagger-codegen) diff --git a/testing/README.md b/testing/README.md index 3171b67b60..889f6706d4 100644 --- a/testing/README.md +++ b/testing/README.md @@ -14,4 +14,4 @@ - [Introduction to JUnitParams](http://www.baeldung.com/junit-params) - [Cucumber Java 8 Support](http://www.baeldung.com/cucumber-java-8-support) - [Introduction to Lambda Behave](http://www.baeldung.com/lambda-behave) - +- [Introduction to Jukito](http://www.baeldung.com/jukito) diff --git a/vavr/README.md b/vavr/README.md index 24b8c5a615..4361363fbd 100644 --- a/vavr/README.md +++ b/vavr/README.md @@ -5,4 +5,6 @@ - [Property Testing Example With Vavr](http://www.baeldung.com/javaslang-property-testing) - [Exceptions in Lambda Expression Using Vavr](http://www.baeldung.com/exceptions-using-vavr) - [Vavr (ex-Javaslang) Support in Spring Data](http://www.baeldung.com/spring-vavr) +- [Introduction to Vavr’s Validation API](http://www.baeldung.com/vavr-validation-api) +- [Guide to Collections API in Vavr](http://www.baeldung.com/vavr-collections) - [Collection Factory Methods for Vavr](http://www.baeldung.com/vavr-collection-factory-methods) diff --git a/vertx-and-rxjava/README.md b/vertx-and-rxjava/README.md new file mode 100644 index 0000000000..ccd4ce3457 --- /dev/null +++ b/vertx-and-rxjava/README.md @@ -0,0 +1,2 @@ +### Relevant articles +- [Example of Vertx and RxJava Integration](http://www.baeldung.com/vertx-rx-java) From eece3d02ba0c1784c93bdd59f6b1da3a939b2c18 Mon Sep 17 00:00:00 2001 From: Parth Karia Date: Sun, 15 Oct 2017 22:27:01 +0530 Subject: [PATCH 027/197] BAEL-1211 Bubble Sort in Java (#2744) * BAEL-815 Introduction to JGraphT * BAEL-815 Move code from libraries to algorithms * BAEL-1211 Bubble Sort in Java * BAEL-1211 Bubble Sort in Java * BAEL-1211 Bubble Sort in Java * BAEL-1211 Bubble Sort in Java * BAEL-1211 Fix conflict --- .../algorithms/bubblesort/BubbleSort.java | 41 +++++++++++++++++++ .../algorithms/bubblesort/BubbleSortTest.java | 26 ++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java create mode 100644 algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortTest.java diff --git a/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java b/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java new file mode 100644 index 0000000000..aa5e085153 --- /dev/null +++ b/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java @@ -0,0 +1,41 @@ +package com.baeldung.algorithms.bubblesort; + +import java.util.stream.IntStream; + +public class BubbleSort { + + public void bubbleSort(Integer[] arr) { + int n = arr.length; + IntStream.range(0, n - 1) + .forEach(i -> { + IntStream.range(i + 1, n - i) + .forEach(j -> { + if (arr[j - 1] > arr[j]) { + int temp = arr[j]; + arr[j] = arr[j - 1]; + arr[j - 1] = temp; + } + }); + }); + } + + public void optimizedBubbleSort(Integer[] arr) { + int i = 0, n = arr.length; + boolean swapNeeded = true; + while (i < n - 1 && swapNeeded) { + swapNeeded = false; + for (int j = i + 1; j < n - i; j++) { + if (arr[j - 1] > arr[j]) { + int temp = arr[j - 1]; + arr[j - 1] = arr[j]; + arr[j] = temp; + swapNeeded = true; + } + } + if (!swapNeeded) + break; + i++; + } + } + +} diff --git a/algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortTest.java b/algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortTest.java new file mode 100644 index 0000000000..7774eb3e67 --- /dev/null +++ b/algorithms/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortTest.java @@ -0,0 +1,26 @@ +package com.baeldung.algorithms.bubblesort; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class BubbleSortTest { + + @Test + public void givenIntegerArray_whenSortedWithBubbleSort_thenGetSortedArray() { + Integer[] array = { 2, 1, 4, 6, 3, 5 }; + Integer[] sortedArray = { 1, 2, 3, 4, 5, 6 }; + BubbleSort bubbleSort = new BubbleSort(); + bubbleSort.bubbleSort(array); + assertArrayEquals(array, sortedArray); + } + + @Test + public void givenIntegerArray_whenSortedWithOptimizedBubbleSort_thenGetSortedArray() { + Integer[] array = { 2, 1, 4, 6, 3, 5 }; + Integer[] sortedArray = { 1, 2, 3, 4, 5, 6 }; + BubbleSort bubbleSort = new BubbleSort(); + bubbleSort.optimizedBubbleSort(array); + assertArrayEquals(array, sortedArray); + } +} \ No newline at end of file From 4aaaf4cea5363e46fdedaa6feae7240e0a1c171d Mon Sep 17 00:00:00 2001 From: Muhammed Almas Date: Sun, 15 Oct 2017 23:53:20 +0530 Subject: [PATCH 028/197] BAEL-1240 An introduction to Spring AOP (#2733) * BAL-36 File size api in java and apache commons IO * BAEL-282 grep in java - fixes after code review * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor library * BAEL-519 Added support for disruptor * BAEL-519 Moved all supporting classes to main source * BAEL-519 Moved all supporting classes to main source * BAEL-519 Moved asserts and test classes in test folder. * BAEL-519 moved test related producer and consumer to src. * BAEL-586 Guide to Guava BiMap. * BAEL-587 formatted code. * BAEL-519 LMAX Disruptor * BAEL-587 resolved merge * BAEL-587 Resolved merge * BAEL-519 Removed disruptor link. * BAEL-519 Reverted Guava changes * RFQ-587 Added disruptor as a separate module. * BAEL-519 Disruptor changes. * BAEL-519 Removed disruptor from core-java module. * BAEL-729 Expose additional information programmatically in /info endpoint of actuator. * BAEL-1240 Introduction to Spring AOP * BAEL-1240 - Spring AOP using configuration in XML. --- .../org/baeldung/logger/AdderAfterAspect.java | 13 ++ .../logger/AdderAfterReturnAspect.java | 13 ++ .../logger/AdderAfterThrowAspect.java | 13 ++ .../baeldung/logger/AdderAroundAspect.java | 18 +++ .../baeldung/logger/AdderBeforeAspect.java | 13 ++ .../java/org/baeldung/logger/SampleAdder.java | 12 ++ .../springAop-applicationContext.xml | 54 ++++++++ .../org/baeldung/logger/CalculatorTest.java | 29 +++++ .../springAop-applicationContext.xml | 54 ++++++++ spring-boot-actuator/.gitignore | 4 + spring-boot-actuator/README.MD | 0 spring-boot-actuator/pom.xml | 121 ++++++++++++++++++ .../java/org/baeldung/MainApplication.java | 13 ++ .../java/org/baeldung/config/MainConfig.java | 17 +++ .../src/main/resources/application.properties | 1 + .../config/ActuatorInfoIntegrationTest.java | 32 +++++ .../src/test/resources/expectedResponse.json | 1 + 17 files changed, 408 insertions(+) create mode 100644 spring-aop/src/main/java/org/baeldung/logger/AdderAfterAspect.java create mode 100644 spring-aop/src/main/java/org/baeldung/logger/AdderAfterReturnAspect.java create mode 100644 spring-aop/src/main/java/org/baeldung/logger/AdderAfterThrowAspect.java create mode 100644 spring-aop/src/main/java/org/baeldung/logger/AdderAroundAspect.java create mode 100644 spring-aop/src/main/java/org/baeldung/logger/AdderBeforeAspect.java create mode 100644 spring-aop/src/main/java/org/baeldung/logger/SampleAdder.java create mode 100644 spring-aop/src/main/resources/org.baeldung.logger/springAop-applicationContext.xml create mode 100644 spring-aop/src/test/java/org/baeldung/logger/CalculatorTest.java create mode 100644 spring-aop/src/test/resources/springAop-applicationContext.xml create mode 100644 spring-boot-actuator/.gitignore create mode 100644 spring-boot-actuator/README.MD create mode 100644 spring-boot-actuator/pom.xml create mode 100644 spring-boot-actuator/src/main/java/org/baeldung/MainApplication.java create mode 100644 spring-boot-actuator/src/main/java/org/baeldung/config/MainConfig.java create mode 100644 spring-boot-actuator/src/main/resources/application.properties create mode 100644 spring-boot-actuator/src/test/java/org/baeldung/config/ActuatorInfoIntegrationTest.java create mode 100644 spring-boot-actuator/src/test/resources/expectedResponse.json diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterAspect.java b/spring-aop/src/main/java/org/baeldung/logger/AdderAfterAspect.java new file mode 100644 index 0000000000..59afa38f06 --- /dev/null +++ b/spring-aop/src/main/java/org/baeldung/logger/AdderAfterAspect.java @@ -0,0 +1,13 @@ +package org.baeldung.logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AdderAfterAspect { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + public void afterAdvice() throws Throwable { + logger.info("I'm done calling the method"); + } +} diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterReturnAspect.java b/spring-aop/src/main/java/org/baeldung/logger/AdderAfterReturnAspect.java new file mode 100644 index 0000000000..a2b1959374 --- /dev/null +++ b/spring-aop/src/main/java/org/baeldung/logger/AdderAfterReturnAspect.java @@ -0,0 +1,13 @@ +package org.baeldung.logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AdderAfterReturnAspect { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + public void afterReturn(final Object returnValue) throws Throwable { + logger.info("value return was {}", returnValue); + } +} diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderAfterThrowAspect.java b/spring-aop/src/main/java/org/baeldung/logger/AdderAfterThrowAspect.java new file mode 100644 index 0000000000..1f19af05e4 --- /dev/null +++ b/spring-aop/src/main/java/org/baeldung/logger/AdderAfterThrowAspect.java @@ -0,0 +1,13 @@ +package org.baeldung.logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AdderAfterThrowAspect { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + public void afterThrow(final Exception exception) throws Throwable { + logger.info("Exception thrown was {}", exception.getMessage()); + } +} diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderAroundAspect.java b/spring-aop/src/main/java/org/baeldung/logger/AdderAroundAspect.java new file mode 100644 index 0000000000..fceba87d15 --- /dev/null +++ b/spring-aop/src/main/java/org/baeldung/logger/AdderAroundAspect.java @@ -0,0 +1,18 @@ +package org.baeldung.logger; + +import java.util.Arrays; +import org.aspectj.lang.ProceedingJoinPoint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AdderAroundAspect { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + public Object aroundAdvice(final ProceedingJoinPoint joinPoint) throws Throwable { + logger.info("Arguments passed to method are: " + Arrays.toString(joinPoint.getArgs())); + final Object result = joinPoint.proceed(); + logger.info("Result from method is: " + result); + return result; + } +} diff --git a/spring-aop/src/main/java/org/baeldung/logger/AdderBeforeAspect.java b/spring-aop/src/main/java/org/baeldung/logger/AdderBeforeAspect.java new file mode 100644 index 0000000000..750e7ba122 --- /dev/null +++ b/spring-aop/src/main/java/org/baeldung/logger/AdderBeforeAspect.java @@ -0,0 +1,13 @@ +package org.baeldung.logger; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AdderBeforeAspect { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + public void beforeAdvice() throws Throwable { + logger.info("I would be executed just before method starts"); + } +} diff --git a/spring-aop/src/main/java/org/baeldung/logger/SampleAdder.java b/spring-aop/src/main/java/org/baeldung/logger/SampleAdder.java new file mode 100644 index 0000000000..96fda1b0b9 --- /dev/null +++ b/spring-aop/src/main/java/org/baeldung/logger/SampleAdder.java @@ -0,0 +1,12 @@ +package org.baeldung.logger; + +public class SampleAdder { + + public int add(int a, int b) { + if (a < 0 || b < 0) { + throw new IllegalArgumentException("Make sure all the arguments are greater than zero."); + } + return a + b; + } + +} diff --git a/spring-aop/src/main/resources/org.baeldung.logger/springAop-applicationContext.xml b/spring-aop/src/main/resources/org.baeldung.logger/springAop-applicationContext.xml new file mode 100644 index 0000000000..058beaa7a1 --- /dev/null +++ b/spring-aop/src/main/resources/org.baeldung.logger/springAop-applicationContext.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-aop/src/test/java/org/baeldung/logger/CalculatorTest.java b/spring-aop/src/test/java/org/baeldung/logger/CalculatorTest.java new file mode 100644 index 0000000000..b1c88c67df --- /dev/null +++ b/spring-aop/src/test/java/org/baeldung/logger/CalculatorTest.java @@ -0,0 +1,29 @@ +package org.baeldung.logger; + +import static org.junit.Assert.assertEquals; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(value = {"classpath:springAop-applicationContext.xml"}) +public class CalculatorTest { + + @Autowired + private SampleAdder sampleAdder; + + @Test + public void whenAddValidValues_returnsSucessfully() { + final int addedValue = sampleAdder.add(12, 12); + + assertEquals(24, addedValue); + } + + @Test (expected = IllegalArgumentException.class) + public void whenAddInValidValues_throwsException() { + sampleAdder.add(12, -12); + } + +} diff --git a/spring-aop/src/test/resources/springAop-applicationContext.xml b/spring-aop/src/test/resources/springAop-applicationContext.xml new file mode 100644 index 0000000000..4d88bd3711 --- /dev/null +++ b/spring-aop/src/test/resources/springAop-applicationContext.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-boot-actuator/.gitignore b/spring-boot-actuator/.gitignore new file mode 100644 index 0000000000..60be5b80aa --- /dev/null +++ b/spring-boot-actuator/.gitignore @@ -0,0 +1,4 @@ +/target/ +.settings/ +.classpath +.project diff --git a/spring-boot-actuator/README.MD b/spring-boot-actuator/README.MD new file mode 100644 index 0000000000..e69de29bb2 diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml new file mode 100644 index 0000000000..bec126a247 --- /dev/null +++ b/spring-boot-actuator/pom.xml @@ -0,0 +1,121 @@ + + 4.0.0 + com.baeldung + spring-boot-actuator + 0.0.1-SNAPSHOT + jar + spring-boot + This is simple boot application for Spring boot actuator test + + + + org.springframework.boot + spring-boot-starter-parent + 1.5.2.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + spring-boot-actuator + + + src/main/resources + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*IntegrationTest.java + + + + + + + + + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + + + + + org.baeldung.MainApplication + UTF-8 + 1.8 + + + diff --git a/spring-boot-actuator/src/main/java/org/baeldung/MainApplication.java b/spring-boot-actuator/src/main/java/org/baeldung/MainApplication.java new file mode 100644 index 0000000000..7c9054dbf8 --- /dev/null +++ b/spring-boot-actuator/src/main/java/org/baeldung/MainApplication.java @@ -0,0 +1,13 @@ +package org.baeldung; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.baeldung.config.MainConfig; + +@SpringBootApplication +public class MainApplication { + + public static void main(String args[]) { + SpringApplication.run(MainConfig.class, args); + } +} diff --git a/spring-boot-actuator/src/main/java/org/baeldung/config/MainConfig.java b/spring-boot-actuator/src/main/java/org/baeldung/config/MainConfig.java new file mode 100644 index 0000000000..27c97cc006 --- /dev/null +++ b/spring-boot-actuator/src/main/java/org/baeldung/config/MainConfig.java @@ -0,0 +1,17 @@ +package org.baeldung.config; + +import java.util.Collections; +import org.springframework.boot.actuate.info.InfoContributor; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.annotation.Bean; + +@EnableAutoConfiguration +public class MainConfig { + + public MainConfig() {} + + @Bean + public InfoContributor getInfoContributor() { + return (infoBuilder) -> infoBuilder.withDetail("applicationInfo", Collections.singletonMap("ActiveUserCount", "10")); + } +} diff --git a/spring-boot-actuator/src/main/resources/application.properties b/spring-boot-actuator/src/main/resources/application.properties new file mode 100644 index 0000000000..835c78eda2 --- /dev/null +++ b/spring-boot-actuator/src/main/resources/application.properties @@ -0,0 +1 @@ +info.app.name=Sample application \ No newline at end of file diff --git a/spring-boot-actuator/src/test/java/org/baeldung/config/ActuatorInfoIntegrationTest.java b/spring-boot-actuator/src/test/java/org/baeldung/config/ActuatorInfoIntegrationTest.java new file mode 100644 index 0000000000..0b5e3b3eef --- /dev/null +++ b/spring-boot-actuator/src/test/java/org/baeldung/config/ActuatorInfoIntegrationTest.java @@ -0,0 +1,32 @@ +package org.baeldung.config; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; +import static org.junit.Assert.*; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = MainConfig.class) +@TestPropertySource(properties = { "security.basic.enabled=false" }) +public class ActuatorInfoIntegrationTest { + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void whenGetInfo_thenAdditionalInfoReturned() throws IOException { + final String expectedResponse = new String(Files.readAllBytes(Paths.get("src/test/resources/expectedResponse.json"))); + final ResponseEntity responseEntity = this.restTemplate.getForEntity("/info", String.class); + assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); + assertEquals(expectedResponse, responseEntity.getBody()); + } +} \ No newline at end of file diff --git a/spring-boot-actuator/src/test/resources/expectedResponse.json b/spring-boot-actuator/src/test/resources/expectedResponse.json new file mode 100644 index 0000000000..caa0bdbbf8 --- /dev/null +++ b/spring-boot-actuator/src/test/resources/expectedResponse.json @@ -0,0 +1 @@ +{"app":{"name":"Sample application"},"applicationInfo":{"ActiveUserCount":"10"}} \ No newline at end of file From 0bfe811063b07e5013a7582ba116800ee26a7a51 Mon Sep 17 00:00:00 2001 From: Adam InTae Gerard Date: Sun, 15 Oct 2017 19:05:55 -0700 Subject: [PATCH 029/197] BAEL-456: Introduction to Spring Cloud CLI - Bash Scripts (#2745) * BAEL-456: Introduction to Spring Cloud CLI - Bash Scripts * Readme added * Removed batch script artifacts --- spring-cloud-cli/README.md | 6 +++ spring-cloud-cli/decrypt.sh | 6 +++ spring-cloud-cli/encrypt.sh | 8 ++++ spring-cloud-cli/groovy.sh | 11 ++++++ spring-cloud-cli/groovy/eureka.groovy | 2 + spring-cloud-cli/groovy/restapi.groovy | 6 +++ spring-cloud-cli/install.sh | 52 ++++++++++++++++++++++++++ spring-cloud-cli/spring-cli-cmds.sh | 40 ++++++++++++++++++++ spring-cloud-cli/yml/configserver.yml | 4 ++ spring-cloud-cli/yml/eureka.yml | 8 ++++ 10 files changed, 143 insertions(+) create mode 100644 spring-cloud-cli/README.md create mode 100644 spring-cloud-cli/decrypt.sh create mode 100644 spring-cloud-cli/encrypt.sh create mode 100644 spring-cloud-cli/groovy.sh create mode 100644 spring-cloud-cli/groovy/eureka.groovy create mode 100644 spring-cloud-cli/groovy/restapi.groovy create mode 100644 spring-cloud-cli/install.sh create mode 100644 spring-cloud-cli/spring-cli-cmds.sh create mode 100644 spring-cloud-cli/yml/configserver.yml create mode 100644 spring-cloud-cli/yml/eureka.yml diff --git a/spring-cloud-cli/README.md b/spring-cloud-cli/README.md new file mode 100644 index 0000000000..5f83ab06fa --- /dev/null +++ b/spring-cloud-cli/README.md @@ -0,0 +1,6 @@ +========= + +## Spring Cloud CLI + +### Relevant Articles: +- [Introduction to Spring Cloud CLI](http://www.baeldung.com/introduction-to-spring-cloud-cli/) \ No newline at end of file diff --git a/spring-cloud-cli/decrypt.sh b/spring-cloud-cli/decrypt.sh new file mode 100644 index 0000000000..450ac156bc --- /dev/null +++ b/spring-cloud-cli/decrypt.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +echo Decrypting my_value as key my_key +spring decrypt --key my_key +echo +echo You should see: \"my_value\" +echo \ No newline at end of file diff --git a/spring-cloud-cli/encrypt.sh b/spring-cloud-cli/encrypt.sh new file mode 100644 index 0000000000..a5ea678952 --- /dev/null +++ b/spring-cloud-cli/encrypt.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +echo Encrypting my_value as key my_key +spring encrypt my_value --key my_key +echo +echo You should see something like: c93cb36ce1d09d7d62dffd156ef742faaa56f97f135ebd05e90355f80290ce6b +echo +echo You can use: \"{cipher}c93cb36ce1d09d7d62dffd156ef742faaa56f97f135ebd05e90355f80290ce6b\" in your configuration files +echo \ No newline at end of file diff --git a/spring-cloud-cli/groovy.sh b/spring-cloud-cli/groovy.sh new file mode 100644 index 0000000000..19f785989b --- /dev/null +++ b/spring-cloud-cli/groovy.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +echo "Run Groovy Rest API Server" +echo "spring run restapi.groovy" +echo "http://localhost:8080/api/get" +spring run restapi.groovy +echo +echo "Run Groovy Eureka Server" +echo "spring run eureka.groovy" +echo "http://localhost:8761" +spring run eureka.groovy +echo \ No newline at end of file diff --git a/spring-cloud-cli/groovy/eureka.groovy b/spring-cloud-cli/groovy/eureka.groovy new file mode 100644 index 0000000000..9f7acdd769 --- /dev/null +++ b/spring-cloud-cli/groovy/eureka.groovy @@ -0,0 +1,2 @@ +@EnableEurekaServer +class Eureka {} \ No newline at end of file diff --git a/spring-cloud-cli/groovy/restapi.groovy b/spring-cloud-cli/groovy/restapi.groovy new file mode 100644 index 0000000000..1526f7f825 --- /dev/null +++ b/spring-cloud-cli/groovy/restapi.groovy @@ -0,0 +1,6 @@ +@RestController +@RequestMapping('/api') +class api { + @GetMapping('/get') + def get() { [message: 'Hello'] } +} \ No newline at end of file diff --git a/spring-cloud-cli/install.sh b/spring-cloud-cli/install.sh new file mode 100644 index 0000000000..e01a8fc22e --- /dev/null +++ b/spring-cloud-cli/install.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash +echo See: https://howtoprogram.xyz/2016/08/28/install-spring-boot-command-line-interface-on-linux/ +echo + +echo "Setting up Java JDK 8" +echo See: http://tipsonubuntu.com/2016/07/31/install-oracle-java-8-9-ubuntu-16-04-linux-mint-18/ +sudo add-apt-repository ppa:webupd8team/java +sudo apt-get update +sudo apt-get install oracle-java8-set-default +echo + +echo "Downloading Spring Boot CLI 1.5.7" +wget http://repo.spring.io/release/org/springframework/boot/spring-boot-cli/1.5.7.RELEASE/spring-boot-cli-1.5.7.RELEASE-bin.tar.gz +echo + +echo "Extracting and Installing" +sudo mkdir /opt/spring-boot +sudo tar xzf spring-boot-cli-1.5.7.RELEASE-bin.tar.gz -C /opt/spring-boot +export SPRING_HOME=/opt/spring-boot/spring-1.5.7.RELEASE +export PATH=$SPRING_HOME/bin:$PATH +source /etc/profile +echo + +echo "Verifying Install of Spring CLI" +spring --version +echo + +echo "Maven Install" +sudo apt-get install maven +echo + +echo "Installing JCE" +sudo apt-get install p7zip-full +echo please go to: http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html +echo Download the jce_policy-8.zip after you agree to the terms +sleep 25 +sudo 7z x jce_policy-8.zip +sudo mv /usr/lib/jvm/java-8-oracle/jre/lib/security/local_policy.jar /usr/lib/jvm/java-8-oracle/jre/lib/security/local_policy.jar.backup +sudo mv /usr/lib/jvm/java-8-oracle/jre/lib/security/US_export_policy.jar /usr/lib/jvm/java-8-oracle/jre/lib/security/US_export_policy.jar.backup +sudo mv UnlimitedJCEPolicyJDK8/*.jar /usr/lib/jvm/java-8-oracle/jre/lib/security/ +echo + +echo "Installing Spring Cloud CLI" +sudo mkdir /opt/spring-boot/spring-1.5.7.RELEASE/lib/ext +sudo chown -R $USER:$USER /opt/spring-boot/spring-1.5.7.RELEASE/lib/ext +echo see: https://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-cli/ if manual install required +spring install org.springframework.cloud:spring-cloud-cli:1.3.2.RELEASE +echo + +echo "Verify Installation" +spring cloud --version +echo \ No newline at end of file diff --git a/spring-cloud-cli/spring-cli-cmds.sh b/spring-cloud-cli/spring-cli-cmds.sh new file mode 100644 index 0000000000..6947122a18 --- /dev/null +++ b/spring-cloud-cli/spring-cli-cmds.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash +echo "Run Config Server" +echo "spring cloud configserver" +echo "http://localhost:8888" +spring cloud configserver +echo +echo "Run Eureka Server" +echo "spring cloud eureka" +echo "http://localhost:8761" +spring cloud eureka +echo +echo "Run H2 Server" +echo "spring cloud h2" +echo "http://localhost:9095" +spring cloud h2 +echo +echo "Run Kafka Server" +echo "spring cloud kafka" +echo "http://localhost:9091" +spring cloud kafka +echo +echo "Run Zipkin Server" +echo "spring cloud zipkin" +echo "http://localhost:9411" +spring cloud zipkin +echo +echo "Run Dataflow Server" +echo "spring cloud dataflow" +echo "http://localhost:9393" +spring cloud dataflow +echo +echo "Run Hystrixdashboard Server" +echo "spring cloud hystrixdashboard" +echo "http://localhost:7979" +spring cloud hystrixdashboard +echo +echo "List Services" +echo "spring cloud --list" +spring cloud --list +echo \ No newline at end of file diff --git a/spring-cloud-cli/yml/configserver.yml b/spring-cloud-cli/yml/configserver.yml new file mode 100644 index 0000000000..2932bddcbf --- /dev/null +++ b/spring-cloud-cli/yml/configserver.yml @@ -0,0 +1,4 @@ +spring: + profiles: + active: git + cloud.config.server.git.uri: https://github.com/spring-cloud/spring-cloud-cli/tree/master/spring-cloud-launcher/spring-cloud-launcher-configserver \ No newline at end of file diff --git a/spring-cloud-cli/yml/eureka.yml b/spring-cloud-cli/yml/eureka.yml new file mode 100644 index 0000000000..9a21c1ce1c --- /dev/null +++ b/spring-cloud-cli/yml/eureka.yml @@ -0,0 +1,8 @@ +spring: + profiles: + active: git + cloud: + config: + server: + git: + uri: https://github.com/spring-cloud/spring-cloud-cli/tree/master/spring-cloud-launcher/spring-cloud-launcher-eureka \ No newline at end of file From 8cf77804c6e0e8e529ac32120cb993c6543dfb7e Mon Sep 17 00:00:00 2001 From: KevinGilmore Date: Sun, 15 Oct 2017 21:56:20 -0500 Subject: [PATCH 030/197] BAEL-1041: update README (#2746) * BAEL-973: updated README * BAEL-1069: Updated README * BAEL-817: add README file * BAEL-1084: README update * BAEL-960: Update README * BAEL-1155: updated README * BAEL-1041: updated README --- libraries/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/README.md b/libraries/README.md index 90762bfed6..243baf2c73 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -52,6 +52,7 @@ - [Introduction to Retrofit](http://www.baeldung.com/retrofit) - [Using Pairs in Java](http://www.baeldung.com/java-pairs) - [Apache Commons Collections Bag](http://www.baeldung.com/apache-commons-bag) +- [Introduction to Caffeine](http://www.baeldung.com/java-caching-caffeine) The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own. From 390f56616ff517b5e1a19e77b983aeea2edbb89f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mitja=20Jeseni=C4=8Dnik=20Kotnik?= Date: Tue, 17 Oct 2017 03:43:28 +0200 Subject: [PATCH 031/197] BAEL-624 How to setup WildFly (#2667) * bean dependency injection types tutorial * Edited and added the JUnit tests. * Edited the bean.xml files for new class names. * Deleted evaluation article. * first phase - TODO: JPA * Project for How to setup Wildfly * Deleted old project * Delted tests in EJB - test Servlet * LAST commit * Restored deleted files - accident * dependency corrections * reapply changes * eclipse Baeldung formatter file - format code * removed metadata --- .metadata/.lock | 0 .metadata/.log | 253 -- .metadata/.mylyn/.taskListIndex/segments.gen | Bin 20 -> 0 bytes .metadata/.mylyn/.taskListIndex/segments_1 | Bin 32 -> 0 bytes .metadata/.mylyn/repositories.xml.zip | Bin 358 -> 0 bytes .../RemoteSystemsTempFiles/.markers.snap | Bin 16 -> 0 bytes .../RemoteSystemsTempFiles/.syncinfo.snap | Bin 16 -> 0 bytes .../org.eclipse.jdt.core/state.dat | Bin 193784 -> 0 bytes .../org.eclipse.wst.jsdt.core/state.dat | Bin 302775 -> 0 bytes .../.root/.indexes/history.version | 1 - .../.root/.indexes/properties.index | Bin 230 -> 0 bytes .../.root/.indexes/properties.version | 1 - .../.root/.markers.snap | Bin 16 -> 0 bytes .../org.eclipse.core.resources/.root/1.tree | Bin 228 -> 0 bytes .../.safetable/org.eclipse.core.resources | Bin 882 -> 0 bytes .../.plugins/org.eclipse.core.resources/.snap | Bin 113 -> 0 bytes .../org.eclipse.e4.workbench/workbench.xmi | 3889 ----------------- .../org.eclipse.jdt.core/externalFilesCache | Bin 6503 -> 0 bytes .../externalLibsTimeStamps | Bin 5404 -> 0 bytes .../org.eclipse.jdt.core/indexNamesMap.txt | 1 - .../org.eclipse.jdt.core/invalidArchivesCache | Bin 4 -> 0 bytes .../org.eclipse.jdt.core/javaLikeNames.txt | 2 - .../org.eclipse.jdt.core/nonChainingJarsCache | Bin 4948 -> 0 bytes .../org.eclipse.jdt.core/savedIndexNames.txt | 23 - .../variablesAndContainers.dat | Bin 149 -> 0 bytes .../org.eclipse.jdt.launching/.install.xml | 6 - .../org.eclipse.jdt.ui/OpenTypeHistory.xml | 2 - .../QualifiedTypeNameHistory.xml | 2 - .../org.eclipse.jdt.ui/dialog_settings.xml | 13 - .../taglibindex/2996324989.dat | Bin 15826 -> 0 bytes .../dialog_settings.xml | 7 - .../org.eclipse.m2e.core/workspaceState.ser | Bin 545 -> 0 bytes .../.cache/clean-cache.properties | 2 - .metadata/.plugins/org.eclipse.rse.core/.log | 0 ...al.core.RSELocalConnectionInitializer.mark | 0 .../FP.local.files_0/node.properties | 57 - .../H.local_16/node.properties | 25 - .../node.properties | 7 - .metadata/.plugins/org.eclipse.rse.ui/.log | 0 .../org.eclipse.search/dialog_settings.xml | 70 - .../dialog_settings.xml | 5 - .../org.eclipse.ui.ide/dialog_settings.xml | 30 - .../dialog_settings.xml | 23 - .../dialog_settings.xml | 33 - .../org.eclipse.ui.workbench/workingsets.xml | 4 - .../org.eclipse.ui/dialog_settings.xml | 3 - .../org.eclipse.wst.internet.cache/cache.xml | 1 - .../externalLibsTimeStamps | Bin 503 -> 0 bytes .../variablesAndContainers.dat | Bin 840 -> 0 bytes .../OpenTypeHistory.xml | 2 - .../QualifiedTypeNameHistory.xml | 2 - .../org.eclipse.wst.server.core/monitors.xml | 2 - .../task-tags.properties | 3 - .../dialog_settings.xml | 5 - .../dialog_settings.xml | 8 - .../.state | 2 - .../metadata/.state | Bin 8765 -> 0 bytes .../properties/.state | Bin 1002 -> 0 bytes .../dashboard.feeds.blogs/-549550714.xml | 816 ---- .../dashboard.feeds.update/623127801.xml | 291 -- .metadata/version.ini | 1 - ejb/wildfly/pom.xml | 81 + ejb/wildfly/widlfly-web/pom.xml | 39 + .../src/main/java/TestEJBServlet.java | 33 + .../src/main/java/TestJPAServlet.java | 54 + .../src/main/webapp/WEB-INF/web.xml | 35 + ejb/wildfly/wildfly-ear/pom.xml | 62 + ejb/wildfly/wildfly-ejb-interfaces/pom.xml | 26 + .../java/wildfly/beans/UserBeanLocal.java | 13 + .../java/wildfly/beans/UserBeanRemote.java | 13 + ejb/wildfly/wildfly-ejb/pom.xml | 49 + .../src/main/java/wildfly/beans/UserBean.java | 24 + ejb/wildfly/wildfly-jpa/pom.xml | 20 + .../wildfly-jpa/src/main/java/model/User.java | 51 + .../main/resources/META-INF/persistence.xml | 9 + 75 files changed, 509 insertions(+), 5592 deletions(-) delete mode 100644 .metadata/.lock delete mode 100644 .metadata/.log delete mode 100644 .metadata/.mylyn/.taskListIndex/segments.gen delete mode 100644 .metadata/.mylyn/.taskListIndex/segments_1 delete mode 100644 .metadata/.mylyn/repositories.xml.zip delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.projects/handling-spring-static-resources/org.eclipse.jdt.core/state.dat delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.projects/handling-spring-static-resources/org.eclipse.wst.jsdt.core/state.dat delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/1.tree delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.snap delete mode 100644 .metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/externalFilesCache delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt delete mode 100644 .metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat delete mode 100644 .metadata/.plugins/org.eclipse.jdt.launching/.install.xml delete mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml delete mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml delete mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/2996324989.dat delete mode 100644 .metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser delete mode 100644 .metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/.log delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/initializerMarks/org.eclipse.rse.internal.core.RSELocalConnectionInitializer.mark delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/profiles/PRF.macbook-pro-de-elena-garcia-miro-p_9697497121/FP.local.files_0/node.properties delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/profiles/PRF.macbook-pro-de-elena-garcia-miro-p_9697497121/H.local_16/node.properties delete mode 100644 .metadata/.plugins/org.eclipse.rse.core/profiles/PRF.macbook-pro-de-elena-garcia-miro-p_9697497121/node.properties delete mode 100644 .metadata/.plugins/org.eclipse.rse.ui/.log delete mode 100644 .metadata/.plugins/org.eclipse.search/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml delete mode 100644 .metadata/.plugins/org.eclipse.ui/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.eclipse.wst.internet.cache/cache.xml delete mode 100644 .metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps delete mode 100644 .metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat delete mode 100644 .metadata/.plugins/org.eclipse.wst.jsdt.ui/OpenTypeHistory.xml delete mode 100644 .metadata/.plugins/org.eclipse.wst.jsdt.ui/QualifiedTypeNameHistory.xml delete mode 100644 .metadata/.plugins/org.eclipse.wst.server.core/monitors.xml delete mode 100644 .metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties delete mode 100644 .metadata/.plugins/org.eclipse.wst.sse.ui/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.jboss.tools.central/dialog_settings.xml delete mode 100644 .metadata/.plugins/org.springframework.ide.eclipse.aop.core/.state delete mode 100644 .metadata/.plugins/org.springframework.ide.eclipse.beans.core.metadata/metadata/.state delete mode 100644 .metadata/.plugins/org.springframework.ide.eclipse.beans.core.metadata/properties/.state delete mode 100644 .metadata/.plugins/org.springsource.ide.eclipse.dashboard.ui/feeds/dashboard.feeds.blogs/-549550714.xml delete mode 100644 .metadata/.plugins/org.springsource.ide.eclipse.dashboard.ui/feeds/dashboard.feeds.update/623127801.xml delete mode 100644 .metadata/version.ini create mode 100644 ejb/wildfly/pom.xml create mode 100644 ejb/wildfly/widlfly-web/pom.xml create mode 100644 ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java create mode 100644 ejb/wildfly/widlfly-web/src/main/java/TestJPAServlet.java create mode 100644 ejb/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml create mode 100644 ejb/wildfly/wildfly-ear/pom.xml create mode 100644 ejb/wildfly/wildfly-ejb-interfaces/pom.xml create mode 100644 ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java create mode 100644 ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java create mode 100644 ejb/wildfly/wildfly-ejb/pom.xml create mode 100644 ejb/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java create mode 100644 ejb/wildfly/wildfly-jpa/pom.xml create mode 100644 ejb/wildfly/wildfly-jpa/src/main/java/model/User.java create mode 100644 ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml diff --git a/.metadata/.lock b/.metadata/.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/.metadata/.log b/.metadata/.log deleted file mode 100644 index 93d3e86a61..0000000000 --- a/.metadata/.log +++ /dev/null @@ -1,253 +0,0 @@ - -!ENTRY org.eclipse.core.resources 4 2 2014-10-16 20:42:46.953 -!MESSAGE Problems occurred when invoking code from plug-in: "org.eclipse.core.resources". -!STACK 0 -java.lang.IllegalStateException: Registry Directory not available: /Users/Elena/tutorials/.metadata/.plugins/org.eclipse.pde.core/.p2/org.eclipse.equinox.p2.engine/profileRegistry. - at org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry.restore(SimpleProfileRegistry.java:480) - at org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry.getProfileMap(SimpleProfileRegistry.java:338) - at org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry.getProfiles(SimpleProfileRegistry.java:320) - at org.eclipse.pde.internal.core.target.P2TargetUtils.cleanOrphanedTargetDefinitionProfiles(P2TargetUtils.java:168) - at org.eclipse.pde.internal.core.PDECore$1.saving(PDECore.java:274) - at org.eclipse.core.internal.resources.SaveManager.executeLifecycle(SaveManager.java:383) - at org.eclipse.core.internal.resources.SaveManager$1.run(SaveManager.java:192) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.core.internal.resources.SaveManager.broadcastLifecycle(SaveManager.java:195) - at org.eclipse.core.internal.resources.SaveManager.save(SaveManager.java:1130) - at org.eclipse.core.internal.resources.Workspace.save(Workspace.java:2376) - at org.eclipse.ui.internal.ide.application.IDEWorkbenchAdvisor$5.run(IDEWorkbenchAdvisor.java:508) - at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:121) - -!ENTRY org.eclipse.ui.ide 4 4 2014-10-16 20:42:55.472 -!MESSAGE Problems saving workspace - -!ENTRY org.eclipse.ui.ide 4 1 2014-10-16 20:42:55.472 -!MESSAGE Problems occurred while trying to save the state of the workbench. -!SUBENTRY 1 org.eclipse.core.resources 4 568 2014-10-16 20:42:55.472 -!MESSAGE Could not write workspace metadata '/Users/Elena/tutorials/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree'. -!STACK 0 -java.io.FileNotFoundException: /Users/Elena/tutorials/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree (No such file or directory) - at java.io.FileOutputStream.open(Native Method) - at java.io.FileOutputStream.(FileOutputStream.java:213) - at java.io.FileOutputStream.(FileOutputStream.java:162) - at org.eclipse.core.internal.localstore.SafeFileOutputStream.(SafeFileOutputStream.java:51) - at org.eclipse.core.internal.resources.SaveManager.saveTree(SaveManager.java:1352) - at org.eclipse.core.internal.resources.SaveManager.save(SaveManager.java:1134) - at org.eclipse.core.internal.resources.Workspace.save(Workspace.java:2376) - at org.eclipse.ui.internal.ide.application.IDEWorkbenchAdvisor$5.run(IDEWorkbenchAdvisor.java:508) - at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:121) -!SESSION 2014-10-16 20:43:17.092 ----------------------------------------------- -eclipse.buildId=4.3.2.M20140221-1700 -java.version=1.8.0_20 -java.vendor=Oracle Corporation -BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=es_ES -Framework arguments: -product org.eclipse.epp.package.standard.product -keyring /Users/Elena/.eclipse_keyring -showlocation -Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.standard.product -keyring /Users/Elena/.eclipse_keyring -showlocation - -!ENTRY org.eclipse.core.net 1 0 2014-10-16 20:43:52.743 -!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences - -!ENTRY org.eclipse.jface 2 0 2014-10-16 20:43:53.942 -!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation. -!SUBENTRY 1 org.eclipse.jface 2 0 2014-10-16 20:43:53.943 -!MESSAGE A conflict occurred for COMMAND+SHIFT+F10: -Binding(COMMAND+SHIFT+F10, - ParameterizedCommand(Command(org.jboss.tools.common.ui.RegisterAsService,Register As Service, - Adds class name to META-INF/services/%serviceType% file after service type is selected in the dialog from types extended and implemented by the class., - Category(org.eclipse.ui.category.file,File,null,true), - org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@2df3545d, - ,,true),null), - org.eclipse.ui.defaultAcceleratorConfiguration, - org.eclipse.ui.contexts.window,,,system) -Binding(COMMAND+SHIFT+F10, - ParameterizedCommand(Command(org.eclipse.ui.window.showSystemMenu,Show System Menu, - Show the system menu, - Category(org.eclipse.ui.category.window,Window,null,true), - org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@75ad30c1, - ,,true),null), - org.eclipse.ui.defaultAcceleratorConfiguration, - org.eclipse.ui.contexts.window,,cocoa,system) -!SUBENTRY 1 org.eclipse.jface 2 0 2014-10-16 20:43:53.943 -!MESSAGE A conflict occurred for ALT+COMMAND+Z: -Binding(ALT+COMMAND+Z, - ParameterizedCommand(Command(org.jboss.tools.cdi.ui.open.namedBean,Open CDI Named Bean, - Open CDI Named Bean, - Category(org.eclipse.ui.category.navigate,Navigate,null,true), - org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@fe8aaeb, - ,,true),null), - org.eclipse.ui.defaultAcceleratorConfiguration, - org.eclipse.ui.contexts.window,,,system) -Binding(ALT+COMMAND+Z, - ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.surround.with.quickMenu,Surround With Quick Menu, - Shows the Surround With quick menu, - Category(org.eclipse.jdt.ui.category.source,Source,Java Source Actions,true), - org.eclipse.ui.internal.WorkbenchHandlerServiceHandler@6b9697ae, - ,,true),null), - org.eclipse.ui.defaultAcceleratorConfiguration, - org.eclipse.ui.contexts.window,,cocoa,system) - -!ENTRY com.android.ide.eclipse.adt 1 0 2014-10-16 20:44:03.016 -!MESSAGE No valid Android XML Editor Delegate found for file /handling-spring-static-resources/pom.xml [Res null, type null] - -!ENTRY org.eclipse.e4.ui.workbench 4 0 2014-10-16 20:44:06.875 -!MESSAGE -!STACK 0 -org.eclipse.core.runtime.AssertionFailedException: assertion failed: - at org.eclipse.core.runtime.Assert.isTrue(Assert.java:110) - at org.eclipse.core.runtime.Assert.isTrue(Assert.java:96) - at org.eclipse.ui.part.MultiPageEditorPart.setActivePage(MultiPageEditorPart.java:1081) - at org.eclipse.ui.forms.editor.FormEditor.setActivePage(FormEditor.java:607) - at org.eclipse.ui.part.MultiPageEditorPart.createPartControl(MultiPageEditorPart.java:362) - at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.createPartControl(CompatibilityPart.java:142) - at org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor.createPartControl(CompatibilityEditor.java:96) - at org.eclipse.ui.internal.e4.compatibility.CompatibilityPart.create(CompatibilityPart.java:323) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:483) - at org.eclipse.e4.core.internal.di.MethodRequestor.execute(MethodRequestor.java:56) - at org.eclipse.e4.core.internal.di.InjectorImpl.processAnnotated(InjectorImpl.java:877) - at org.eclipse.e4.core.internal.di.InjectorImpl.processAnnotated(InjectorImpl.java:857) - at org.eclipse.e4.core.internal.di.InjectorImpl.inject(InjectorImpl.java:119) - at org.eclipse.e4.core.internal.di.InjectorImpl.internalMake(InjectorImpl.java:333) - at org.eclipse.e4.core.internal.di.InjectorImpl.make(InjectorImpl.java:254) - at org.eclipse.e4.core.contexts.ContextInjectionFactory.make(ContextInjectionFactory.java:162) - at org.eclipse.e4.ui.internal.workbench.ReflectionContributionFactory.createFromBundle(ReflectionContributionFactory.java:102) - at org.eclipse.e4.ui.internal.workbench.ReflectionContributionFactory.doCreate(ReflectionContributionFactory.java:71) - at org.eclipse.e4.ui.internal.workbench.ReflectionContributionFactory.create(ReflectionContributionFactory.java:53) - at org.eclipse.e4.ui.workbench.renderers.swt.ContributedPartRenderer.createWidget(ContributedPartRenderer.java:129) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createWidget(PartRenderingEngine.java:949) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:633) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.StackRenderer.showTab(StackRenderer.java:1147) - at org.eclipse.e4.ui.workbench.renderers.swt.LazyStackRenderer.postProcess(LazyStackRenderer.java:96) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:649) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer.processContents(SWTPartRenderer.java:62) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:645) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$6.run(PartRenderingEngine.java:526) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:511) - at org.eclipse.e4.ui.workbench.renderers.swt.ElementReferenceRenderer.createWidget(ElementReferenceRenderer.java:61) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createWidget(PartRenderingEngine.java:949) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:633) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer.processContents(SWTPartRenderer.java:62) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:645) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer.processContents(SWTPartRenderer.java:62) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:645) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer.processContents(SWTPartRenderer.java:62) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:645) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer.processContents(SWTPartRenderer.java:62) - at org.eclipse.e4.ui.workbench.renderers.swt.PerspectiveRenderer.processContents(PerspectiveRenderer.java:59) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:645) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.PerspectiveStackRenderer.showTab(PerspectiveStackRenderer.java:103) - at org.eclipse.e4.ui.workbench.renderers.swt.LazyStackRenderer.postProcess(LazyStackRenderer.java:96) - at org.eclipse.e4.ui.workbench.renderers.swt.PerspectiveStackRenderer.postProcess(PerspectiveStackRenderer.java:77) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:649) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer.processContents(SWTPartRenderer.java:62) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:645) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.workbench.renderers.swt.SWTPartRenderer.processContents(SWTPartRenderer.java:62) - at org.eclipse.e4.ui.workbench.renderers.swt.WBWRenderer.processContents(WBWRenderer.java:581) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:645) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.safeCreateGui(PartRenderingEngine.java:735) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.access$2(PartRenderingEngine.java:706) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$7.run(PartRenderingEngine.java:700) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.createGui(PartRenderingEngine.java:685) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine$9.run(PartRenderingEngine.java:1042) - at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332) - at org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine.run(PartRenderingEngine.java:997) - at org.eclipse.e4.ui.internal.workbench.E4Workbench.createAndRunUI(E4Workbench.java:140) - at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:611) - at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332) - at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:567) - at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:150) - at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:124) - at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110) - at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:354) - at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:181) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:483) - at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:636) - at org.eclipse.equinox.launcher.Main.basicRun(Main.java:591) - at org.eclipse.equinox.launcher.Main.run(Main.java:1450) - -!ENTRY org.eclipse.mylyn.tasks.ui 4 0 2014-10-16 20:44:08.029 -!MESSAGE Could not load repository template extension contributed by org.eclipse.mylyn.bugzilla.ide with connectorKind bugzilla - -!ENTRY org.eclipse.mylyn.tasks.ui 4 0 2014-10-16 20:44:08.029 -!MESSAGE Could not load repository template extension contributed by org.springsource.ide.eclipse.dashboard.ui with connectorKind jira - -!ENTRY org.eclipse.mylyn.tasks.ui 4 0 2014-10-16 20:44:08.030 -!MESSAGE Could not load repository template extension contributed by org.springsource.ide.eclipse.dashboard.ui with connectorKind jira - -!ENTRY org.eclipse.ui.workbench 4 2 2014-10-16 20:44:30.651 -!MESSAGE Problems occurred when invoking code from plug-in: "org.eclipse.ui.workbench". -!STACK 0 -java.lang.NullPointerException - at org.springframework.ide.eclipse.maven.internal.legacyconversion.LegacyProjectChecker.earlyStartup(LegacyProjectChecker.java:36) - at org.eclipse.ui.internal.EarlyStartupRunnable.runEarlyStartup(EarlyStartupRunnable.java:87) - at org.eclipse.ui.internal.EarlyStartupRunnable.run(EarlyStartupRunnable.java:66) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.ui.internal.Workbench$55.run(Workbench.java:2555) - at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) - -!ENTRY org.eclipse.ui 4 4 2014-10-16 20:44:30.663 -!MESSAGE Unhandled Exception - -!ENTRY org.springframework.ide.eclipse.maven 4 0 2014-10-16 20:44:30.663 -!MESSAGE Unable to execute early startup code for an extension -!STACK 0 -java.lang.NullPointerException - at org.springframework.ide.eclipse.maven.internal.legacyconversion.LegacyProjectChecker.earlyStartup(LegacyProjectChecker.java:36) - at org.eclipse.ui.internal.EarlyStartupRunnable.runEarlyStartup(EarlyStartupRunnable.java:87) - at org.eclipse.ui.internal.EarlyStartupRunnable.run(EarlyStartupRunnable.java:66) - at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) - at org.eclipse.ui.internal.Workbench$55.run(Workbench.java:2555) - at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) diff --git a/.metadata/.mylyn/.taskListIndex/segments.gen b/.metadata/.mylyn/.taskListIndex/segments.gen deleted file mode 100644 index 63a7ec9a3ce3e4c844ffb7c8dd88e6eb3ff32ef5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20 QcmezW|NlP*2w;TK07=6G{r~^~ diff --git a/.metadata/.mylyn/.taskListIndex/segments_1 b/.metadata/.mylyn/.taskListIndex/segments_1 deleted file mode 100644 index 6b350b10f4c8cd3449df560f843ad0cd8b790c7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 acmezW|NmD821ZZmV-L(2&_KNM4j}-qCI^53 diff --git a/.metadata/.mylyn/repositories.xml.zip b/.metadata/.mylyn/repositories.xml.zip deleted file mode 100644 index 0f05d185fc98c73779e1c4d4bab8662414cb97f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmWIWW@Zs#;Nak3=vx}#%76p}fb62wg8bsllKi5~)MCAg+?=Ho?fnls@EqNL>ZG;! z4T++a5i_(J15W1&O^(`IZ}t0Do4>z{tD`P+$Jt4L@13v96K{WTwy&$8i!bkusYF+; zltmxkwbj2@M@N*re;IE>augr`lOvMEO-#yFXyBCFQopUUZ9)h zh3Kv)5A*^a%FR|~XPJB|W99cbtvNIPh^#$laemRZn%k$JP2!up)`@v<($`lG-b?Sl zW-b5Hq4YbXZGV>eD#_J(|5A%=9;mbT>zgd!VYBSU;!76K-#obVbMyB`fs9?-Eb9}# z^96XbbL^Nrec2VDe}6JEFa&rrGKnxC!US0k6eg$uJ%j?hS=m4;7=h3ZNDBc?WMBXQ DG24ga diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap deleted file mode 100644 index 91d6c541512db06197e1b732473d567ce4b92d6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 YcmZ?R*xjhShe1S2b=vdAllRF105-b@zW@LL diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap deleted file mode 100644 index 91d6c541512db06197e1b732473d567ce4b92d6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 YcmZ?R*xjhShe1S2b=vdAllRF105-b@zW@LL diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/handling-spring-static-resources/org.eclipse.jdt.core/state.dat b/.metadata/.plugins/org.eclipse.core.resources/.projects/handling-spring-static-resources/org.eclipse.jdt.core/state.dat deleted file mode 100644 index 1b30d3ec254208f116d5eb57c94573b4ebf90ab2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193784 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 diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/handling-spring-static-resources/org.eclipse.wst.jsdt.core/state.dat b/.metadata/.plugins/org.eclipse.core.resources/.projects/handling-spring-static-resources/org.eclipse.wst.jsdt.core/state.dat deleted file mode 100644 index ec854838416e0482e73bcfcc30c226182668a6e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302775 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 diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version deleted file mode 100644 index 25cb955ba2..0000000000 --- a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index deleted file mode 100644 index 3931c81cf2c33bb6cf2cb8a702dbb5441f644923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmZ{du?oU46h&Wxjt+`~_zOZL#acQ_aS)`7;-03Dn$jjEc?Cb;QkOb7-QnDGF9QGu z>;N+kJLfBbx-nfqp`AzJF}U7q46xMB5?acXe&L-IA+VSYGQehv9;U@Ws_kGQk1~=` znxv;x#vInu^}3|-0ainq@QFScXY;--&;ySW4%?r4AW?_ztL*;~L8@v@As%B~ZHaG~ JXSd5a{{VZ|N4Nk0 diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version deleted file mode 100644 index 6b2aaa7640..0000000000 --- a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap deleted file mode 100644 index 91d6c541512db06197e1b732473d567ce4b92d6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 YcmZ?R*xjhShe1S2b=vdAllRF105-b@zW@LL diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree deleted file mode 100644 index 693f619ff953b4d69f4381f9d2ef8e4774e23df5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmZ9HT?zs*4208e5#LvQ@eJEz2)?QpkUGe&TUweb?g_n?i9evu%RuIvkhsQLdda>0 z+YBvIIeCP!&kSF2h(27I+JcxWx&ls@640G7N$(FIj@5@$pc{=f5{nyJZlC4d#1)bE shwUfKYX4B>aIJfj-~Nl+Xdu1C>lB-v9sr diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources deleted file mode 100644 index 4d3c581705e78dd3cfa3e5e1ba35e5e74367dc56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 882 zcmZ?R*xjhShe1S2b=vdAllRFf=Oz}Hq!uZZBqrsgaw&&olq&cqmnayTDHs`8nV47^ zStta!h5$K+CR{10IVFj%6$P0^i6xo&dGYy0>3XTjIhh5;sd`x{C3?yEMX9!iCWgkQ zh6YAv7M2EvT>5$?MX5kRt^*OjKZETJ{M=K$yZo2~1@1`BNlh$r0XYW62}M9>q-Ex$ z7VDK}+NLGu6sL0GP??gNRGN-ZMTWod8Vn8xybb_4m9Q#!nBp}nw=$4gI2+01 uR10@w14R7e@H9%emlTx}4tB62nuIz&>*0ZpPZ2!K@hL(JaZr diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi deleted file mode 100644 index 6c1bf27179..0000000000 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ /dev/null @@ -1,3889 +0,0 @@ - - - - activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration - ModelMigrationProcessor.001 - - - - - - topLevel - - - Minimized - MinimizedByZoom - - - persp.actionSet:ajrefactoring - persp.actionSet:org.eclipse.contribution.xref.ui.XRefActionSet - persp.actionSet:org.eclipse.mylyn.context.ui.actionSet - persp.actionSet:org.eclipse.mylyn.doc.actionSet - persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation - persp.actionSet:org.eclipse.ui.cheatsheets.actionSet - persp.actionSet:org.eclipse.rse.core.search.searchActionSet - persp.actionSet:org.eclipse.search.searchActionSet - persp.actionSet:org.eclipse.ui.edit.text.actionSet.annotationNavigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.navigation - persp.actionSet:org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo - persp.actionSet:org.eclipse.ui.externaltools.ExternalToolsSet - persp.actionSet:org.eclipse.ui.actionSet.keyBindings - persp.actionSet:org.eclipse.ui.actionSet.openFiles - persp.actionSet:org.jboss.ide.eclipse.archives.ui.actions.Archives - persp.actionSet:org.jboss.tools.jst.web.ui.server.actionSet - persp.actionSet:org.jboss.tools.central - persp.actionSet:org.jboss.tools.common.model.ui.actionSet - persp.actionSet:org.springframework.ide.eclipse.aop.ui.ActionSet - persp.actionSet:org.springframework.ide.eclipse.aop.ui.matcher.actionSet - persp.actionSet:org.springframework.ide.eclipse.beans.ui.actionSet - persp.actionSet:org.springframework.ide.eclipse.beans.search.actionSet - persp.actionSet:org.springsource.ide.eclipse.quicksearch.actionSet - persp.actionSet:org.springsource.ide.eclipse.commons.launch.actionSet - persp.actionSet:com.springsource.sts.ide.ui.actionSet.workbench - persp.actionSet:org.eclipse.debug.ui.launchActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaActionSet - persp.actionSet:org.eclipse.jdt.ui.JavaElementCreationActionSet - persp.actionSet:org.eclipse.ui.NavigateActionSet - persp.viewSC:org.eclipse.jdt.ui.PackageExplorer - persp.viewSC:org.eclipse.jdt.ui.TypeHierarchy - persp.viewSC:org.eclipse.jdt.ui.SourceView - persp.viewSC:org.eclipse.jdt.ui.JavadocView - persp.viewSC:org.eclipse.search.ui.views.SearchView - persp.viewSC:org.eclipse.ui.console.ConsoleView - persp.viewSC:org.eclipse.ui.views.ContentOutline - persp.viewSC:org.eclipse.ui.views.ProblemView - persp.viewSC:org.eclipse.ui.views.ResourceNavigator - persp.viewSC:org.eclipse.ui.views.TaskList - persp.viewSC:org.eclipse.ui.views.ProgressView - persp.viewSC:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.ui.texteditor.TemplatesView - persp.viewSC:org.eclipse.pde.runtime.LogView - persp.newWizSC:org.eclipse.jdt.ui.wizards.JavaProjectWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewPackageCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewClassCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewEnumCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard - persp.newWizSC:org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard - persp.newWizSC:org.eclipse.ui.wizards.new.folder - persp.newWizSC:org.eclipse.ui.wizards.new.file - persp.newWizSC:org.eclipse.ui.editors.wizards.UntitledTextFileWizard - persp.perspSC:org.eclipse.jdt.ui.JavaBrowsingPerspective - persp.perspSC:org.eclipse.debug.ui.DebugPerspective - persp.newWizSC:com.android.ide.eclipse.adt.project.NewProjectWizard - persp.newWizSC:com.android.ide.eclipse.editors.wizards.NewXmlFileWizard - persp.actionSet:adt.actionSet.wizards - persp.actionSet:adt.actionSet.avdManager - persp.actionSet:adt.actionSet.lint - persp.actionSet:adt.actionSet.refactorings - persp.perspSC:com.android.ide.eclipse.ddms.Perspective - persp.perspSC:com.android.ide.eclipse.hierarchyviewer.PixelPerfectPespective - persp.perspSC:com.android.ide.eclipse.hierarchyviewer.TreeViewPerspective - persp.actionSet:ajelementCreation - persp.newWizSC:ajaspectwizard - persp.newWizSC:ajprojectwizard - persp.perspSC:org.eclipse.ajdt.ui.visualiser.AspectVisualizationPerspective - persp.viewSC:org.eclipse.ant.ui.views.AntView - persp.perspSC:org.eclipse.birt.report.designer.ui.ReportPerspective - persp.newWizSC:org.eclipse.birt.report.designer.ui.ide.wizards.NewReportWizard - persp.newWizSC:org.eclipse.birt.report.designer.ui.ide.wizards.NewTemplateWizard - persp.newWizSC:org.eclipse.birt.report.designer.ui.wizards.NewLibraryWizard - persp.showIn:org.eclipse.egit.ui.RepositoriesView - persp.actionSet:org.eclipse.debug.ui.breakpointActionSet - persp.actionSet:org.eclipse.jdt.debug.ui.JDTDebugActionSet - persp.newWizSC:org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard - persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet - persp.showIn:org.eclipse.jdt.ui.PackageExplorer - persp.showIn:org.eclipse.team.ui.GenericHistoryView - persp.showIn:org.eclipse.ui.views.ResourceNavigator - persp.showIn:org.eclipse.ui.navigator.ProjectExplorer - persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks - persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task - persp.perspSC:org.eclipse.wst.jsdt.ui.JavaPerspective - persp.actionSet:org.hibernate.eclipse.launch.actionset - persp.showIn:org.jboss.tools.forge.ui.view - persp.perspSC:org.jboss.tools.jst.web.ui.WebDevelopmentPerspective - persp.viewSC:org.jboss.tools.common.model.ui.navigator.NavigatorViewPart - persp.viewSC:org.springframework.ide.eclipse.aop.ui.navigator.aopReferenceModelNavigator - persp.viewSC:org.springframework.ide.eclipse.aop.ui.tracing.eventTraceView - persp.newWizSC:org.springframework.ide.eclipse.beans.ui.wizards.newBeansConfig - persp.newWizSC:org.eclipse.m2e.core.wizards.Maven2ProjectWizard - persp.newWizSC:com.springsource.sts.roo.ui.wizard.newRooProjectWizard - persp.showIn:org.springframework.ide.eclipse.ui.navigator.springExplorer - persp.viewSC:org.springframework.ide.eclipse.ui.navigator.springExplorer - persp.newWizSC:org.springframework.ide.eclipse.webflow.ui.wizard.newWebflowConfigWizard - persp.newWizSC:com.springsource.sts.wizard.template - persp.newWizSC:org.springsource.ide.eclipse.commons.gettingstarted.wizard.boot.NewSpringBootWizard - persp.newWizSC:org.springsource.ide.eclipse.gettingstarted.wizards.import.generic.newalias - - - - newtablook - org.eclipse.e4.primaryNavigationStack - - - - - - - - newtablook - - - - - - - - - - newtablook - - - - - - newtablook - org.eclipse.e4.secondaryNavigationStack - - - - - - newtablook - - - - - newtablook - - - - - - newtablook - - - - - - newtablook - org.eclipse.e4.secondaryDataStack - - - - - - - - - - - - - - - - active - Maximized - - - - - - - View - categoryTag:Help - - - View - categoryTag:General - active - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:Help - - - - newtablook - org.eclipse.e4.primaryDataStack - EditorStack - - - Editor - org.eclipse.wst.server.ui.editor - removeOnHide - - - - Editor - com.android.ide.eclipse.editors.CommonXmlEditor - removeOnHide - - - - Editor - com.android.ide.eclipse.editors.CommonXmlEditor - removeOnHide - - - - Editor - com.android.ide.eclipse.editors.CommonXmlEditor - removeOnHide - - - - Editor - com.android.ide.eclipse.editors.CommonXmlEditor - removeOnHide - - - - Editor - com.android.ide.eclipse.editors.CommonXmlEditor - removeOnHide - - - - Editor - com.android.ide.eclipse.editors.CommonXmlEditor - removeOnHide - - - - - - View - categoryTag:Java - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:Java - - - View - categoryTag:General - - - View - categoryTag:General - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:Java - - - - View - categoryTag:Java - - ViewMenu - menuContribution:menu - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:General - - - View - categoryTag:General - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:General - - - View - categoryTag:Ant - - - View - categoryTag:AspectJ - - - View - categoryTag:Git - - - View - categoryTag:Java - - - - View - categoryTag:Mylyn - - ViewMenu - menuContribution:menu - - - - - View - categoryTag:Spring - - - - View - categoryTag:Spring - - ViewMenu - menuContribution:menu - - - - - - View - categoryTag:Server - - ViewMenu - menuContribution:menu - - - - - - View - categoryTag:General - - ViewMenu - menuContribution:menu - - - - - - toolbarSeparator - - - - Draggable - - - - - - - - - - - - - - - toolbarSeparator - - - - Draggable - - - - - - Draggable - - - - - Draggable - - - - - Draggable - - - - - Draggable - - - - - - - - - - - Draggable - - - - - - - - Draggable - - - - - - - - Draggable - - - - - - - Draggable - - - - - - - - - - toolbarSeparator - - - - Draggable - - - - - - - - - - - - toolbarSeparator - - - - toolbarSeparator - - - - Draggable - - - - - - stretch - - - glue - - - - glue - - - Draggable - - - - - stretch - - - - Draggable - - - - - - TrimStack - - - - - - - - - - - - - platform:cocoa - - - - - - - - - - platform:cocoa - - - - - - - - - - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - platform:cocoa - - - - - platform:cocoa - - - - - platform:cocoa - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - - - - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - platform:cocoa - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - - platform:cocoa - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - platform:cocoa - - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - - - - - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - - platform:cocoa - - - - - - - - - platform:cocoa - - - - - - - platform:cocoa - - - - platform:cocoa - - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - - - - - - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - platform:cocoa - - - - - - - platform:cocoa - - - platform:cocoa - - - - - - - - - - - - - platform:cocoa - - - platform:cocoa - - - - - - - - - - - - - - - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - - platform:cocoa - - - - - - platform:cocoa - - - - platform:cocoa - - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - - - - - - platform:cocoa - - - - - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - - - - - - - - - - - platform:cocoa - - - - - - - platform:cocoa - - - - - - - - platform:cocoa - - - - - platform:cocoa - - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - - - platform:cocoa - - - - - platform:cocoa - - - - - platform:cocoa - - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - platform:cocoa - - - - - platform:cocoa - - - - - - - - platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - platform:cocoa - - - - - - - - - platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - platform:cocoa - - - - platform:cocoa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Editor - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Tracer for OpenGL ES - - - View - categoryTag:Tracer for OpenGL ES - - - View - categoryTag:Tracer for OpenGL ES - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:Android - - - View - categoryTag:AspectJ - - - View - categoryTag:Ant - - - View - categoryTag:Report Design - - - View - categoryTag:Report Design - - - View - categoryTag:Report Design - - - View - categoryTag:&C/C++ - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Make - - - View - categoryTag:&C/C++ - - - View - categoryTag:&C/C++ - - - View - categoryTag:&C/C++ - - - View - categoryTag:&C/C++ - - - View - categoryTag:&C/C++ - - - View - categoryTag:General - - - View - categoryTag:Visualiser - - - View - categoryTag:Visualiser - - - View - categoryTag:AspectJ - - - View - categoryTag:Data Management - - - View - categoryTag:Data Management - - - View - categoryTag:Data Management - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Debug - - - View - categoryTag:Git - - - View - categoryTag:Git - - - View - categoryTag:Git - - - View - categoryTag:Git - - - View - categoryTag:Git - - - View - categoryTag:General - - - View - categoryTag:Help - - - View - categoryTag:JPA - - - View - categoryTag:JPA - - - View - categoryTag:JavaServer Faces - - - View - categoryTag:JavaServer Faces - - - View - categoryTag:Maven - - - View - categoryTag:Maven - - - View - categoryTag:Mylyn - - - View - categoryTag:Mylyn - - - View - categoryTag:Mylyn - - - View - categoryTag:API Tools - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Plug-in Development - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:Remote Systems - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:CVS - - - View - categoryTag:CVS - - - View - categoryTag:Team - - - View - categoryTag:Team - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:Help - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:General - - - View - categoryTag:Debug - - - View - categoryTag:JavaScript - - - View - categoryTag:JavaScript - - - View - categoryTag:JavaScript - - - View - categoryTag:JavaScript - - - View - categoryTag:JavaScript - - - View - categoryTag:Server - - - View - categoryTag:XML - - - View - categoryTag:XML - - - View - categoryTag:Hibernate - - - View - categoryTag:Hibernate - - - View - categoryTag:Hibernate - - - View - categoryTag:Hibernate - - - View - categoryTag:JBoss Tools - - - View - categoryTag:Server - - - View - categoryTag:Forge - - - View - categoryTag:JMX - - - View - categoryTag:JBoss Tools Web - - - View - categoryTag:JBoss Tools Web - - - View - categoryTag:JBoss Tools Web - - - View - categoryTag:JBoss Tools - - - View - categoryTag:Seam - - - View - categoryTag:JBoss Tools Web Services - - - View - categoryTag:Spring - - - View - categoryTag:Spring - - - View - categoryTag:Spring - - - View - categoryTag:Spring - - - View - categoryTag:Spring - - - View - categoryTag:Spring - - - View - categoryTag:Spring - - - View - categoryTag:Debug - - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:Java Browsing - - - View - categoryTag:Java Browsing - - - View - categoryTag:Java Browsing - - - View - categoryTag:Java Browsing - - - View - categoryTag:Java - - - View - categoryTag:Java - - - View - categoryTag:Java - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache b/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache deleted file mode 100644 index dd4af88111a23b0a696d83b454b8b21d3101eb42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6503 zcmb_gUvJ|!4DaXJW~=#g-MtM(k#*~}*si^G54WLHY&DUiSe~S$=^X|Pdl-g2>@$y| zoy2lfIdO^tsU^~+NRdC1J~=tLJo!w1(oAVG5-g`Ap7)7jh1A?g^-QFi5M3yqPaYMW zvnQ!$)jDFULNTqm%*inB#i#M@=z4U1H`=8~4n5Lxp%SL!jH;8L$=$OyY)-EESW!@T zMVAzR?zu7xDsE^p+JMg$)dwlYM>gbJ2YLs2mAXw{g} zT>A||l4}d9x;n;&3qiF8^A;RsU9=s0E4k+ZxiyujUHyZ zbC0s4%0w#W_qL_D&UO^)jtZaHc)m>hDoa{G=@;Ic9<3l8Z60Xy{)3I*_!BQqe(~~J z@}ZHf7kQSjheF9EPnp6io_9C@McV_0|ItxhVpDZxBE2XIsf=HBgULMxTKn!8U#>F@ ze2Bsp$Jr9L;bo+|3#m=yoJ_cxF2*FALG#Ig4C0=<6TuG3{ijXt4uY^`p}2WogTJoUk)abnXbrmh@tbCe zXmWx68W*1AjrZznDR*8Jg54#G7iN@Cpj6;%U$woKQT|{d2D#%l?wi}I4^oO5H^|?L z18J@wbc(z`cxCU21MApL$|`{ZX9wR6*6-+0ODJw@>|e zuw6y4a!SQ-L2&@cE3%}5L+fCBneAgl3l7P53V)a9jeW?$avu-;cSwV`g?cGn01F@a zq$OKQCQq{b`-BqzPbj?<$KmY;7F=l$CUfY(Ad7h%u z-bU$q8#R{5+qJM)Mf8B`gboen#vTqu?^=Itjl#IVE!1%R8u*t%kBrjpkCEog3(!>+ zvqbkwxBnHo-~%(bL*}4u?_19x9)}sx_BRr8GR%5?9E*DH9$?d1RmVpmkz4%SKJ6eW zp6t(%n1j3nMF?SKXIk8}0>FXDw&B1Nd=okW`T_<(@Cf*$ANS761vtVkP(U6Mut%UD zfE=jrzmUFzT-LcHI0*LRF^RKjL#EJ=GEoO!P!x{}ADVBm6l4&FCHRFT5V#m(!LxRxnwInJFJS0n%K(MYQ4{H_W|1d&j;fG-$ zc!rx`p@dhc5S-=-BlTx!Kk92ZwOg=0ww)d8?z+&{gWIXVHA1ZlcXfJV1waMj#8AR;{2B8QV$=o$<+qiTC1~Y{XZyIk7JI9~MsDs{jB1 diff --git a/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps deleted file mode 100644 index 80b5f91d5487d47a2dda655a640b25e7adcab826..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5404 zcmb_gU5Fe-5N>}WdGZHQ2@xUzInd1X?e66+dC=T)Z0>U25p$O)x(S!wncm%*ot+t{ zd-wJN0ZAZ=5|V%-NaP+CUlK%}=*|jrX!U z-8J3SRrOVU)q@b)j3)3dMjeJr1~mzmn|bU|+hQ8GoF!~IHQcoJX@)_tQ`bxj=j5@u z5${j&;S5tTuHdCWbkARL=EHf<-VHY+gON>TmQUo?l{|Ht~#B zaR|6%nzV`dc|vn|ix{&+0mo1Vo*9M1>uLi}SSF_?XL!nLQfz1yOgkJKmO>1w5>9*t z#qNpUKR_E|6_h%#1Jf*%VZES|ma19)s`2utzubWyi(TcOZGdA<7=$r6v98eYD90y$ zLvrkI!CGu18iNp`{hz7_Z>L7Ft_C% z^l(;G+f->1UiTM`m){**KvLEsooEY+rBWqa_V&@M==n4=V|`4OmZR~dAlaEemN=YZ#d3l~7%zWv`3#ziwSIcA?2074YBH1g2ZCgg zze5{i_wGruqHP;=UU4*=m&_WJme9lRyzun^UrB)Z(A+At zJr-31A~xUy#p4CvZ^hRS9#B>gIYcosvKih;Fme5ri|FwcF|iJ`LwS&r#qL)xKb1}~ zhE;>+!TWV7B{%8~1i$1)LvWuSx(^j%kJyvjO{i&$4zX?OEI2fJ}EgrHW>%Kzq>pg=rp4iyRMnwaIh*4F*k7N-Ik&n;3>hOoig!XE=NB zSlHsVw518SrM_sE>$0VFydy;&=S&rW_Y}HI+#L4}ZLC8bzy}7M|lq|Ig z-3srBB-_+anY<%XE1VCM>3r;CL~l?T_%XgG0zpDE^xU^=(4I7P9tOjfuD8(<7%aGV z1VBSi1LV$wbuJ3M$W4}ieQy*!6q`^z*$Cvkz*K(?u=DO)Q7!Fgu?>u<@sh4qlz7Lx zk_6Yc&+bP%G8OjllBhztytr!Qu*XgQTpvH3_?e`q`Tz+iSSgx(f`!CX;OTRK3AeEI7RW_H20W*y$F3d7oy({d(f1W6JjQ3MYKPY^rb_6Yt;Q zfR#;9J;O2J1ja%1$`{#P=!w`oadi)Hm+U7VyP>dLuz#`J{bCn7^q+m3+$Wh;t(MV6 zD3<$DLL)JB={B%8g(id(ZMf4@=sTND_X6(!O9nA(1yG)g&WOt6*PWX$&+I|d|Hq#} zFV+g0gJSpW>7xU*{ROqfH6v(j#>?-Y{V1Ee5>O2;x}9I(+Q$cP)08FYSYJy;9$_pp!LX8qE{m-+RMMDp)7t<)EMn o@`*@7{~x=s4wX{dBQgrJ8{@VNwsBk}RXbNy8H%;#(W1uQc^EC2ui diff --git a/.metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt b/.metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt deleted file mode 100644 index 32e47edfaf..0000000000 --- a/.metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt +++ /dev/null @@ -1 +0,0 @@ -INDEX VERSION 1.127 diff --git a/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache b/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache deleted file mode 100644 index 593f4708db84ac8fd0f5cc47c634f38c013fe9e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZQzU|;|M00aO5 diff --git a/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt b/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt deleted file mode 100644 index 4644f71d79..0000000000 --- a/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt +++ /dev/null @@ -1,2 +0,0 @@ -aj -java \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache deleted file mode 100644 index d3473153f2a45d801866c97b04962b1bd2bc30a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4948 zcmb_gZExc?49@S_W~+I*?)GUYitHuV!*=bh`*0gN*;W%dvgAohnjSD<*oR?1dlYRa zcA{FzC)se0@8qo+ErlC0}?iG~Gbd3|HXZyZ0{4@kd?`e)Gz@<5Lr0Rx(f7L#fr8 zXH4Tw{tCJCLKae&;*E{Wsw|bZ{(S5Sc{20n9Os(MfK%wpU7s(hD#)DM#VR5BQqpuu z7F1?}B@{3?jK}e)wE?Mu4ODvHr_{lemQVnUfd0Z|uKphhD(7P|j)&cy2zF5Ke<8gG zfoJJTbNk$Y-PG&I(m9lv0b8T^)qY9rOM(5C6yD^OHwP^+UX`U_cd6#3oys}XI)3e| z(ARRxA5x_&={O|)_ICDODY4`hwFfICljgx>DEpIF_mLISfGDlX92G84&J9vk^u&^4 zo%(B`I`fo(`9x!EQ)*@$UHA>|&OJu|=rfuFw`|Co3JzrL^zR-cT5_nC3;6r~YHuHk zrrO6C{@Z84OYbk?8(8F#&jawTggof(B?YWsX@w@#eNH01l9ofynn0C|_BJ7mu!+ts z`kZr2^GKm*>P;a?4pd_xhOQEtMdX@b!evHAF?6eg?FhHgQqgD08^#KXHTC+T(eUzN zr|iYW5ssmkU8meu%b}akQLH(1WDL*!IodkY2{gxYnVMn6&i|Yo_LtEMdGCeMUmfC;4!ML)fsp2X%Q_H=Svp%3NhMLiF#RM)8wQx9wXXfmOYgz#DwqcLR(CjGGVslK~?^_o~qK%R&e0yU>`zekkK0oZzZM6?X80rzkjL^ z4$d7?ZED@2xO0F}|I!PJ*5s9sGe-_6eCriHa?0sY9gI%0!ccgI8)tNtafLTHMtWtr zI0B!LQz`_fGG(Ow3?oE)4X~=pXY6&p6{!M7;3rMXlIaH+Jn_Es5JV0}?51}DWp}dG zq!F3Ab8?oUJWEofzt{U?yE{SJ+n%7I;54w{3Dc5VMz&8;J-sPi`}7@`RQS$ogyK1x z3*vLl(t_Fr3jf&`?P{ci_x-hCmgJ@cx`ZJ!u6JVC!O_xnm{F8mxS7avjvWZk(d6gr zLo^kECJhpv>GJmzoNhaW&bn7Y*Ed>@x_vOyz8cPgpM-ERCf cXg8h;>>WHXm1Ku>a&AC0d0BV%!@1-nL+RRdAs&G?a zEmUKaTPAicO48sr2TwX$j!&n>V9&$Ew7Q){>hLAK86W74K2ZBVF?lC~!c-dhb5Sl- Cf*BnE diff --git a/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml b/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml deleted file mode 100644 index 81c4e135f3..0000000000 --- a/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml deleted file mode 100644 index a4ee3cbc9a..0000000000 --- a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml deleted file mode 100644 index 9e390f501d..0000000000 --- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml deleted file mode 100644 index a67b723f21..0000000000 --- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml +++ /dev/null @@ -1,13 +0,0 @@ - -
-
- - - - - -
-
- -
-
diff --git a/.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/2996324989.dat b/.metadata/.plugins/org.eclipse.jst.jsp.core/taglibindex/2996324989.dat deleted file mode 100644 index 9f3dde8c83f9ee3a0de403271ab008c8ea700e28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15826 zcmds8*;3<16z%8visS=i14Bq^-pGW>3kz! zudtSk zJG9Q#xyI%iZA;)lDv@hP`0U{`121pT_Fm&kIxI1hqdsa15$m~@fG+wr=;QAdFz4DM z%^lanXOU+QFsuQm#cn^f-+RKIR3NA8fSJ_qgId0pO;Wk5 zl5L*mBdIM^CC1%HsS<8|Kp&->QkrkRmoeW3_om4oIlb1>cZF{s(s-|FM*6zoRZMft zupjy3LGGu}7@`-FZ9MC5!KdVS(F1R5fYqECQj9w7T0<+kZvi}(`lLsHd!TF&JrfN* zq2x)*9^+x0Sb?ffQx6amk2(IP8peUfC##(&d=Idv_lqVF9ayavAYG`TH-JTK)xDNp z>e3lnZt+X>7VVX35%?%YhOS>>3D07-Q2O3MBTn_2@32Bqxqc2PzsLUPu)|+qw>{YM z&*}qO#*n9u#&ZY@@tW~i01I;FN?T8I?sa1nsK0mjL+-|S8sV>f zC&>e5w=Ke}4IGMUhW2o1^Q0fzgOk;H?ZL_NsXeEu4VbK9fqcY0%%(7s9m3aRrbw~` zK`XTQrWIHWLReIlM+?U`%uUQ75d+ADWWglr=|EP(J&Y&qylAgPJtpGW4Rzk!#EH&b zF}uY)pox6B&lJ8qqg&=QNwNHU7mKq@Odjam1t~Mpo?TDp5*`4FuQPJteos9Bx<2S8 zIY!9_T_Dan!{-?J(i8Nh&4}iIqBC4@%}eLg$5{7ya**$#RhXY;)XbbDV`DzMKwdSM zC^dKB8TBDE%TX>6+HgPflmlSZ)malp_dnnhhxAc5f{M1^%ZMQ`#CzsTA^ss0{S>cHOW|SB$udZDS7^))4i zpaJpEsvE{f7p)%_lSqT{L|e9N*f{zhGx#Q~K(Ri`8Wbx9L)bHVC(NRo`l9eQeS}D; z;eLJomaQAkv<>#)Yuy8KAF>s$Dw_JJ_^Gtk=_3UXR#NM%C6eOIJF_-upAP|}4<514 zRHZ0alrL5lwv7}YQASpOlJZ-Uu*MMocL9D4fQ_pcEc5dD!cDQGFM)lQH4MWt))C4A za#c_DquKJZn_`wuRr?O%$b+?l?GYvQJGF(}>YxU^gXh7UGU8?AKV#ch%6IBso;I$2 zt6hnje zR^5GCc}h8+c@UGqa-n$I{ASRfckXyQ>OpHPY9M-KSDFuXWCY0XZMQSlINf$k2h=Bg z<^~7lg?iWCKcgQd+Q0)=dpb(XKi}RBI>4GT-$f?NorPmyA~&lpaVAXN`2==?Q2_4` z)&~n|W^%KXdzYPyMLd>E%vyxGyiEcu=gD<*=g6)Vml!i%G`) z_cC$jZf~-P$0WCz{bG?9w^)R8>h^7_rkimVnP;@M&gR3P{eB2D2}|g~8+Z-@EL|PhQEOS{{S>jX=2kWR zvLpEMc9hsu`s(a?&D0hThh9zKvp^6#OgV`8gId<%jRiG8b$QAirSY>mn7&4`!Lp}TYt>pUZP z|MWVFz9p0wvu!7(hqE%&GFjhA;rl)GNBOo)5B&GxLokM4;h7rwM_Ap%NW17nX|E5? z-EoHX8O8gzS! -
-
- - -
-
diff --git a/.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser b/.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser deleted file mode 100644 index a02fb4650f8e45ea2e1df34b92eecd43f1edbfc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmcJL&rSj{5QiraP%%aYY8WvL*x`K z0&j*#F!AW!U6v5y&4azPo!`vYFMa-kj3GEu&+18`F};tP($2UM-Y=y4`TfxwjkZ&ebzwPDx*8xEp#lqe zx5Ed#D0$!)o0df2AG%POI##*nH$n<4&{$YaTKiVW;w9H}eGTmO1z{HhYkKeiX%{vq zskP=A(=0z!bZ0d8@RY2$<=$*+WtP-cH$mx8TPQfJ!W>pEIhE3Gd4I<_DD6c*y&k)> zScsi-(~hJv3** -
-
- -
-
- -
-
- - - - - -
- -
-
- - - - - - - - - - -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - - - - -
-
diff --git a/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml deleted file mode 100644 index 50f1edb316..0000000000 --- a/.metadata/.plugins/org.eclipse.ui.editors/dialog_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - -
-
-
-
diff --git a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml deleted file mode 100644 index 24f718e1ca..0000000000 --- a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml +++ /dev/null @@ -1,30 +0,0 @@ - -
-
- - - - - -
-
- - - - - - - - - - - -
- - - - - -
-
-
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml deleted file mode 100644 index b9f4ca805b..0000000000 --- a/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml +++ /dev/null @@ -1,23 +0,0 @@ - -
-
- - - - - - - - - - - -
-
- - - - - -
-
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml deleted file mode 100644 index 1ae420da85..0000000000 --- a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ /dev/null @@ -1,33 +0,0 @@ - -
-
- - - - - - - - - - -
-
- - - - -
-
- - - - - - - - - - -
-
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml deleted file mode 100644 index 61cd82aa2a..0000000000 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui/dialog_settings.xml deleted file mode 100644 index 5ca0b77690..0000000000 --- a/.metadata/.plugins/org.eclipse.ui/dialog_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - -
-
diff --git a/.metadata/.plugins/org.eclipse.wst.internet.cache/cache.xml b/.metadata/.plugins/org.eclipse.wst.internet.cache/cache.xml deleted file mode 100644 index 1b1be0f54e..0000000000 --- a/.metadata/.plugins/org.eclipse.wst.internet.cache/cache.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps b/.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps deleted file mode 100644 index 35109d64d3e3256206edf3012bd512e0c531ec6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmb`=!3n}Z5J1uKU={YT1A+|*9>g3Cxe1%>5LY(YFtZ`11JBW;2P?24n=vR!1$+Pe z2LMYrVJgIeJ4dy~&<4*|J3&=Z&_)N1s&Q>;YeCPYqQcomNOcm_MNCkIXF_Ll)@(^I zXWxy#%+|(tV*#+(uZH#oMPx?{ZU0vC!}|$)yzh|3#iW-&)dUQm8>Ddo#2gbF` diff --git a/.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat b/.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat deleted file mode 100644 index ba9a8170ae5ec89bdb5d171754fea4c255312989..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 840 zcmb`EO-{ow5QT?QevZKbs4W&f0H7>Ds7O_-?m(_HN{k#knsF3*d+dY;q*lr%3u|O) z-n{S40Kg0YF5&~YE0xQwam9jb>Pk?-=mjDBhBR{QN!_vi-cun^TT?TNmV@}>JP4~A zr^~1muj}md`F*u{d|74dPLXu~%x18YTSj7;S#(N2#rhljJ{{@C}5@risJ>E62Whp3&$mj({ox&l3I zfK%JkF#Vl=qa>68=NdjH#_2b(GcNb-2uWJ - diff --git a/.metadata/.plugins/org.eclipse.wst.jsdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.wst.jsdt.ui/QualifiedTypeNameHistory.xml deleted file mode 100644 index 9e390f501d..0000000000 --- a/.metadata/.plugins/org.eclipse.wst.jsdt.ui/QualifiedTypeNameHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/.metadata/.plugins/org.eclipse.wst.server.core/monitors.xml b/.metadata/.plugins/org.eclipse.wst.server.core/monitors.xml deleted file mode 100644 index 0bd2033fef..0000000000 --- a/.metadata/.plugins/org.eclipse.wst.server.core/monitors.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties b/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties deleted file mode 100644 index 4acf7ba3bc..0000000000 --- a/.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties +++ /dev/null @@ -1,3 +0,0 @@ -# -#Thu Oct 16 20:44:26 PET 2014 -task-tag-projects-already-scanned= diff --git a/.metadata/.plugins/org.eclipse.wst.sse.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.wst.sse.ui/dialog_settings.xml deleted file mode 100644 index 63fae25e8f..0000000000 --- a/.metadata/.plugins/org.eclipse.wst.sse.ui/dialog_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - -
-
-
-
diff --git a/.metadata/.plugins/org.jboss.tools.central/dialog_settings.xml b/.metadata/.plugins/org.jboss.tools.central/dialog_settings.xml deleted file mode 100644 index f977cc958a..0000000000 --- a/.metadata/.plugins/org.jboss.tools.central/dialog_settings.xml +++ /dev/null @@ -1,8 +0,0 @@ - -
-
- - - -
-
diff --git a/.metadata/.plugins/org.springframework.ide.eclipse.aop.core/.state b/.metadata/.plugins/org.springframework.ide.eclipse.aop.core/.state deleted file mode 100644 index 8a7bbde21f..0000000000 --- a/.metadata/.plugins/org.springframework.ide.eclipse.aop.core/.state +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.metadata/.plugins/org.springframework.ide.eclipse.beans.core.metadata/metadata/.state b/.metadata/.plugins/org.springframework.ide.eclipse.beans.core.metadata/metadata/.state deleted file mode 100644 index 9fa791da421b3fb5dc677f2f61a85c116ef22a46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8765 zcmeHMU2GIp6u#XSQlQ~48jT{v*ccFYCX}{dD=DS4bjfakZm|Xsy*qQeJ9KttxN~>A zE6pY*7=HprqY#Wy6A}|78iG+oUU)LW80Enj^+9~_LDcwS&?g@}_s;C@?C#Jl&~Cel zP1^0uCILO z#dTX7QDX=#u}M4$k43OO9zredDw@#7*a6h+E^UT39td;kGM6qFrOOr4TceJ^?u>;H zS_Z$XQZ&E4x^ji>!xKHdZEru$0tg97%fUctdIsiYtmzED_S75ewgync09ve@SRKF$ zGiipRwZ4*cQyI6VVFGwiY_Kpa$M&7wu;J?AKR`wpHQ8B1VMz9eLhP1HcDF`h10Vsq zw@>%P)*;gv!y4sV$xCg&Mvq=u!a<-YIBgMp@1@me-aNNs|D?0GV~V}KF&pev*xnRL z5tZ*vP}9(!BNVLfOZ5!@0@jBh#297-^yr+1tlbj^j_JfJY}3!@KmRCcevtPl>e+^n zeFWt|GXJ{>V&(t$roe!qa~r$16KvQKQziOjTUP=bs;(LFplwm{0v^(oASJe$q6)Dm zH+9)mk&{?6Q^OaMhntdPmxlW?v5QM3WMxhSG-}U-OpWlQsRQI zd0_{txiJ7Cw9{{&mu?Qx1g%7L?t+5u1M-a%HwF`{8m~ zIL$6`n!xH^)vPWhj+;+_;guoXb8*wnQ`dj{*I~{6YJ#h?29k*HK{sD%dpUQp?^8%& zhnPs^0HFqD?`wayuk`W)!bf{%_h~4NMsyro-`YZ#PB({y?#7X>j z2p&{|nyNV^V98kqjMrD4+$B{HF;rVUeIaw$T0voo2K~~Hx3-mL`Q8*WCp1bbbG)}R z;;FQw&YFWxKOme+G$t;$S;^BPK?ph2^}6h+4IbX ztGrfoKW<|vHoH7KM2s{;cZ>fcHPO?bTvn#8g5B2$hCZI(cVL?+Q3A6!jb)t%o!^Cd zga+L^g>-x&;2!wwf z;_C^QqJ0dVpWie{m`MWh�EgqCyQ9*0M+#e4S0^{3A~eScVt?3XAo zA+!hioYWaeiEg1TgTc4;fT^w&(+t(y^_2oNH<7`sf|HbsHIAaHlgQFGzSNLgwt|Ie zN}(0Z)rtW*p67CV`Fv6*-MPJDoYu{aKUTo~0fy#S9}n@o*|us+E(V5z;NCk$VFDQ; zd@T4RpSESOw1$U>o48CnSbh6x!% zEAp-uYiVcyNQTe2YL>~MHK@1h;Bjg(o6h?NACk6zTRh^irLHakeJ|50n?2k(pK!&AM*DzF*9V!dk1$;y!*rEkh=JA> z1q=)f{6H*IS_IQh*l}>}LFM+2MzbwTm>3wqCJ6vNs7IU!VP?pi`AmqItZB={!05)n zm6M;C;+B|Pl3!F&#GrxIq@4WZ>|(v3RA6`%CFYg*0J&+QD|B>DWW5HO;lsdET$z_# z!k~{mD8Rb)QFN;W12q6c0_b)VVr^9M%g;+o%q#+FP3SfQy{35dIwlnZ{hM48SejazngY_BQIwyTS(RD@^u2Sbeb8f|?>&J@tR%4{ z73dB#BFyqH&r3|oNkuly`2PBxYjg8g!eW%c-hqLkxR9X^XflZ81g4cyF+5>VP*4E? Da!f9r diff --git a/.metadata/.plugins/org.springsource.ide.eclipse.dashboard.ui/feeds/dashboard.feeds.blogs/-549550714.xml b/.metadata/.plugins/org.springsource.ide.eclipse.dashboard.ui/feeds/dashboard.feeds.blogs/-549550714.xml deleted file mode 100644 index ff2193fcc3..0000000000 --- a/.metadata/.plugins/org.springsource.ide.eclipse.dashboard.ui/feeds/dashboard.feeds.blogs/-549550714.xml +++ /dev/null @@ -1,816 +0,0 @@ - - - Spring - - - http://spring.io/blog.atom - https://spring.io/favicon.ico - 2014-10-15T13:20:00Z - - Whats new in Spring Data Evans? - - - - Christoph Strobl - - tag:spring.io,2014-09-17:1764 - 2014-10-15T13:20:00Z - <p>Spring Data Release <a href="https://spring.io/blog/2014/09/09/spring-data-release-train-evans-goes-ga">Evans</a> has been around for a while and it's more than time to finally introduce you to the latest and greatest features we shipped with it.</p> - -<p>There's a lot to cover since major enhancements have gone into the commons module. Those changes already have made it into some store modules and will go on and sneak their way into others over time, too. All of them are already available for at least <a href="http://projects.spring.io/spring-data-jpa/">Spring Data JPA</a>. That said, lets jump right in.</p> - -<h2> -<a name="user-content-advanced-support-for-java-8" class="anchor" href="#advanced-support-for-java-8" aria-hidden="true"><span class="octicon octicon-link"></span></a>Advanced support for Java 8</h2> - -<p>Java8 has now been around for a while and previous Spring Data release trains already added fundamental support for some of those. With the Evans release train we extended the support significantly.</p> - -<p>Java 8's <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Optional.html"><code>Optional</code></a> has been a supported return since the <a href="https://spring.io/blog/2014/05/21/what-s-new-in-spring-data-dijkstra">Dijkstra release</a> freeing you of having <code>null</code> checks spread across your code. We simply wrap and unwrap values for you when used as return types with repositories.</p> - -<p>As of the Evans release <a href="http://docs.oracle.com/javase/tutorial/java/IandI/defaultmethods.html">default methods</a> can be used in repository interfaces to e.g. forward parts of the parameters handed into the method to other query methods.</p> - -<div class="highlight highlight-java"><pre><span class="kd">interface</span> <span class="nc">PersonRepository</span> <span class="kd">extends</span> <span class="n">Repository</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">,</span> <span class="n">Long</span><span class="o">&gt;</span> <span class="o">{</span> - - <span class="n">Optional</span><span class="o">&lt;</span><span class="n">Customer</span><span class="o">&gt;</span> <span class="nf">findByLastname</span><span class="o">(</span><span class="n">String</span> <span class="n">lastname</span><span class="o">);</span> - - <span class="k">default</span> <span class="n">Optional</span><span class="o">&lt;</span><span class="n">Customer</span><span class="o">&gt;</span> <span class="nf">findByLastname</span><span class="o">(</span><span class="n">Customer</span> <span class="n">customer</span><span class="o">)</span> <span class="o">{</span> - <span class="k">return</span> <span class="nf">findByLastname</span><span class="o">(</span><span class="n">customer</span> <span class="o">==</span> <span class="kc">null</span> <span class="o">?</span> <span class="kc">null</span> <span class="o">:</span> <span class="n">customer</span><span class="o">.</span><span class="na">getLastname</span><span class="o">());</span> - <span class="o">}</span> -<span class="o">}</span> -</pre></div> - -<h2> -<a name="user-content-enhanced-multi-store-support" class="anchor" href="#enhanced-multi-store-support" aria-hidden="true"><span class="octicon octicon-link"></span></a>Enhanced multi-store support</h2> - -<p>Configuring your application to make use of different Spring Data modules has not been without issues so far. E.g. you might want to combine JPA and MongoDB where <code>Customer</code> happens to be a JPA Entity while <code>Order</code> is a MongoDB Document both persisted via according repository interfaces.</p> - -<div class="highlight highlight-java"><pre><span class="nd">@Entity</span> -<span class="kd">class</span> <span class="nc">Customer</span> <span class="o">{</span> - - <span class="nd">@Id</span> <span class="nd">@GeneratedValue</span> <span class="n">Long</span> <span class="n">id</span><span class="o">;</span> - <span class="n">String</span> <span class="n">firstname</span><span class="o">,</span> <span class="n">lastname</span><span class="o">;</span> - <span class="c1">// ...</span> -<span class="o">}</span> - -<span class="nd">@Document</span> -<span class="kd">class</span> <span class="nc">Order</span> <span class="o">{</span> - - <span class="nd">@Id</span> <span class="n">String</span> <span class="n">id</span><span class="o">;</span> - <span class="n">Long</span> <span class="n">customerId</span><span class="o">;</span> - <span class="n">Date</span> <span class="n">orderDate</span><span class="o">;</span> - <span class="c1">// ...</span> -<span class="o">}</span> - -<span class="kd">interface</span> <span class="nc">CustomerRepository</span> <span class="kd">extends</span> <span class="n">CrudRepository</span><span class="o">&lt;</span><span class="n">Customer</span><span class="o">,</span> <span class="n">Long</span><span class="o">&gt;</span> <span class="o">{}</span> - -<span class="kd">interface</span> <span class="nc">OrderRepository</span> <span class="kd">extends</span> <span class="n">CrudRepository</span><span class="o">&lt;</span><span class="n">Order</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="o">{}</span> -</pre></div> - -<p>Until the Spring Data Evans release you had to manually configure the repository setup for MongoDB and JPA to mutually exclude the interfaces not relevant for the given store. Users usually used separate packages for that.</p> - -<p>Now the repository setup detects that multiple Spring Data modules are on the classpath, and automatically restricts the repository scanning and inspect the domain type used by a given repository for store specific annotations such as <code>@Entity</code> and <code>@Document</code> to determine the concrete implementation they belong to. E.g. the Spring Data MongoDB module would drop the (accidentally) detected <code>CustomerRepository</code> as we don't find an <code>@Document</code> annotation.</p> - -<h3> -<a name="user-content-statically-limiting-results" class="anchor" href="#statically-limiting-results" aria-hidden="true"><span class="octicon octicon-link"></span></a>Statically limiting results</h3> - -<p>Dynamically limiting results is no new concept since Spring Data has had <code>Pagable</code> as abstraction since its inception and I bet nearly every Spring Data user is already familiar with something like this:</p> - -<div class="highlight highlight-java"><pre><span class="n">List</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;</span> <span class="nf">findByLastname</span><span class="o">(</span><span class="n">String</span> <span class="n">lastname</span><span class="o">,</span> <span class="n">Pageable</span> <span class="n">page</span><span class="o">)</span> -</pre></div> - -<p>This method declaration provides quite some flexibility: clients define the page number, size and a sort order of the elements they want to access. This is great if these values change dynamically (e.g. when you traverse the result set page by page).</p> - -<p>But what if you're always only interested in e.g. the first 10 results and you always want them to be ordered by lastname? This could've been achieved by statically defining a <code>PageRequest</code> and reusing that for every method invocation. However, that still required the client to hand in the special <code>PageRequest</code>. </p> - -<p>As of Spring Data Evans we now offer you a convenient way to explicitly limit the result set to a certain number of elements by using the keywords <code>top</code> and <code>first</code> followed by an optional positive numeric value (defaulting to 1).</p> - -<div class="highlight highlight-java"><pre><span class="n">List</span><span class="o">&lt;</span><span class="n">Person</span><span class="o">&gt;</span> <span class="nf">findTop10ByLastnameOrderByFirstnameDesc</span><span class="o">(</span><span class="n">String</span> <span class="n">lastname</span><span class="o">);</span> -</pre></div> - -<h2> -<a name="user-content-mongodb-full-text-search" class="anchor" href="#mongodb-full-text-search" aria-hidden="true"><span class="octicon octicon-link"></span></a>MongoDB Full Text Search</h2> - -<p>The Evans RC1 release introduced basic <a href="https://spring.io/blog/2014/07/17/text-search-your-documents-with-spring-data-mongodb">text index support</a> for MongoDB 2.6. Using <code>@TextIndexed</code> allows you to mark properties you want to have text search enabled for so that we can go on and create the index for you. Note, that placing <code>@TextIndexed</code> on properties referring to complex types will index all properties of that type. Since scoring is a fundamental part of full text search the <code>@TextScore</code> annotation will assert that any full text query returns the documents score allowing you to order them by relevance.</p> - -<div class="highlight highlight-java"><pre><span class="nd">@Document</span> -<span class="kd">class</span> <span class="nc">BlogPost</span> <span class="o">{</span> - - <span class="nd">@Id</span> <span class="n">String</span> <span class="n">id</span><span class="o">;</span> - <span class="nd">@TextIndexed</span><span class="o">(</span><span class="n">weight</span> <span class="o">=</span> <span class="mi">3</span><span class="o">)</span> <span class="n">String</span> <span class="n">title</span><span class="o">;</span> - <span class="nd">@TextIndexed</span><span class="o">(</span><span class="n">weight</span> <span class="o">=</span> <span class="mi">2</span><span class="o">)</span> <span class="n">String</span> <span class="n">content</span><span class="o">;</span> - <span class="nd">@TextIndexed</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">categories</span><span class="o">;</span> - <span class="nd">@TextScore</span> <span class="n">Float</span> <span class="n">score</span><span class="o">;</span> -<span class="o">}</span> -</pre></div> - -<p>That in place, we extended the repository support to accept a <code>TextCriteria</code> instance that will define detailed options about the text search that shall be executed: the terms to be searched for, language options etc.</p> - -<div class="highlight highlight-java"><pre><span class="kd">interface</span> <span class="nc">BlogPostRepository</span> <span class="kd">extends</span> <span class="n">CrudRepository</span><span class="o">&lt;</span><span class="n">BlogPost</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="o">{</span> - - <span class="n">Page</span><span class="o">&lt;</span><span class="n">BlogPost</span><span class="o">&gt;</span> <span class="nf">findBy</span><span class="o">(</span><span class="n">TextCriteria</span> <span class="n">criteria</span><span class="o">,</span> <span class="n">Pageable</span> <span class="n">page</span><span class="o">);</span> - - <span class="n">List</span><span class="o">&lt;</span><span class="n">BlogPost</span><span class="o">&gt;</span> <span class="nf">findAllByOrderByScoreDesc</span><span class="o">(</span><span class="n">TextCriteria</span> <span class="n">criteria</span><span class="o">);</span> -<span class="o">}</span> -</pre></div> - -<p>The first query method is quite straight forward. It executes the given <code>TextCriteria</code> and pages the results. The second query method definition combines the given <code>TextCriteria</code> with a standard criteria definition derived from the method name. This shows that you can freely combine text search with standard query easily.</p> - -<h2> -<a name="user-content-mongodb-query-modifiers" class="anchor" href="#mongodb-query-modifiers" aria-hidden="true"><span class="octicon octicon-link"></span></a>MongoDB query modifiers</h2> - -<p>We added <code>@Meta</code> allowing you to define output and behavior of a query. By setting e.g. <code>maxExecutionTime</code> one can define the maximum duration a query may take (in milliseconds). Any execution that exceeds the limit will result in an error. You can also advice MongoDB to only scan through a maximum number of documents and return what has been found until reaching the limit by setting <code>maxScanDocuments</code>, while <code>comment</code> allows you to define text you can search for within the <code>system.profile</code> collection in case you got profiling enabled for your MongoDB instance. </p> - -<div class="highlight highlight-java"><pre><span class="nd">@Meta</span><span class="o">(</span><span class="n">maxExcecutionTime</span> <span class="o">=</span> <span class="mi">100</span><span class="o">,</span> <span class="n">comment</span> <span class="o">=</span> <span class="s">"onlyLimitedTime"</span><span class="o">)</span> -<span class="n">List</span><span class="o">&lt;</span><span class="n">Customer</span><span class="o">&gt;</span> <span class="nf">findByFirstname</span><span class="o">(</span><span class="n">String</span> <span class="n">firstname</span><span class="o">);</span> -</pre></div> - -<h2> -<a name="user-content-configuration-options-for-redis-sentinel" class="anchor" href="#configuration-options-for-redis-sentinel" aria-hidden="true"><span class="octicon octicon-link"></span></a>Configuration options for Redis Sentinel</h2> - -<p>Redis 2.8 introduced high-availability support know as <a href="http://redis.io/topics/sentinel">Sentinels</a>. The Redis module of Spring Data Evans adds support to easily configure connecting to a sentinel setup so that your client will be able to continue working in case of re-elections of master nodes in a Redis cluster.</p> - -<p><code>RedisSentinelConfiguration</code> defines where the Sentiels are located so that the <code>ConnectionFactory</code> can set up pooling accordingly. In case of Jedis it will create a <code>JedisSentinelPool</code> for automatic failover. This means that in case your master node goes down, you'll receive, as soon as the Sentinels agreed on a new master, a connection to the new master without the need of any further interaction. </p> - -<div class="highlight highlight-java"><pre><span class="nd">@Configuration</span> -<span class="kd">class</span> <span class="nc">RedisSentinelApplicationConfig</span> <span class="o">{</span> - - <span class="nd">@Bean</span> - <span class="n">RedisConnectionFactory</span> <span class="nf">connectionFactory</span><span class="o">()</span> <span class="o">{</span> - <span class="k">return</span> <span class="k">new</span> <span class="nf">JedisConnectionFactory</span><span class="o">(</span><span class="n">sentinelConfig</span><span class="o">());</span> - <span class="o">}</span> - - <span class="nd">@Bean</span> - <span class="n">RedisSentinelConfiguration</span> <span class="nf">sentinelConfig</span><span class="o">()</span> <span class="o">{</span> - <span class="k">return</span> <span class="k">new</span> <span class="nf">RedisSentinelConfiguration</span><span class="o">().</span><span class="na">master</span><span class="o">(</span><span class="s">"mymaster"</span><span class="o">)</span> - <span class="o">.</span><span class="na">sentinel</span><span class="o">(</span><span class="s">"localhost"</span><span class="o">,</span> <span class="mi">26379</span><span class="o">)</span> - <span class="o">.</span><span class="na">sentinel</span><span class="o">(</span><span class="s">"localhost"</span><span class="o">,</span> <span class="mi">26380</span><span class="o">)</span> - <span class="o">.</span><span class="na">sentinel</span><span class="o">(</span><span class="s">"localhost"</span><span class="o">,</span> <span class="mi">26381</span><span class="o">);</span> - <span class="o">}</span> -<span class="o">}</span> -</pre></div> - -<p>The upcoming Spring Boot 1.2, will even take this even further by automatically picking up the <code>RedisSentinelConfiguration</code> if present and initialize the <code>RedisConnectionFactory</code> accordingly.</p> - -<h2> -<a name="user-content-schema-support-for-solr" class="anchor" href="#schema-support-for-solr" aria-hidden="true"><span class="octicon octicon-link"></span></a>Schema support for Solr</h2> - -<p>Although the <a href="https://cwiki.apache.org/confluence/display/solr/Schema+API">Solr Schema API</a> is not finished yet, we already try to support as much of it as possible. With the Evans release you can now dynamically add missing fields to an existing (managed) schema. To achieve this, we read the existing field definition and compare it against the one derived from the properties of the domain type. To do so we extended the <code>@Indexed</code> annotation a bit. It now allows some fine tuning of the fields to be created as values such as <code>indexed</code>, <code>stored</code> and <code>solrType</code> can be explicitly defined.</p> - -<div class="highlight highlight-java"><pre><span class="nd">@Configuration</span> -<span class="nd">@EnableSolrRepositories</span><span class="o">(</span><span class="n">schemaCreationSupport</span> <span class="o">=</span> <span class="kc">true</span><span class="o">)</span> -<span class="kd">class</span> <span class="nc">SolrConfiguration</span> <span class="o">{</span> - - <span class="nd">@Bean</span> - <span class="n">SolrServer</span> <span class="nf">solrServer</span><span class="o">()</span> <span class="o">{</span> - <span class="k">return</span> <span class="k">new</span> <span class="nf">HttpSolrServer</span><span class="o">(</span><span class="s">"http://localhost:8983/solr"</span><span class="o">);</span> - <span class="o">}</span> -<span class="o">}</span> - -<span class="nd">@SolrDocument</span><span class="o">(</span><span class="n">solrCoreName</span> <span class="o">=</span> <span class="s">"collection1"</span><span class="o">)</span> -<span class="kd">class</span> <span class="nc">ManagedProduct</span> <span class="o">{</span> - - <span class="nd">@Id</span> <span class="n">String</span> <span class="n">id</span><span class="o">;</span> - <span class="nd">@Indexed</span><span class="o">(</span><span class="n">type</span> <span class="o">=</span> <span class="s">"text_general"</span><span class="o">)</span> <span class="n">String</span> <span class="n">name</span><span class="o">;</span> - <span class="nd">@Indexed</span><span class="o">(</span><span class="n">name</span> <span class="o">=</span> <span class="s">"cat"</span><span class="o">)</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">category</span><span class="o">;</span> -<span class="o">}</span> -</pre></div> - -<p>As always we are eager to hear from you! Reach out to us on <a href="https://twitter.com/SpringData">Twitter</a>, <a href="http://stackoverflow.com/tags/spring-data">Stackoverflow</a> or <a href="http://jira.spring.io">JIRA</a> to request new features, suggest improvements or report a bug.</p> - - - This Week in Spring - Tuesday October 14th, 2014 - - - - Josh Long - - tag:spring.io,2014-10-14:1789 - 2014-10-14T18:05:00Z - <p>Welcome to another installment of <em>This Week in Spring</em>! This week I've been at Silicon Valley Code Camp, JAX London and Geekout UK talking to developers about how to build scalable, microservice-centric <a href="http://start.spring.io">Spring Boot</a> applications on <a href="http://cloudfoundry.org/index.html">Cloud Foundry</a>. It's been a lot fun talking to enthusiastic developers (on both sides of the Atlantic!).</p> - -<p>Without further ado, let's get on with the roundup!</p> - -<ul> -<li>Spring Boot co-lead Phil Webb just announced the availability of <a href="https://spring.io/blog/2014/10/11/spring-boot-1-2-0-m2-available-now">Spring Boot 1.2.0.M2</a> which includes, among other things, auto-configuration for Jersey, log4j, <code>commons-dbcp</code> support, a smarter <em>disk usage</em> health indicator and improved RabbitMQ support</li> -<li>Spring and Groovy Tool Suite lead Martin Lippert <a href="https://spring.io/blog/2014/10/13/spring-tool-suite-and-groovy-grails-tool-suite-3-6-2-released">has just announced the latest and greatest release, 3.6.2</a>, which is a maintenance release that includes an update to the latest Eclipse Luna SR1 installation. </li> -<li>Also, Spring Boot co-lead <a href="https://spring.io/blog/2014/10/11/spring-boot-1-1-8-released">Phil Webb just announced the 1.1.8 release of the 1.1x line of Spring Boot</a> which includes a fix for the white-label error page cross-site scripting attack. </li> -<li>Federated security is an important part of any distributed, multi-client, (micro)service-oriented system. Spring Security and Spring Security OAuth, in particular, provide a compelling solution. Join the good Dr. Dave Syer for this <a href="https://spring.io/blog/2014/10/01/webinar-security-for-microservices-with-spring-and-oauth2">upcoming webinar on microservice security using OAuth2</a> -</li> -<li>Matt Stine will be doing a webinar introducing <a href="https://spring.io/blog/2014/10/01/webinar-architecting-for-continuous-delivery-microservices-with-pivotal-cf-and-spring-cloud">how Pivotal Cloud Foundry and Spring Cloud make for a natural solution to building microservices</a>. Don't miss this one!</li> -<li>Atlanta, GA, USA Tuesday Oct 21, Learn about Spring, Microservices, and Cloud Foundry at a <a href="http://www.pivotal.io/platform-as-a-service/cloud-platform-roadshow/atlanta#cities">one day roadshow event</a> at Cox communications.</li> -<li>Munich, Germany, GA, Thursday Oct 23, Learn about Spring, Microservices, and Cloud Foundry at a <a href="http://www.pivotal.io/platform-as-a-service/cloud-platform-roadshow/munich">one day roadshow event</a> at EMC's office in Ismaning, Germany. </li> -<li>I hope you'll join the Vaadin team and I on October 23rd for a <a href="http://spring.io/blog/2014/10/01/webinar-building-bootful-uis-with-spring-boot-and-vaadin">look how to build Spring Boot-powered Vaadin applications</a>.</li> -<li>The <em>Java et Moi</em> blog has a nice (French language) post <a href="http://javaetmoi.com/2014/10/annotation-sessionattributes-modelattribute-spring-mvc/">on using Spring MVC's <code>@SessionAttribute</code> annotation</a><br> -</li> -<li>I <em>really</em> enjoyed this <a href="http://altfatterz.blogspot.com/2014/10/software-configuration-with-spring-boot.html">very thorough look at contributing configuration property values</a> to a Spring Boot application (as <code>--D</code> arguments, environment variables, values in a property file, and values inside of JNDI)</li> -<li>Sudhir Dharmadhikari has done a <em>very</em> <a href="http://iwaow.blogspot.com/2014/10/jhipster-super-baby-in-springroos-pouch.html">nice job introducing the <code>yeoman</code> code-generator based JHipster</a>, which builds on top of <a href="http://spring.io/projects/spring-boot">Spring Boot</a>.</li> -<li>Our pal Miroslav Kopecky is back, this <a href="http://java.dzone.com/articles/scala-4-spring-mvc-without-0">time with a nice post on using Spring MVC (in Spring 4) using Java configuration</a> (through Scala!)</li> -<li> -<a href="http://antirez.com/news/79">Redis Cluster is no longer vaporware</a>! Check out the details.</li> -<li> Biju Kunjummen has put together <a href="http://java.dzone.com/articles/spring-configuration-and">a very nice post on the two styles of Java configuration</a>: one where you declare dependencies as parameters to the <code>@Bean</code>-annotated bean definition method, and one where you simply reference the other bean by calling a method.<br> -</li> -<li>Check out this post on <a href="http://architects.dzone.com/articles/using-log4j2-slf4j-spring-4">avoiding dependency conflicts between Log4j2 and SLF4J</a> in a Spring application.</li> -<li>Check out this post by Daniel Murygin which includes a detailed walk-through <a href="http://murygin.wordpress.com/2014/10/13/rest-web-service-file-uploads-spring-boot/">on building a fairly non-trivial REST service (that even handles file-uploads!) and client application using Spring Boot</a>?<br> -</li> -</ul> - - - Spring Tool Suite and Groovy/Grails Tool Suite 3.6.2 released - - - - Martin Lippert - - tag:spring.io,2014-10-13:1788 - 2014-10-13T14:20:11Z - <p>Dear Spring Community,</p> - -<p>I am happy to announce the new release of our Eclipse-based tooling today: -The Spring Tool Suite (STS) 3.6.2 and the Groovy/Grails Tool Suite (GGTS) 3.6.2.</p> - -<p>This is a maintenance release that updates STS/GGTS to the just released Eclipse Luna SR1 release. This includes a number of fixes across the various projects that are included in the STS distribution, together with fixes for the Java8 compiler and tooling in Eclipse.</p> - -<p>To download the distributions, please go visit:</p> - -<ul> -<li>Spring Tool Suite: <a href="https://spring.io/tools/sts/all">https://spring.io/tools/sts/all</a> -</li> -<li>Groovy/Grails Tool Suite: <a href="https://spring.io/tools/ggts/all">https://spring.io/tools/ggts/all</a> -</li> -</ul> - -<p>Detailed new and noteworthy notes can be found here: <a href="http://docs.spring.io/sts/nan/v362/NewAndNoteworthy.html">STS/GGTS 3.6.2 New &amp; Noteworthy</a>.</p> - -<p>NOTE: -Both tool suites ship on top of the latest Eclipse Luna 4.4 SR1 release as 64bit and 32bit based zip files only. There will be no native installers for STS/GGTS anymore.</p> - -<p>Since the 3.6.0 release we shifted towards a slightly changed release schedule, shipping minor releases more frequently. Therefore 3.6.3 is scheduled to ship in December, followed by 3.6.4 in early March 2015, shortly after the Eclipse Luna SR2 release.</p> - -<p>Enjoy!</p> - - - Spring Boot 1.2.0.M2 Available Now - - - - Phil Webb - - tag:spring.io,2014-10-11:1786 - 2014-10-11T03:55:53Z - <p>I am pleased to announce that Spring Boot 1.2.0.M2 is available now in the <a href="http://repo.springsource.org/milestone">Spring milestone repository</a>. This release adds a number of improvements and new features over <a href="https://spring.io/blog/2014/09/08/spring-boot-1-2-0-m1-available-now">M1</a>. Highlights include:</p> - -<ul> -<li>Full configuration of Jackson <code>ObjectMapper</code> features from your <code>application.properties</code> file.</li> -<li>Auto-configuration for Jersey.</li> -<li>Support for Log4j2.</li> -<li>Support for commons-dbcp2.</li> -<li>A new "disk usage" health indicator.</li> -<li>Improved RabbitMQ auto-configuration.</li> -</ul> - -<p>For a complete list of changes, and for upgrade instructions, see the <a href="http://github.com/spring-projects/spring-boot/wiki/Spring-Boot-1.2-Release-Notes">Spring Boot 1.2 Release Notes</a> on the WIKI. The <a href="http://docs.spring.io/spring-boot/docs/1.2.0.M2/reference/htmlsingle/">reference documentation</a> also continues to be updated to cover the new features.</p> - -<p>Thanks again to everyone that has contributed to the release! Please give it a go and report any problems using <a href="http://github.com/spring-projects/spring-boot/issues">the project Issue tracker</a> page.</p> - - - Spring Boot 1.1.8 released - - - - Phil Webb - - tag:spring.io,2014-10-11:1785 - 2014-10-11T00:37:52Z - <p>Spring Boot 1.1.8 has been released and is available now from <a href="http://repo.spring.io/release">repo.spring.io</a> and <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.springframework.boot%22">Maven Central</a>. </p> - -<p>This maintenance release includes a <a href="https://github.com/spring-projects/spring-boot/commit/3135c7f8aeb30b71eccc02bb0bb3817132c41060">security patch</a> to the "white label error" page which prevents potential cross-site scripting attacks; as such it is a recommended upgrade for all Spring Boot users. For a complete list of changes please refer to the <a href="https://github.com/spring-projects/spring-boot/issues?q=milestone%3A1.1.8">issue tracker</a>.</p> - -<p><a href="http://projects.spring.io/spring-boot/">Project Page</a> | <a href="https://github.com/spring-projects/spring-boot">GitHub</a> | <a href="https://github.com/spring-projects/spring-boot/issues">Issues</a> | <a href="http://docs.spring.io/spring-boot/docs/1.1.8.RELEASE/reference/htmlsingle">Documentation</a></p> - - - Pivotal at Silicon Valley Code Camp 2014 - - - - Pieter Humphrey - - tag:spring.io,2014-10-10:1784 - 2014-10-10T10:24:00Z - <p>Are you heading to Silicon Valley Code Camp 2014?   If you are, we invite all of the Java community members to stop by the Pivotal Booth and talk to Pivotal engineers about the latest innovations in Java SE, in Spring, Groovy, Grails, Redis, RabbitMQ, Tomcat, Cloud Foundry and Hadoop. The exhibit space is open Saturday 8:00am – 5:00pm, and Saturday from 8:30am to 3:30pm, so there should be plenty of time to get your questions answered.  See below for details about our sessions and awesome giveaways - come find us! </p> - -<p><strong>SATURDAY - OCTOBER 11, 2014            </strong><br> -9:45 AM </p> - -<ul> - <li>Josh Long — Spring advocate at Pivotal</li> - <li><a href="http://www.siliconvalley-codecamp.com/Session/2014/building-bootiful-applications-with-spring-boot" target="_blank">Building "Bootiful Applications with Spring Boot </a></li> - <li>Room: 8401</li> -</ul> - -<p>11:45 AM </p> - -<ul> - <li>John Hann, — Pivotal</li> - <li><a href="http://www.siliconvalley-codecamp.com/Session/2014/introducing-ravejs-zero-config-javascript-applications" target="_blank">Introducing Rave.js: Zero-config JavaScript Applications</a></li> - <li>Room: 8401</li> -</ul> - -<p>1:45 PM </p> - -<ul> - <li>Ilayaperumal Gopinathan — Pivotal</li> - <li><a href="http://www.siliconvalley-codecamp.com/Session/2014/simplifying-big-data-development-using-spring-xd" target="_blank">Simplifying Big Data development at Spring XD</a></li> - <li> Room: 8403</li> -</ul> - -<p><strong>SUNDAY - OCTOBER 12, 2014</strong></p> - -<p>9:15 AM </p> - -<ul> - <li>Cornelia Davis — Platform Engineer at Pivotal</li> - <li><a href="http://www.siliconvalley-codecamp.com/Session/2014/the-self-healing-elastic-runtime-that-is-cloud-foundry">The Self-healing, Elastic Runtime that is Cloud Foundry</a></li> - <li>Room: Room: 4302</li> -</ul> - -<p>10:45 AM</p> - -<ul> - <li>Cornelia Davis — Platform Engineer at Pivotal</li> - <li><a href="http://www.siliconvalley-codecamp.com/Session/2014/running-your-spring-apps-in-the-cloud" target="_blank">Running Your Spring Apps in the Cloud</a></li> - <li>Room: 4302</li> -</ul> - -<p>Visit us at the Pivotal Code Camp booth for technical expert conversations on Cloud Foundry, Spring, Groovy, Grails, Redis, RabbitMQ, Tomcat, Hadoop and much more. </p> - -<p>Also, don't miss the <a href="http://run.pivotal.io">Pivotal Web Services</a> Hoodie Push!  <a href="https://spring.io/guides/gs/rest-service/">Build a REST service with Spring Boot</a>, push it live to run.pivotal.io and get a hoodie!  You can do it ahead of time, and show it running to us, or use our laptops at the booth. </p> - -<p><a href="https://raw.githubusercontent.com/pieterhumphrey/springio_website_images/master/hoodie.PNG" target="_blank"><img border="0" width="215" height="254" src="https://raw.githubusercontent.com/pieterhumphrey/springio_website_images/master/hoodie.PNG" style="max-width:100%;"></a></p> - -<p> </p> - -<p> </p> - -<p>Save the date for SpringOne2GX 2015!  We hope you will mark your calendar and join us again! SpringOne2GX 2015 will be held September 14 - 17, 2015 at the Marriott Marquis in Washington DC.</p> - - - This Week in Spring - October 7th, 2014 - - - - Josh Long - - tag:spring.io,2014-10-08:1783 - 2014-10-08T03:49:00Z - <p>Welcome to another installment of <em>This Week in Spring</em>! This week, I've been at the Couchbase Connect conference talking to developers about Spring Data Couchbase (and Spring Boot, Spring XD, Spring Session, and more..). Fun show, fun crowd! Next week, I'll be at <a href="http://jaxlondon.com/2014/speakers/josh-long">JAX London</a> and <a href="http://uk.geekout.ee/speakers/josh-long/">Geekout UK</a>, so be sure to say hi if you're around. </p> - -<p>Now, with that, let's get on to the roundup..</p> - -<ol> -<li>The good Dr. Pollack just announced <a href="http://spring.io/blog/2014/10/02/spring-xd-1-0-1-released">the 1.0.1 release of Spring XD</a>, the easiest way to build data-integration and ingestion solutions. It may be only a 1.0.1 release, but make no mistake: there are some very cool features in this release, including improved administrative and administrative UI features. </li> -<li>Federated security is an important part of any distributed, multi-client, (micro)service-oriented system. Spring Security and Spring Security OAuth, in particular, provide a compelling solution. Join the good Dr. Dave Syer for this <a href="https://spring.io/blog/2014/10/01/webinar-security-for-microservices-with-spring-and-oauth2">upcoming webinar on microservice security using OAuth2</a> -</li> -<li>Matt Stine will be doing a webinar introducing <a href="https://spring.io/blog/2014/10/01/webinar-architecting-for-continuous-delivery-microservices-with-pivotal-cf-and-spring-cloud">how Pivotal Cloud Foundry and Spring Cloud make for a natural solution to building microservices</a>. Don't miss this one!</li> -<li> Spring and JavaScript ninja Brian Cavalier has written a <em>very</em> interesting post on some of <a href="http://github.com/spring-projects/spring-sync/">the work</a> we're doing towards enabling <a href="http://spring.io/blog/2014/10/08/streaming-json-patch-from-spring-to-a-react-ui">easier differential sync between JavaScript clients and services</a>. This post not only introduces all these exciting new stuff, but also builds on RaveJS, the Spring Boot-inspired approach to JavaScript.</li> -<li>I hope you'll join the Vaadin team and I on October 23rd for a <a href="http://spring.io/blog/2014/10/01/webinar-building-bootful-uis-with-spring-boot-and-vaadin">look how to build Spring Boot-powered Vaadin applications</a>.</li> -<li>Justin Lee Grant has put together <a href="http://www.justinleegrant.com/?p=489">a good introductory look at Spring Boot</a>.</li> -<li>Spring lead Juergen Hoeller just <a href="http://spring.io/blog/2014/10/01/spring-framework-4-1-1-released">announced the 4.1.1 release of Spring framework</a>. This release includes improved <code>Optional</code> handling, a Jackson <code>ObjectMapper</code> builder, some requested JDBC improvements, and much more. </li> -<li>The good Dr. Syer just announced <a href="http://spring.io/blog/2014/10/07/spring-cloud-1-0-0-m1-available-now">the first milestone release of the Spring Cloud project</a>. Spring Cloud provides primatives for building microservice and PaaS-centric applications. It builds on top of the Netflix OSS stack and Spring Boot.</li> -<li>Karthik Abram put together <a href="http://www.eclecticlogic.com/2014/09/01/classpath-scanning/">a nice post on a hidden gem in Spring: the <code>ClassPathScanningCandidateComponentProvider</code></a> class, which makes it easy to discover beans of a certain type. </li> -<li>Nicolas Lejeune has written up a fascinating look at how he managed <a href="http://labs.bsb.com/2014/09/turn-a-legacy-app-into-a-cf-service/">to convert a legacy application (it uses EJB3) and move it to a Cloud Foundry environment</a> </li> -<li>Our pal Toshiaki Maki put together <a href="http://github.com/making/spring-boot-blank">his ideal Spring Boot Maven archetype</a>, and <a href="http://twitter.com/making/status/519626091934134272">shared it</a>!<br> -</li> -<li>Are you a Groovy fan? (who isn't??) Check out Groovy project lead Guillaume LaForge's weekly roundup, <a href="http://t.co/AiDLC6novd"><em>This Week in Groovy</em></a>!</li> -<li>Do you want <a href="http://mikusa.blogspot.com/2014/08/debugging-java-applications-on.html">to debug applications deployed on Cloud Foundry</a>? Daniel Mikusa put together a very nice post explaining one approach. </li> -</ol> - - - Streaming JSON Patch from Spring to a React UI - - - - Brian Cavalier - - tag:spring.io,2014-10-07:1782 - 2014-10-08T01:47:03Z - <p>We're exploring ways to help developers create rich, modern front-ends that integrate easily with Spring back-ends. If you attended SpringOne this year, you've already seen some of the things we've been working on:</p> - -<ol> -<li> -<a href="https://speakerdeck.com/gregturn/springone2gx-2014-spring-data-rest-data-meets-hypermedia">Hypermedia support in Spring Data REST</a> presented by Greg Turnquist, Oliver Gierke, and Roy Clarkson</li> -<li> -<a href="http://www.slideshare.net/unscriptable/rave-js-springone-2gx-2014">RaveJS: Spring Boot concepts for JavaScript applications</a> by John Hann</li> -<li> -<a href="http://www.slideshare.net/briancavalier/differential-sync-and-json-patch-s2-gx-2014">Differential Synchronization and JSON Patch</a> by Craig Walls and me</li> -</ol><p>In short, We want to make it easy to communicate efficiently between a Spring back-end and a client and to easily integrate the best and most popular client-side technologies.</p> - -<h2> -<a name="user-content-react--streaming-updates" class="anchor" href="#react--streaming-updates" aria-hidden="true"><span class="octicon octicon-link"></span></a>React + streaming updates</h2> - -<p>JSON Patch is a format for sending incremental changes to structured data. I thought it would be interesting to try streaming updates in JSON Patch format via STOMP all the way out to a web UI.</p> - -<p>Craig Walls had already built a simple <a href="https://github.com/habuma/scores">football scores proof of concept</a>, using the new <a href="https://github.com/spring-projects/spring-sync/">Spring Sync</a> project to push score updates to a browser using JSON Patch over STOMP. I was able to take his POC, drop in RaveJS, add client-side reactive streams, and integrate the updates into a <a href="http://facebook.github.io/react/">React</a> UI component.</p> - -<p>You can find the <a href="https://github.com/briancavalier/scores">complete code on github in my rave-most-react branch</a>. The server is unchanged from Craig's original version. The <a href="https://github.com/briancavalier/scores/tree/rave-most-react/src/main/resources/public">web client</a> is where the action is. Have a look at the <a href="https://github.com/briancavalier/scores/blob/rave-most-react/src/main/resources/public/main.js">main.js to get an overall sense of the app</a> before we dive into some specifics.</p> - -<h2> -<a name="user-content-starting-out" class="anchor" href="#starting-out" aria-hidden="true"><span class="octicon octicon-link"></span></a>Starting out</h2> - -<p>I used <a href="https://github.com/RaveJS/rave">RaveJS</a> and npm to manage my client side dependencies, so my startup was simple:</p> - -<div class="highlight highlight-sh"><pre>&gt; <span class="nb">cd </span>src/main/resources/public - -&gt; npm init - -&lt;answer a few questions&gt; - -&gt; npm install --save rave most jiff react rave-load-jsx rave-node-process stompjs -</pre></div> - -<p>Then I just needed a single script tag in the existing HTML, and I was off to coding!</p> - -<div class="highlight highlight-html"><pre><span class="nt">&lt;script </span><span class="na">src=</span><span class="s">"node_modules/rave/rave.js"</span><span class="nt">&gt;&lt;/script&gt;</span> -</pre></div> - -<h2> -<a name="user-content-introducing-mostjs" class="anchor" href="#introducing-mostjs" aria-hidden="true"><span class="octicon octicon-link"></span></a>Introducing most.js</h2> - -<p>Thanks to Craig, I already had a stream of updates (in JSON Patch format) flowing to the client over STOMP. I decided that the nicest way to work with the stream of patches would be to (surprise!) <em>actually use a stream</em>.</p> - -<p><a href="https://github.com/cujojs/most">Most.js</a> is cujoJS's new JavaScript reactive streams package. It provides a small, but powerful set of APIs for creating, transforming, and consuming event streams. I used it to wrap up the stompjs API.</p> - -<p>It turns out that there were two STOMP subscriptions: one that carried an initial, complete copy of all the score data, and another that carried all the subsequent changes. I was able to wrap both subscriptions up into a single reactive stream representing "the latest set of scores" by using <a href="https://github.com/cujojs/jiff">jiff.js</a> to apply the JSON Patches as they arrived.</p> - -<p>This bit of code creates a stream from a STOMP subscription to the initial data, takes the first event (a complete snapshot of all scores), and combines it with a second stream containing only JSON Patch updates to produce a view of the scores that changes over time.</p> - -<div class="highlight highlight-js"><pre><span class="kd">function</span> <span class="nx">getScoresStream</span><span class="p">(</span><span class="nx">initDestination</span><span class="p">,</span> <span class="nx">updateDestination</span><span class="p">,</span> <span class="nx">client</span><span class="p">)</span> <span class="p">{</span> - <span class="c1">// Create a stream containing one full copy of the data, and</span> - <span class="c1">// flatMap that to a stream containing the time-varying</span> - <span class="c1">// current set of scores, by accumulating each patch</span> - <span class="c1">// and emitting the updated scores data.</span> - <span class="k">return</span> <span class="nx">getInitialDataStream</span><span class="p">(</span><span class="nx">initDestination</span><span class="p">,</span> <span class="nx">client</span><span class="p">)</span> - <span class="p">.</span><span class="nx">flatMap</span><span class="p">(</span><span class="kd">function</span><span class="p">(</span><span class="nx">data</span><span class="p">)</span> <span class="p">{</span> - <span class="k">return</span> <span class="nx">getUpdatesStream</span><span class="p">(</span><span class="nx">updateDestination</span><span class="p">,</span> <span class="nx">client</span><span class="p">,</span> <span class="nx">data</span><span class="p">);</span> - <span class="p">});</span> -<span class="p">}</span> - -<span class="kd">function</span> <span class="nx">getInitialDataStream</span> <span class="p">(</span><span class="nx">initDestination</span><span class="p">,</span> <span class="nx">client</span><span class="p">)</span> <span class="p">{</span> - <span class="c1">// Await a copy of the data from the STOMP subscription</span> - <span class="c1">// that is sending the full scores data, then unsubscribe.</span> - <span class="k">return</span> <span class="nx">streamFromStompJson</span><span class="p">(</span><span class="nx">initDestination</span><span class="p">,</span> <span class="nx">client</span><span class="p">)</span> - <span class="p">.</span><span class="nx">take</span><span class="p">(</span><span class="mi">1</span><span class="p">);</span> -<span class="p">}</span> - -<span class="kd">function</span> <span class="nx">getUpdatesStream</span> <span class="p">(</span><span class="nx">updateDestination</span><span class="p">,</span> <span class="nx">client</span><span class="p">,</span> <span class="nx">data</span><span class="p">)</span> <span class="p">{</span> - <span class="c1">// Incrementally accumulate patches from the STOMP subscription</span> - <span class="c1">// that is carrying JSON Patches onto the scores data to produce</span> - <span class="c1">// an updated view of the scores.</span> - <span class="k">return</span> <span class="nx">streamFromStompJson</span><span class="p">(</span><span class="nx">updateDestination</span><span class="p">,</span> <span class="nx">client</span><span class="p">)</span> - <span class="p">.</span><span class="nx">startWith</span><span class="p">([])</span> - <span class="p">.</span><span class="nx">scan</span><span class="p">(</span><span class="nx">updateWithJsonPatch</span><span class="p">,</span> <span class="nx">data</span><span class="p">);</span> -<span class="p">}</span> -</pre></div> - -<p>Most.js also automatically cleans up underlying resources when streams end. It was easy to arrange to unsubscribe from the first subscription after an initial copy of the full scores data had arrived, leaving only one subscription: the changes.</p> - -<h2> -<a name="user-content-making-the-ui-with-react" class="anchor" href="#making-the-ui-with-react" aria-hidden="true"><span class="octicon octicon-link"></span></a>Making the UI with React</h2> - -<p>Now that I had a single most.js stream representing the latest scores, I created a <a href="https://github.com/briancavalier/scores/blob/rave-most-react/src/main/resources/public/Scoreboard.jsx">React component to display them</a>. I installed (see above) the <a href="https://github.com/KidkArolis/rave-load-jsx">rave-load-jsx extension</a>, a RaveJS extension created by a community member, which enables direct JSX component loading in RaveJS. All I had to do was create a Scoreboard.jsx file and start coding a simple React scoreboard component.</p> - -<p>React components have an internal <code>state</code> object containing the data that will be used to render the component. All I needed to do was pass the latest scores stream when creating the component, and then have the component observe the stream and update its <code>state</code>. The relevant bit of code is only a couple lines:</p> - -<div class="highlight highlight-js"><pre><span class="c1">// this.props.scores is the scores stream provided when the</span> -<span class="c1">// Scoreboard component is created</span> - -<span class="k">this</span><span class="p">.</span><span class="nx">props</span><span class="p">.</span><span class="nx">scores</span><span class="p">.</span><span class="nx">observe</span><span class="p">(</span><span class="kd">function</span><span class="p">(</span><span class="nx">scores</span><span class="p">)</span> <span class="p">{</span> - <span class="nx">self</span><span class="p">.</span><span class="nx">setState</span><span class="p">({</span> <span class="nx">scores</span><span class="o">:</span> <span class="nx">scores</span> <span class="p">});</span> -<span class="p">});</span> -</pre></div> - -<p>React took care of automatically keeping the DOM in sync with the <code>state</code>.</p> - -<h2> -<a name="user-content-from-bits-to-pixels" class="anchor" href="#from-bits-to-pixels" aria-hidden="true"><span class="octicon octicon-link"></span></a>From bits to pixels</h2> - -<p>This is admittedly a toy app. However, it shows quite a few powerful concepts working together in a very small space, with very little code: small, server-generated deltas flowing over STOMP + WebSocket, to a reactive stream on the client being observed by a React component. Changes are flowing from a Spring back-end through to the UI--bits to pixels, as it were.</p> - -<p>I hope this tiny app also provides a glimpse at the direction we're headed. We want to provide tools and client-side packages that help developers build rich, modern client applications that integrate with leading client-side technologies and Spring back-ends.</p> - - - Spring Cloud 1.0.0.M1 Available Now - - - - Dave Syer - - tag:spring.io,2014-10-07:1781 - 2014-10-07T13:25:00Z - <p><a href="http://projects.spring.io/spring-cloud">Spring Cloud</a> (the new umbrella project announced in September) has reached a milestone, its first, and fresh jars are available in the <a href="http://repo.spring.io/libs-milestone-local">repo.spring.io</a> repository. Spring Cloud is going to follow a "release train" model for releases, a bit like Spring Data, but we haven't got a cool name for this one yet, so it's just 1.0.0.M1. The modules that are part of this release are </p> - -<ul> -<li><p>Spring Cloud Config: Centralized external configuration management backed by a git repository. The configuration resources map directly to Spring <code>Environment</code> but could be used by non-Spring applications if desired.</p></li> -<li><p>Spring Cloud Netflix: Integration with various Netflix OSS components (Eureka, Hystrix, Zuul, Archaius, etc.).</p></li> -<li><p>Spring Cloud Bus: An event bus for linking services and service instances together with distributed messaging. Useful for propagating state changes across a cluster (e.g. config change events).</p></li> -<li><p>Spring Cloud Security: A set of primitives for building secure applications and services with minimum fuss.</p></li> -<li><p>Spring Cloud CLI: Spring Boot CLI plugin for creating Spring Cloud component applications quickly in Groovy.</p></li> -<li><p>Spring Cloud Starters: Spring Boot-style starter projects to ease dependency management for consumers of Spring Cloud.</p></li> -</ul><p>All of the above have the 1.0.0.M1 release tag, so a good starting point to try it out would be to <a href="http://projects.spring.io/spring-cloud/spring-cloud.html#_installation">install the CLI</a> and run Config Server with this code:</p> - -<div class="highlight highlight-groovy"><pre><span class="nd">@EnableConfigServer</span> -<span class="kd">class</span> <span class="nc">ConfigServer</span> <span class="o">{</span> -<span class="o">}</span> -</pre></div> - -<p>then hit <code>http://localhost:8080/foo/default</code> to see some property sources.</p> - -<p>The <a href="https://github.com/spring-cloud">code</a> is hosted on github, and community contributions are extremely welcome, so get on over there are check it out. There are some neat samples in a separate organization: <a href="https://github.com/spring-cloud-samples">spring-cloud-samples</a>, including a "scripts" project that has git submodules and scripts to get a complete demo system up and running as quickly as possible.</p> - - - Spring XD 1.0.1 released - - - - Mark Pollack - - tag:spring.io,2014-10-02:1780 - 2014-10-02T22:49:48Z - <p>On behalf of the Spring XD team, I am very pleased to announce the general availability of Spring XD 1.0.1! </p> - -<p>This release includes <a href="https://jira.spring.io/secure/ReleaseNote.jspa?projectId=11401&amp;version=14685">bug fixes and enhancements</a> as well as some new features:</p> - -<ul> -<li> -<a href="https://github.com/spring-projects/spring-xd/wiki/Application-Configuration#enabling-https">HTTPS access</a> and <a href="https://github.com/spring-projects/spring-xd/wiki/Application-Configuration#enabling-authentication">Authentication</a> to Admin Server</li> -<li> -<a href="https://github.com/spring-projects/spring-xd/wiki/AdminUI#containers">Cluster</a> and <a href="https://github.com/spring-projects/spring-xd/wiki/AdminUI#streams">Stream</a> views in UI</li> -<li>Configure a <a href="https://github.com/spring-projects/spring-xd/wiki/Modules#custom-module-registry">location for custom modules</a> -</li> -<li><a href="https://github.com/spring-projects/spring-xd/wiki/Sinks#null-sink">Null sink</a></li> -</ul><p>You can <a href="http://repo.spring.io/release/org/springframework/xd/spring-xd/1.0.1.RELEASE/spring-xd-1.0.1.RELEASE-dist.zip">download the zip distribution</a> or install on OSX <a href="https://github.com/spring-projects/spring-xd/wiki/Getting-Started#osx-homebrew-installation">using homebrew</a>. On RHEL/CentOs you can <a href="https://github.com/spring-projects/spring-xd/wiki/Getting-Started#redhatcentos-installation">install using yum</a>.</p> - -<p>Feedback is very important, so please get in touch with questions and comments via</p> - -<ul> -<li> -<a href="http://stackoverflow.com/questions/tagged/spring-xd">StackOverflow</a> <code>spring-xd</code> tag</li> -<li> -<a href="https://jira.spring.io/browse/XD/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel">Spring JIRA</a> or <a href="https://github.com/spring-projects/spring-xd/issues">GitHub Issues</a> -</li> -</ul> - - - Spring Framework 4.1.1 released - - - - Juergen Hoeller - - tag:spring.io,2014-10-01:1779 - 2014-10-01T13:15:00Z - <p>Dear Spring community,</p> - -<p>I'm pleased to announce that Spring Framework 4.1.1 is available now. As the <b>first maintenance release in the 4.1 line</b>, this release contains a wide range of fixes for regressions and other issues reported against 4.1 GA. A big thank you to all the issue reporters out there!</p> - -<p>4.1.1 also comes with a <b>selection of minor enhancements</b>, for example: consistent handling of Java 8's Optional type, a Jackson ObjectMapper builder class with refined defaults, some requested JDBC refinements, as well as <b>specific performance improvements</b>.</p> - -<p><a href="https://jira.spring.io/issues/?jql=project%20%3D%20SPR%20AND%20fixVersion%20%3D%204.1.1%20ORDER%20BY%20issuetype%20ASC">-&gt; List of resolved JIRA issues for Spring Framework 4.1.1</a></p> - -<p>We strongly recommend an immediate upgrade to 4.1.1 for all 4.1 GA users. The Spring Framework team is now working towards <b>Spring Framework 4.1.2 at the end of October</b>, which will be the foundation for the upcoming Spring Boot 1.2 GA release.</p> - -<p>On a related note, along with 4.1.2, we are preparing <b>Spring Framework 4.0.8 as the last 4.0.x maintenance release</b>. If there is anything you'd like to get fixed in the 4.0.x branch still, now is the time to raise it! Otherwise, please upgrade to 4.1.x for ongoing active maintenance.</p> - -<p>Cheers,</p> - -<p>Juergen</p> - - - This Week in Spring - September 30, 2014 - - - - Josh Long - - tag:spring.io,2014-10-01:1774 - 2014-10-01T03:20:00Z - <p>Welcome to another installment of <em>This Week in Spring!</em> This week <a href="http://spring.io/blog/2014/09/26/pivotal-at-javaone-2014">the Spring team is at JavaOne</a>! There's been, and will be, <em>lots</em> to see! We're also hanging out at the booth, talking to as many users as possible. Check out the link I just give listing all the cool Pivotal (and non-Pivotal) talks at JavaOne. (Ahem. Naturally, I personally would <em>love</em> it if you made <a href="http://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=3693&amp;tclass=popup">my talk - <em>Spring4TW!</em> - tomorrow morning at 8:30am at Parc 55, Cyril Magnin II/III</a>!).</p> - -<p></p><p><a href="https://raw.githubusercontent.com/joshlong/meh/master/javaone2014-boot-twis.jpg" target="_blank"><img src="https://raw.githubusercontent.com/joshlong/meh/master/javaone2014-boot-twis.jpg" style="max-width:100%;"></a></p><p>In addition to IoT, Big Data, and Microservice demos using <a href="http://projects.spring.io/spring-cloud/">NetFlixOSS on Spring</a>, students were doing the coding challenge to build a <a href="https://spring.io/guides/gs/rest-service/">REST service with Spring Boot</a> and pushed to <a href="http://run.pivotal.io">Pivotal Web Services</a> in &lt; 15 minutes to get the <a href="http://preshavedyak.com/">preshavedyak hoodie</a> from American Apparel, and learning about the best PaaS for Java available on the market today; Java 8 / Tomcat 8 support was released just days ago, and there is strong support for Spring, Groovy and Grails.</p><ul> -<li>I really liked Michael Plod's <a href="http://spring.io/blog/2014/09/26/webinar-replay-why-i-recommend-spring"><em>Why I Recommend Spring</em> webinar</a>, now available online as a replay</li> -<li>Last week, Activiti BPMN2 engine co-founder Joram Barrez and I gave a talk on <a href="http://spring.io/blog/2014/09/26/webinar-replay-process-driven-spring-applications-with-activiti">how to build process (read: workflow) centric Spring applications</a>, also now available online. </li> -<li>Tuesday, Oct 21st, 2014 join <a href="https://twitter.com/mstine">Matt Stine</a> for microservice architecture series #2: <a href="http://spring.io/blog/2014/10/01/webinar-architecting-for-continuous-delivery-microservices-with-pivotal-cf-and-spring-cloud">Architecting for Continuous Delivery: Microservices with Pivotal CF and Spring Cloud</a> -</li> -<li>Thursday, October 23, 2014, 2014 <a href="http://spring.io/blog/2014/10/01/webinar-building-bootful-uis-with-spring-boot-and-vaadin">Building “Bootful” UIs with Spring Boot and Vaadin</a> -</li> -<li>Tuesday, November 4, 2014 - microservice architecture series #3 - Join <a href="https://twitter.com/david_syer">Dr. Dave Syer</a> on <a href="http://spring.io/blog/2014/10/01/webinar-security-for-microservices-with-spring-and-oauth2">Security for Microservices with Spring and OAuth2</a> -</li> -<li>Missed microservice architecture #1? Catch the replay of <a href="http://spring.io/blog/2014/09/17/webinar-replay-building-bootiful-microservices-with-spring-boot">Building "Bootiful" Microservices with Spring Boot</a> on the Spring Developer Channel</li> -<li> -<a href="http://spring.io/blog/2014/09/26/spring-boot-1-1-7-released">Spring Boot 1.1.7 is now available</a>! </li> -<li> -<a href="http://raymondhlee.wordpress.com/2014/09/20/setup-spring-security-with-active-directory-ldap-in-spring-boot-web-application/">Setup Spring Security with Active Directory LDAP in Spring Boot Web Application</a> (I <em>just</em> got asked about this at the Spring BOF yesterday!)</li> -<li>There's been an interesting debate on microservices recently. <a href="http://blog.cleancoder.com/uncle-bob/2014/09/19/MicroServicesAndJars.html">"Uncle" Bob Martin has written up a post claiming that <code>.jar</code>s and Ruby <code>gem</code>s give you the same benefit of microservices</a>. There's a <a href="http://www.giorgiosironi.com/2014/09/microservices-are-not-jars.html">great rebuttal (which I happen to agree with..) by Giorgio Sironi on his blog</a>. There's even a nice wrapup of <a href="http://www.infoq.com/news/2014/09/microservices-shared-libraries?utm_source=infoq&amp;utm_medium=popular_links_homepage">the whole discussion on InfoQ</a>.</li> -<li>I really dig <a href="http://blog.pivotal.io/cloud-foundry-pivotal/case-studies-2/platform-wind-tunnel-part-i-heroku">Matt Stine's <em>wind tunnel</em> comparison of PaaSes</a>. Up first: Heroku. I can't wait to see subsequent posts in the series!</li> -<li>This post on using Spring Data Redis was published (and included in <em>TWiS</em>..) last year, <a href="http://www.ibm.com/developerworks/library/os-springredis/index.html">but it came up again and I still thnk it's a worthy read</a> </li> -<li>The eHarmony blog has a nice post on <a href="http://www.eharmony.com/engineering/spring-batch-admin-the-tricky-parts/#.VCtPFildUpg">how to setup Spring Batch Admin (the tricky parts..)</a> -</li> -<li>In the <em>you have to see it to beleive it</em> department, did you know there's a <a href="http://bitbucket.org/sglienke/spring4d">Spring for Delphi (Spring4D) project</a>? There are Spring-inspired C++, ColdFusion, JavaScript, .NET, Python, and numerous others. Cool to add this to the list.</li> -<li>The Intertech blog has <a href="http://www.intertech.com/Blog/spring-integration-tutorial-part-7-service-activators/">another installment on their <em>epic</em> Spring Integration tutorial</a>. This one's on <em>service activators</em> - basically the Spring Integration escape-hatch so you can call regular Java objects.</li> -<li>Benjamin Ball has a great <a href="http://java.dzone.com/articles/getting-started-rabbitmq-and">writeup on using RabbitMQ and Spring</a> </li> -<li>Yashwant Chavan has a nice post on building a simple <a href="http://www.technicalkeeda.com/spring/spring-boot-mvc-example">Spring Boot (with Spring MVC) example and editing it in Eclipse</a>. </li> -<li>Our pals at Codecentric are at it again! They've just released <a href="http://blog.codecentric.de/en/2014/09/spring-boot-admin-first-official-release/">their first cut of their <em>Spring Boot Admin</em></a>. This looks like something that would fit nicely in the <a href="http://github.com/spring-cloud/">Spring Cloud</a> project... </li> -<li> -<a href="http://prezi.com/ob4vxjmj_h1f/spring-boot/">This has to be one of the coolest Spring Boot presentations, ever</a>! Careful, I don't recommend watching it full-screen if you get motion sickness! :)</li> -<li>Are you stuck on Apache CXF but still want first-class security? This post <a href="http://java.dzone.com/articles/embedded-jetty-and-apache-cxf">looks at how to plugin Spring Security on top of CXF in minutes</a> </li> -<li>Biju Kunjummen did a nice job <a href="http://java.dzone.com/articles/spring-1">clarifying the differences between Spring's <code>WebApplicationInitializer</code> and <code>ApplicationContextInitializer</code></a> -</li> -</ul> - - - Webinar: Architecting for Continuous Delivery: Microservices with Pivotal CF and Spring Cloud - - - - Pieter Humphrey - - tag:spring.io,2014-10-01:1776 - 2014-10-01T02:20:00Z - <p>Speaker: Matt Stine, Pivotal </p> - -<p>Join Matt Stine to hear how you can architect systems that are optimized for continuous delivery, allowing you to innovate and deliver value faster and safer. Microservices, Pivotal CF, and Spring Cloud combine to create an operationalized architecture that enables enterprises to continuously deliver value at scale through rapid, iterative development, and to meet the needs of a mobile-first world.</p> - -<p>Tuesday, Oct 21st, 2014 3:00PM BST (London GMT+01:00) <a href="http://connect.pivotal.io/OSS_Webinar_MicroserviceswithPivotalCFandSpringCloud7AM_Register.html">Register</a></p> - -<p>Tuesday, Oct 21st, 2014 10:00AM PDT (San Francisco GMT-07:00) <a href="http://connect.pivotal.io/OSS_Webinar_MicroserviceswithPivotalCFandSpringCloud10AM_Register.html">Register</a></p> - - - Webinar: Building “Bootful” UIs with Spring Boot and Vaadin - - - - Pieter Humphrey - - tag:spring.io,2014-10-01:1777 - 2014-10-01T01:20:00Z - <p>Speaker: Josh Long, Pivotal and Vaadin</p> - -<p> It's been a long day, but you've done it: you've got a Spring Boot powered backend and now you need to build the UI that'll power the workforce and deliver next week. Vaadin, a UI framework that marries the ease of use of server-side Java and the rich, dynamic nature of client-side JavaScript, integrates well with Spring Boot and offers UI polish that would be hard to secure any other way. Join Spring developer advocate Josh Long and Vaadin evangelists for a look at how Vaadin and Spring Boot can get you to production quicker, and easier.</p> - -<p>Thursday, October 23, 2014, 2014 3:00PM BST (London GMT+01:00) <a href="http://connect.pivotal.io/OSS_Webinar_BuildingBootfulUIswithSpringBootandVaadin7AM_Register.html">Register</a></p> - -<p>Thursday, October 23, 2014 10:00AM PDT (San Francisco GMT-07:00) <a href="http://connect.pivotal.io/OSS_Webinar_BuildingBootfulUIswithSpringBootandVaadin10AM_Register.html">Register</a></p> - - - Webinar: Security for Microservices with Spring and OAuth2 - - - - Pieter Humphrey - - tag:spring.io,2014-10-01:1778 - 2014-10-01T01:10:00Z - <p>Speaker: Dave Syer</p> - -<p>Security for Microservices with Spring and OAuth2 OAuth2 is a lightweight security protocol that is well-suited for use with HTTP, the protocol at the heart of many modern architectures. Spring Security OAuth2 has a load of new features, not the least of which being the `@Configuration` support in version 2.0. Combine these with Spring Boot and you have a platform which can get you a secure HTTP service application in about 20 lines of code. This presentation shows how the combination of rapid development and production-ready features in the modern Spring stack are a perfect mixture for developing secure components in a system composed of microservices. We explore the new features in Spring OAuth2, guide you through the choice of which to use and when, and show how easy they are to enable quickly.</p> - -<p>Tuesday, November 4, 2014 3:00PM GMT (London GMT) <a href="http://connect.pivotal.io/OSS_Webinar_SecurityforMicroserviceswithSpringandOAuth2_7AM_Register.html">Register</a></p> - -<p>Tuesday, November 4, 2014 10:00AM PST (San Francisco GMT-08:00) <a href="http://connect.pivotal.io/OSS_Webinar_SecurityforMicroserviceswithSpringandOAuth2_10AM_Register.html">Register</a></p> - - - Webinar Replay: Why I Recommend Spring - - - - Pieter Humphrey - - tag:spring.io,2014-09-26:1773 - 2014-09-26T14:03:00Z - <p>Speaker: Michael Plod</p> - -<p>Slides: <a href="https://speakerdeck.com/mploed/pivotal-webinar-why-do-i-recommend-spring">https://speakerdeck.com/mploed/pivotal-webinar-why-do-i-recommend-spring</a></p> - -<p>Is Spring the new legacy as quite a few people tell you on their blogs? I disagree on many levels. Throughout this session I will holistically detail without any polemics why I do recommend using the Spring Framework and its ecosystem. Aspects that will be covered include: operational impacts, ecosystem, coding and road maps. This presentation is aimed at IT managers, Architects and Developers alike.</p> - -<p>Learn more about Spring IO: <a href="http://spring.io">http://spring.io</a></p> - -<p>Learn more about Spring IO Platform: <a href="http://spring.io/platform">http://spring.io/platform</a></p> - -<p></p><iframe width="420" height="315" src="//www.youtube.com/embed/z1rpWpSKtT8" frameborder="0" allowfullscreen></iframe> - - - Webinar Replay: Process Driven Spring Applications with Activiti - - - - Pieter Humphrey - - tag:spring.io,2014-09-26:1772 - 2014-09-26T13:56:00Z - <p>Speakers: Josh Long and Joram Barrez, Activiti </p> - -<p>Slides: <a href="https://speakerdeck.com/joshlong/process-driven-applications-with-spring-boot">https://speakerdeck.com/joshlong/process-driven-applications-with-spring-boot</a> </p> - -<p>Today's applications are complex, distributed systems that - taken together - produce results. Tracking the flow of work through that system, however, becomes increasingly more painful as automated- and human-driven tasks are integrated into business processes. Business can't react to what it can't see. Business can't measure what it can't see. "Workflow" describes the sequence of processes through which a piece of work passes from initiation to completion. Workflow systems, like Activiti, describe and then execute these processes. Activiti is an open-source, Apache 2-licensed workflow engine that works with Spring and Spring Boot. In this webinar, join Spring Developer Advocate Josh Long and Activiti-ninja Joram Barrez for a look at how to distill, describe and reuse complex business processes using Spring (and Spring Boot) and Activiti. </p> - -<p>Learn more about Spring Boot: <a href="http://projects.spring.io/spring-boot">http://projects.spring.io/spring-boot</a> </p> - -<p>Learn more about Activiti below! </p> - -<p>Activiti project page: <a href="http://activiti.org/">http://activiti.org/</a> </p> - -<p>Joram's blog: <a href="http://jorambarrez.com/blog">http://jorambarrez.com/blog</a> </p> - -<p>Activiti documentation: <a href="http://activiti.org/userguide/index.html">http://activiti.org/userguide/index.html</a> </p> - -<p>Activiti Github: <a href="https://github.com/Activiti/Activiti">https://github.com/Activiti/Activiti</a></p> - -<p></p><iframe width="420" height="315" src="//www.youtube.com/embed/0PV_8Lew3vg" frameborder="0" allowfullscreen></iframe> - - - Pivotal at JavaOne 2014 - - - - Pieter Humphrey - - tag:spring.io,2014-09-25:1770 - 2014-09-26T05:56:00Z - <p>Are you heading to JavaOne 2014?   If you are, we invite all of the Java community members to stop by the Pivotal Booth (Booth Number 5201) and talk to Pivotal engineers about the latest innovations in Java SE, in Spring, Groovy, Grails, Redis, RabbitMQ, Tomcat, Cloud Foundry and Hadoop. The exhibit space is open Monday, Tuesday from 9:30am – 5:30pm, and Wednesday from 9:30am to 4:30pm, so there should be plenty of time to get your questions answered.  See below for a map and booth details about our giveaways - come find us!  Lots of great stuff at the booth.</p> - -<p>Pivotal technologists are also presenting a lot of sessions as well so be sure to add the following talks to your session builder and reserve a seat:<br> -            <br> -Josh Long — Spring advocate at Pivotal</p> -<ul> -<li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=3868&amp;tclass=popup" target="_blank">The Spring BOF [BOF3868]</a></li> - <li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=3693&amp;tclass=popup" target="_blank">Spring 4TW! [CON3693]</a></li> -</ul><p>Cornelia Davis — Platform Engineer at Pivotal</p> -<ul> -<li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=4327&amp;tclass=popup" target="_blank">Running Your Spring Apps in the Cloud [CON4327]</a></li> -</ul><p>John Field — Solutions Architect at Pivotal</p> -<ul> -<li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=3478&amp;tclass=popup" target="_blank">Open Source Identity and Access Management Expert Panel, Part 3 [BOF3478]</a></li> - <li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=3479&amp;tclass=popup" target="_blank">The Anatomy of a Secure Web Application Using Java [CON3479]</a></li> -</ul><p>Guillaume Laforge — Groovy project manager at Pivotal</p> -<ul> -<li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=2939&amp;tclass=popup" target="_blank">Script Bowl 2014: The Battle Rages On [CON2939]</a></li> - <li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=5996&amp;tclass=popup" target="_blank">Groovy in 2014 and Beyond [CON5996]</a></li> - <li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=5839&amp;tclass=popup" target="_blank">Groovy in the Light of Java 8 [CON5839]</a></li> -</ul><p>Martin Lippert - Principal Software Engineer at Pivotal</p> -<ul> -<li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=1739&amp;tclass=popup" target="_blank">Connecting the Eclipse IDE to the Cloud-Based Era of Developer Tooling [CON1739]</a></li> -</ul><p>Oliver Gierke - Spring Data Project Lead at Pivotal</p> -<ul> -<li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=6071&amp;tclass=popup" target="_blank">REST Assured: Hypermedia APIs with Spring MVC [CON6071]</a></li> -</ul><p>Cédric Champeau — Senior software engineer in the Groovy team at Pivotal</p> -<ul> -<li><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=2425&amp;tclass=popup" target="_blank">Rethinking API Design with Groovy Traits [CON2425]</a></li> -</ul><p>Interesting non-Pivotal Sessions</p> -<p><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=1764" target="_blank">Groovy and Grails Puzzlers: As Usual—Traps, Pitfalls, and End Cases[CON1764]</a> <br><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=4952" target="_blank">Microservices on the JVM: A Practical Overview [CON4952]</a></p> -<p><a href="https://oracleus.activeevents.com/2014/connect/sessionDetail.ww?SESSION_ID=9447" target="_blank">Use Java, the Spring Framework, and Oracle Tuxedo to Extend Existing C/C++/COBOL Apps[HOL9447]</a> <br></p><p>Visit us at the booth for technical expert conversations on Cloud Foundry, Spring, Groovy, Grails, Redis, RabbitMQ, Tomcat, Hadoop and much more. We'll have great demos in the booth about:</p> -<ul> -<li> Java EE and PaaS with <a href="http://www.pivotal.io/platform-as-a-service/pivotal-cf">Cloud Foundry</a> via JBoss and WebLogic Buildpack demos</li> - - <li>Internet of Things, Hadoop with <a href="http://projects.spring.io/spring-xd">Spring XD</a> Demos</li> - <li> -<a href="http://microservices.io">Microservice Architecture</a> and <a href="http://www.pivotal.io/platform-as-a-service/pivotal-cf">PaaS</a> with <a href="http://projects.spring.io/spring-boot">Spring Boot</a>, <a href="http://projects.spring.io/spring-cloud">Spring Cloud</a> Demos</li> -</ul><p><a href="http://run.pivotal.io">Pivotal Web Services</a> Hoodie Push!  <a href="https://spring.io/guides/gs/rest-service/">Build a REST service with Spring Boot</a>, push it live to run.pivotal.io and get a hoodie!  You can do it ahead of time, and show it running to us, or use our laptops at the booth. </p> -<p><a href="https://raw.githubusercontent.com/pieterhumphrey/springio_website_images/master/hoodie.PNG" target="_blank"><img border="0" width="215" height="254" src="https://raw.githubusercontent.com/pieterhumphrey/springio_website_images/master/hoodie.PNG" style="max-width:100%;"></a></p> -<p> </p> -<p> </p> -<p>Save the date for SpringOne2GX 2015!  We hope you will mark your calendar and join us again! SpringOne2GX 2015 will be held September 14 - 17, 2015 at the Marriott Marquis in Washington DC.</p> -<p><a href="https://raw.githubusercontent.com/pieterhumphrey/springio_website_images/master/javaone_booth_pivotal.PNG" target="_blank"><img border="0" width="624" height="398" src="https://raw.githubusercontent.com/pieterhumphrey/springio_website_images/master/javaone_booth_pivotal.PNG" style="max-width:100%;"></a></p> -<p><a href="https://github.com/pieterhumphrey/springio_website_images/blob/master/javaone_booth_pivotal2.PNG" target="_blank"><img src="https://github.com/pieterhumphrey/springio_website_images/raw/master/javaone_booth_pivotal2.PNG" width="577" height="441" style="max-width:100%;"></a></p> -<p><br></p> - - - Spring Boot 1.1.7 released - - - - Phil Webb - - tag:spring.io,2014-09-26:1771 - 2014-09-26T04:56:15Z - <p>Spring Boot 1.1.7 has been released and is available now from <a href="http://repo.spring.io/release">repo.spring.io</a> and <a href="http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.springframework.boot%22">Maven Central</a>. </p> - -<p>This maintenance release is a recommended upgrade for all Spring Boot users. For a complete list of changes please refer to the <a href="https://github.com/spring-projects/spring-boot/issues?q=milestone%3A1.1.7">issue tracker</a>.</p> - -<p><a href="http://projects.spring.io/spring-boot/">Project Page</a> | <a href="https://github.com/spring-projects/spring-boot">GitHub</a> | <a href="https://github.com/spring-projects/spring-boot/issues">Issues</a> | <a href="http://docs.spring.io/spring-boot/docs/1.1.7.RELEASE/reference/htmlsingle">Documentation</a></p> - - - Demo: IoT Realized with Spring XD - The Connected Car - - - - Pieter Humphrey - - tag:spring.io,2014-09-25:1769 - 2014-09-24T20:59:00Z - <p>Speaker: Derek Beauregard -Contributors: Phil Berman, Darrel Sharpe, Michael Minella -In this demo we will explore the power of Spring XD in the context of the Internet of Things (IoT). We will look at a solution developed with Spring XD to stream real time analytics from a moving car using open standards. Ingestion of the real time data (location, speed, engine diagnostics, etc), analyzing it to provide highly accurate MPG and vehicle range prediction, as well as providing real time dashboards will all be covered. Watch this demo to get a sense of how Spring XD can serve as a critical building block for the IoT.</p> - -<iframe width="420" height="315" src="//www.youtube.com/embed/qkm2GV57hzY" frameborder="0" allowfullscreen></iframe> - - - diff --git a/.metadata/.plugins/org.springsource.ide.eclipse.dashboard.ui/feeds/dashboard.feeds.update/623127801.xml b/.metadata/.plugins/org.springsource.ide.eclipse.dashboard.ui/feeds/dashboard.feeds.update/623127801.xml deleted file mode 100644 index f87bdf6f7a..0000000000 --- a/.metadata/.plugins/org.springsource.ide.eclipse.dashboard.ui/feeds/dashboard.feeds.update/623127801.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - SpringSource Tool Suites Updates - http://www.springsource.com/products/sts - This feeds imforms about important updates relevant to users of STS. - Feeder 2.0.7(1195) http://reinventedsoftware.com/feeder/ - http://blogs.law.harvard.edu/tech/rss - en-us - sts@springsource.com - Mon, 13 Oct 2014 10:38:33 +0100 - Mon, 13 Oct 2014 10:38:33 +0100 - - - - - - Thanks for installing STS/GGTS 3.6.2 - http://spring.io/tools - -

Please review the following documents:

-
  • 3.6.2 New & Noteworthy

    • ]]> - Mon, 13 Oct 2014 12:13:33 +0100 - version=[3.6.2.201410090827-RELEASE,3.6.3) - - thanks-for-installing-sts-362 -

    Pivotal has released an update to Spring Tool Suite (STS) and Groovy/Grails Tool Suite (GGTS), the best Eclipse-powered development environment for building Spring, Groovy, and Grails powered enterprise application.

     - - - STS/GGTS 3.6.2 has been released - http://spring.io/tools -

    Pivotal has released an update to Spring Tool Suite (STS) and Groovy/Grails Tool Suite (GGTS), the best Eclipse-powered development environment for building Spring, Groovy, and Grails powered enterprise application.

    It is recommend to update as soon as possible.

    -

    Please review the following documents:

    -
  • 3.6.2 New & Noteworthy

    • ]]>     - Mon, 13 Oct 2014 12:12:33 +0100 - version=[0,3.6.2.201410090827-RELEASE) - severity=important - sts-362-released -     - - - - Cloud Foundry Eclipse 1.7.1 released - http://www.cloudfoundry.com -

    Pivotal has released Cloud Foundry Eclipse version 1.7.1 which features various application deployment and home page navigation improvements, and a new Cloud Routes wizard for browsing and deleting application routes. Java 7 is a required Execution Environment.

    ]]>     - Tue, 16 Sep 2014 10:38:33 +0100 - - - bundle=!org.cloudfoundry.ide.eclipse.feature.group - cloud-foundry-integration-171-released -     - - - - - - Patch released to fix a Xerces classloading issue - https://issuetracker.springsource.com/browse/STS-1672 -

    SpringSource has just published a patch to fix a severe issue in STS that causes parsing of Spring XML files to fail with a Xerces classloading issue.

    It is recommend to update as soon as possible. The feature patch is available from the STS Dashboard -> Extensions tab.

    -

    Get to get more details about the issue please read the following bug entries:

    -
  • Issue in the STS JIRA
    • -
  • Community forum discussion

    • We apologize that this patch did not make it into the 2.6.0 release of STS.

    ]]>     - Mon, 21 Mar 2011 10:38:33 +0100 - version=[2.6.0.201103160035-RELEASE,2.7.0.201105101000-M1) - severity=important - bundle=!org.springframework.ide.eclipse.patch.feature.feature.group - patch-STS1672-released -     - - - - - - - - - - - - diff --git a/.metadata/version.ini b/.metadata/version.ini deleted file mode 100644 index c51ff745b6..0000000000 --- a/.metadata/version.ini +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.core.runtime=1 \ No newline at end of file diff --git a/ejb/wildfly/pom.xml b/ejb/wildfly/pom.xml new file mode 100644 index 0000000000..d4843f9fc9 --- /dev/null +++ b/ejb/wildfly/pom.xml @@ -0,0 +1,81 @@ + + 4.0.0 + com.baeldung.wildfly + wildfly-example + 0.0.1-SNAPSHOT + pom + + + 1.8 + 1.8 + UTF-8 + + + widlfly-web + wildfly-ear + wildfly-jpa + wildfly-ejb-interfaces + wildfly-ejb + + + + + + + + javax + javaee-api + 7.0 + provided + + + + org.wildfly.bom + wildfly-javaee7 + 10.1.0.Final + import + pom + + + + org.hibernate + hibernate-core + 5.2.3.Final + provided + + + + com.baeldung.wildfly + wildlfy-ear + 0.0.1-SNAPSHOT + ear + + + + com.baeldung.wildfly + wildlfy-web + 0.0.1-SNAPSHOT + war + + + + com.baeldung.wildfly + wildlfy-jpa + 0.0.1-SNAPSHOT + + + + com.baeldung.wildfly + wildfly-ejb + 0.0.1-SNAPSHOT + + + + com.baeldung.wildfly + wildfly-ejb-interfaces + 0.0.1-SNAPSHOT + + + + \ No newline at end of file diff --git a/ejb/wildfly/widlfly-web/pom.xml b/ejb/wildfly/widlfly-web/pom.xml new file mode 100644 index 0000000000..2e316dedd9 --- /dev/null +++ b/ejb/wildfly/widlfly-web/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + com.baeldung.wildfly + wildfly-example + 0.0.1-SNAPSHOT + + widlfly-web + war + + + + + javax + javaee-api + 7.0 + provided + + + + com.baeldung.wildfly + wildfly-jpa + 0.0.1-SNAPSHOT + + + + com.baeldung.wildfly + wildfly-ejb-interfaces + 0.0.1-SNAPSHOT + + + + com.baeldung.wildfly + wildfly-ejb + 0.0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java b/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java new file mode 100644 index 0000000000..62feb6b4b9 --- /dev/null +++ b/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java @@ -0,0 +1,33 @@ + +import java.io.IOException; +import java.util.List; + +import javax.ejb.EJB; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import model.User; +import wildfly.beans.UserBeanLocal; + +/** + * Servlet implementation class TestEJBServlet + */ +public class TestEJBServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + @EJB + private UserBeanLocal userBean; + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + List users = userBean.getUsers(); + + response.getWriter() + .append("The number of users is: " + users.size()); + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + doGet(request, response); + } +} diff --git a/ejb/wildfly/widlfly-web/src/main/java/TestJPAServlet.java b/ejb/wildfly/widlfly-web/src/main/java/TestJPAServlet.java new file mode 100644 index 0000000000..609366c53a --- /dev/null +++ b/ejb/wildfly/widlfly-web/src/main/java/TestJPAServlet.java @@ -0,0 +1,54 @@ + +import java.io.IOException; +import java.util.List; + +import javax.annotation.Resource; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.transaction.UserTransaction; + +import model.User; + +/** + * Servlet implementation class TestJPAServlet + */ +public class TestJPAServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + @PersistenceContext(unitName = "wildfly-jpa") + EntityManager em; + + @Resource + UserTransaction tx; + + /** + * @see HttpServlet#HttpServlet() + */ + public TestJPAServlet() { + super(); + // TODO Auto-generated constructor stub + } + + /** + * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) + */ + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + Query q = em.createNamedQuery("User.findAll"); + List users = q.getResultList(); + response.getWriter() + .append("JPA users returned: " + users.size()); + } + + /** + * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) + */ + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + // TODO Auto-generated method stub + doGet(request, response); + } + +} diff --git a/ejb/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml b/ejb/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..5b3f664443 --- /dev/null +++ b/ejb/wildfly/widlfly-web/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,35 @@ + + + widlfly-web + + index.html + index.htm + index.jsp + default.html + default.htm + default.jsp + + + + TestJPAServlet + TestJPAServlet + TestJPAServlet + + + TestJPAServlet + /TestJPAServlet + + + + TestEJBServlet + TestEJBServlet + TestEJBServlet + + + TestEJBServlet + /TestEJBServlet + + \ No newline at end of file diff --git a/ejb/wildfly/wildfly-ear/pom.xml b/ejb/wildfly/wildfly-ear/pom.xml new file mode 100644 index 0000000000..6beb387227 --- /dev/null +++ b/ejb/wildfly/wildfly-ear/pom.xml @@ -0,0 +1,62 @@ + + 4.0.0 + + com.baeldung.wildfly + wildfly-example + 0.0.1-SNAPSHOT + + wildfly-ear + ear + + + + + com.baeldung.wildfly + widlfly-web + 0.0.1-SNAPSHOT + war + + + + com.baeldung.wildfly + wildfly-jpa + 0.0.1-SNAPSHOT + + + + com.baeldung.wildfly + wildfly-ejb + + + + com.baeldung.wildfly + wildfly-ejb-interfaces + + + + + + + maven-ear-plugin + 2.10.1 + + lib/ + 7 + + + com.baeldung.wildfly + widlfly-web + /wildfly + + + + + + org.wildfly.plugins + wildfly-maven-plugin + 1.2.0.Final + + + + \ No newline at end of file diff --git a/ejb/wildfly/wildfly-ejb-interfaces/pom.xml b/ejb/wildfly/wildfly-ejb-interfaces/pom.xml new file mode 100644 index 0000000000..e4d2eee0c6 --- /dev/null +++ b/ejb/wildfly/wildfly-ejb-interfaces/pom.xml @@ -0,0 +1,26 @@ + + 4.0.0 + + com.baeldung.wildfly + wildfly-example + 0.0.1-SNAPSHOT + + wildfly-ejb-interfaces + + + + + javax.ejb + javax.ejb-api + 3.2 + provided + + + + com.baeldung.wildfly + wildfly-jpa + 0.0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java b/ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java new file mode 100644 index 0000000000..16930cb5b9 --- /dev/null +++ b/ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanLocal.java @@ -0,0 +1,13 @@ +package wildfly.beans; + +import java.util.List; + +import javax.ejb.Local; + +import model.User; + +@Local +public interface UserBeanLocal { + + List getUsers(); +} diff --git a/ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java b/ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java new file mode 100644 index 0000000000..5b57d4283f --- /dev/null +++ b/ejb/wildfly/wildfly-ejb-interfaces/src/main/java/wildfly/beans/UserBeanRemote.java @@ -0,0 +1,13 @@ +package wildfly.beans; + +import java.util.List; + +import javax.ejb.Remote; + +import model.User; + +@Remote +public interface UserBeanRemote { + + List getUsers(); +} diff --git a/ejb/wildfly/wildfly-ejb/pom.xml b/ejb/wildfly/wildfly-ejb/pom.xml new file mode 100644 index 0000000000..9d4464dafa --- /dev/null +++ b/ejb/wildfly/wildfly-ejb/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + com.baeldung.wildfly + wildfly-example + 0.0.1-SNAPSHOT + + wildfly-ejb + ejb + + + + + javax.ejb + javax.ejb-api + 3.2 + provided + + + + javax + javaee-api + provided + + + + org.hibernate + hibernate-core + + + + com.baeldung.wildfly + wildfly-ejb-interfaces + + + + + + + org.apache.maven.plugins + maven-ejb-plugin + + 3.2 + + + + + \ No newline at end of file diff --git a/ejb/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java b/ejb/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java new file mode 100644 index 0000000000..07e3cbcb32 --- /dev/null +++ b/ejb/wildfly/wildfly-ejb/src/main/java/wildfly/beans/UserBean.java @@ -0,0 +1,24 @@ +package wildfly.beans; + +import java.util.List; + +import javax.ejb.Stateless; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import model.User; + +/** + * Session Bean implementation class UserBean + */ +@Stateless +public class UserBean implements UserBeanRemote, UserBeanLocal { + @PersistenceContext(unitName = "wildfly-jpa") + private EntityManager em; + + @Override + public List getUsers() { + return em.createNamedQuery("User.findAll") + .getResultList(); + } +} diff --git a/ejb/wildfly/wildfly-jpa/pom.xml b/ejb/wildfly/wildfly-jpa/pom.xml new file mode 100644 index 0000000000..e6f8b32e17 --- /dev/null +++ b/ejb/wildfly/wildfly-jpa/pom.xml @@ -0,0 +1,20 @@ + + 4.0.0 + + com.baeldung.wildfly + wildfly-example + 0.0.1-SNAPSHOT + + wildfly-jpa + + + + + + org.hibernate + hibernate-core + provided + + + \ No newline at end of file diff --git a/ejb/wildfly/wildfly-jpa/src/main/java/model/User.java b/ejb/wildfly/wildfly-jpa/src/main/java/model/User.java new file mode 100644 index 0000000000..3a3f95bf8c --- /dev/null +++ b/ejb/wildfly/wildfly-jpa/src/main/java/model/User.java @@ -0,0 +1,51 @@ +package model; + +import java.io.Serializable; +import javax.persistence.*; + +/** + * The persistent class for the users database table. + * + */ +@Entity +@Table(name = "users") +@NamedQuery(name = "User.findAll", query = "SELECT u FROM User u") +public class User implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private String username; + + private String email; + + @Column(name = "postal_number") + private Integer postalNumber; + + public User() { + } + + public String getUsername() { + return this.username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return this.email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Integer getPostalNumber() { + return this.postalNumber; + } + + public void setPostalNumber(Integer postalNumber) { + this.postalNumber = postalNumber; + } + +} \ No newline at end of file diff --git a/ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml b/ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml new file mode 100644 index 0000000000..1a3fc32381 --- /dev/null +++ b/ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,9 @@ + + + + java:/PostgresDS + model.User + + From e5400faad87426eb407b24c71034c111da8af5f6 Mon Sep 17 00:00:00 2001 From: Seun Matt Date: Tue, 17 Oct 2017 19:55:47 +0100 Subject: [PATCH 032/197] PR for BAEL-128 CAS SSO With Spring Security (#2743) * added updated example codes * updated example code StringToCharStream * deleted StringToCharStream.java locally * removed redundant file * added code for apache commons collection SetUtils * refactored example code * added example code for bytebuddy * added example code for PCollections * update pom * refactored tests for PCollections * spring security xml config * spring security xml config * remove redundant comment * example code for apache-shiro * updated example code for Vavr Collections * updated Vavr's Collection example * updated Vavr Collection file * updated example code for Apache Shiro * updated Vavr Collections example * added example code for N1QL * update example code for N1QL * added integration test for N1QL * update N1QL Example code * update the N1QL example Code * rename module to couchbase * rename module to couchbase * change module name in parent module and pom * added cas-server module * added cas secured app for Spring SSO with CAS --- cas-secured-app/.gitignore | 24 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 47610 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + cas-secured-app/mvnw | 225 +++++++++++++++++ cas-secured-app/mvnw.cmd | 143 +++++++++++ cas-secured-app/pom.xml | 110 ++++++++ .../CasSecuredAppApplication.java | 91 +++++++ .../cassecuredapp/config/SecurityConfig.java | 83 +++++++ .../controllers/AuthController.java | 35 +++ .../controllers/IndexController.java | 15 ++ .../controllers/SecuredPageController.java | 24 ++ .../src/main/resources/application.properties | 1 + .../main/resources/templates/auth/logout.ftl | 10 + .../src/main/resources/templates/index.ftl | 11 + .../main/resources/templates/secure/index.ftl | 12 + .../CasSecuredAppApplicationTests.java | 16 ++ cas-server/.gitignore | 14 ++ cas-server/LICENSE.txt | 202 +++++++++++++++ cas-server/README.md | 88 +++++++ cas-server/build.cmd | 82 ++++++ cas-server/build.sh | 97 ++++++++ cas-server/etc/cas/config/application.yml | 2 + cas-server/etc/cas/config/cas.properties | 7 + cas-server/etc/cas/config/log4j2.xml | 117 +++++++++ cas-server/etc/cas/thekeystore | Bin 0 -> 2225 bytes cas-server/etc/cas/thekeystore.crt | Bin 0 -> 808 bytes cas-server/maven/maven-wrapper.properties | 1 + cas-server/mvnw | 234 ++++++++++++++++++ cas-server/mvnw.bat | 174 +++++++++++++ cas-server/pom.xml | 158 ++++++++++++ .../src/main/resources/application.properties | 126 ++++++++++ cas-server/src/main/resources/cas.properties | 41 +++ .../resources/services/casSecuredApp.json | 8 + pom.xml | 2 + 34 files changed, 2154 insertions(+) create mode 100644 cas-secured-app/.gitignore create mode 100644 cas-secured-app/.mvn/wrapper/maven-wrapper.jar create mode 100644 cas-secured-app/.mvn/wrapper/maven-wrapper.properties create mode 100644 cas-secured-app/mvnw create mode 100644 cas-secured-app/mvnw.cmd create mode 100644 cas-secured-app/pom.xml create mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java create mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java create mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java create mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java create mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java create mode 100644 cas-secured-app/src/main/resources/application.properties create mode 100644 cas-secured-app/src/main/resources/templates/auth/logout.ftl create mode 100644 cas-secured-app/src/main/resources/templates/index.ftl create mode 100644 cas-secured-app/src/main/resources/templates/secure/index.ftl create mode 100644 cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java create mode 100644 cas-server/.gitignore create mode 100644 cas-server/LICENSE.txt create mode 100644 cas-server/README.md create mode 100644 cas-server/build.cmd create mode 100644 cas-server/build.sh create mode 100644 cas-server/etc/cas/config/application.yml create mode 100644 cas-server/etc/cas/config/cas.properties create mode 100644 cas-server/etc/cas/config/log4j2.xml create mode 100644 cas-server/etc/cas/thekeystore create mode 100644 cas-server/etc/cas/thekeystore.crt create mode 100644 cas-server/maven/maven-wrapper.properties create mode 100644 cas-server/mvnw create mode 100644 cas-server/mvnw.bat create mode 100644 cas-server/pom.xml create mode 100644 cas-server/src/main/resources/application.properties create mode 100644 cas-server/src/main/resources/cas.properties create mode 100644 cas-server/src/main/resources/services/casSecuredApp.json diff --git a/cas-secured-app/.gitignore b/cas-secured-app/.gitignore new file mode 100644 index 0000000000..2af7cefb0a --- /dev/null +++ b/cas-secured-app/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/cas-secured-app/.mvn/wrapper/maven-wrapper.jar b/cas-secured-app/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..9cc84ea9b4d95453115d0c26488d6a78694e0bc6 GIT binary patch literal 47610 zcmbTd1CXW7vMxN+wr$(CZCk5to71*!+jjS~ZJX1!ds=tCefGhB{(HVS`>u$J^~PFn zW>r>YRc2N`sUQsug7OUl0^-}ZZ-jr^e|{kUJj#ly2+~T*iO~apQ;-J#>z!{v|9nH? zexD9D~4A70;F%I|$?{aX9)~)7!NMGs_XtoO(D2z3Q#5Lmj zOYWk1b{iMmsdX30UFmYyZk1gWICVeOtk^$+{3U2(8gx?WA2F!EfBPf&|1?AJ|5Z>M zfUAk^zcf#n|9^4|J34286~NKrUt&c5cZ~iqE?PH7fW5tm3-qG$) z56%`QPSn!0RMV3)jjXfG^UQ}*^yBojH!}58lPlDclX5iUhf*|DV=~e*bl;(l$Wn@r zPE*iH(NK!e9KQcU$rRM}aJc?-&H1PO&vOs*=U+QVvwuk-=zr1x>;XpRCjSyC;{TWQ z|824V8t*^*{x=5yn^pP#-?k<5|7|4y&Pd44&e_TN&sxg@ENqpX0glclj&w%W04Jwp zwJ}#@ag^@h5VV4H5U@i7V#A*a;4bzM-y_rd{0WG#jRFPJU}(#&o8vo@uM+B+$>Tiq zei^5$wg8CVf{+_#Vh`yPx-6TmB~zT_nocS_Rb6&EYp*KjbN#-aP<~3j=NVuR)S1wm zdy3AWx2r9uww3eNJxT>{tdmY4#pLw`*`_fIwSu;yzFYP)=W6iawn`s*omzNbR?E&LyC17rFcjWp!M~p?;{v!78DTxtF85BK4dT< zA5p)Z%6O}mP?<%Z{>nZmbVEbomm zLgy;;N&!y>Dma2sqmbvz&KY-j&s~dd#mWGlNF%7}vS7yt>Dm{P=X zG>Pyv2D!ba0CcTI*G6-v?!0}`EWm1d?K)DgZIQk9eucI&lBtR))NxqVz)+hBR1b|7 zgv&^46cI?mgCvp>lY9W(nJT#^<*kY3o#Php1RZLY@ffmLLq3A!Yd}O~n@BhXVp`<5 zJx`BjR%Svv)Sih_8TFg-9F-Gg3^kQrpDGej@uT5%y_9NSsk5SW>7{>&11u(JZHsZO zZweI|!&qHl0;7qxijraQo=oV^Pi~bNlzx;~b2+hXreonWGD%C$fyHs+8d1kKN>TgB z{Mu?~E{=l1osx|_8P*yC>81_GB7>NS7UA+x2k_c*cU-$gQjR{+IU)z069Ic$<)ci< zb?+V#^-MK!0s~wRP|grx?P^8EZ(9Jt0iA{`uVS6fNo>b@as5_-?e766V}&)8ZOEVtKB z*HtHAqat+2lbJbEI#fl~`XKNIF&J?PHKq)A!z(#j%)Uby=5d!bQP)-Mr!0#J=FV%@9G#Cby%r#(S=23H#9d)5Ndy>pIXJ%si!D=m*-QQZ(O9~#Jhx#AS3 z&Vs+*E5>d+{ib4>FEd#L15-ovl*zV%SYSWF>Z}j!vGn=g%w0~3XvAK&$Dl@t5hiUa#mT(4s9-JF1l zPi5d2YmuFJ4S(O>g~H)5l_`%h3qm?+8MmhXA>GRN}7GX;$4(!WTkYZB=TA^8ZFh^d9_@x$fK4qenP!zzaqQ1^(GQ- zjC$P$B5o{q&-H8UH_$orJTv0}#|9ja(vW9gA%l|@alYk+Uth1ey*ax8wmV7U?^Z9? zsQMrEzP8|_s0=bii4wDWa7te&Vmh9T>fcUXJS|dD3Y$A`s-7kY!+idEa`zB) zaW*%xb+#}9INSa62(M1kwL=m_3E2T|l5Sm9QmON8ewxr#QR`;vOGCgyMsA8$O(;=U z#sEw)37duzeM#9_7l!ly#5c+Mu3{;<9%O{e z`+0*{COEF^py;f6)y6NX)gycj`uU9pdZMum9h(bS!zu1gDXdmF4{Og{u;d(Dr~Co1 z1tm@i#5?>oL}-weK1zJRlLv*+M?l=eI~Sp9vg{R6csq=3tYSB2pqB8 z=#p`us7r|uH=cZnGj|juceAu8J#vb+&UFLFmGn~9O|TNeGH>sboBl%JI9v(@^|45? zLvr2ha)NWP4yxV8K%dU(Ae=zl)qdGyz={$my;Vs6?4?2*1?&u!OFyFbAquv6@1e)~&Rp#Ww9O88!mrze((=@F?&BPl_u9gK4VlHo@4gLK_pGtEA(gO4YpIIWTrFN zqVi%Q{adXq^Ez~dZ0VUC>DW`pGtpTY<9tMd;}WZUhT1iy+S^TfHCWXGuDwAv1Ik85 zh3!tSlWU3*aLtmdf?g(#WnLvVCXW$>gnT_{(%VilR=#2VKh~S}+Po#ha9C*<-l~Fx z$EK{1SO8np&{JC)7hdM8O+C( zF^s3HskJz@p3ot`SPKA92PG!PmC2d|9xA!CZxR!rK9-QYYBGAM-Gj zCqzBaIjtOZ6gu+lA%**RI7to$x^s8xIx}VF96=<29CjWtsl;tmNbuHgrCyB^VzEIB zt@sqnl8Vg`pnMppL6vbjNNKc?BrH<)fxiZ|WrYW%cnz-FMENGzMI+)@l7dit?oP|Wu zg-oLcv~79=fdqEM!zK%lI=R7S!Do!HBaD+*h^ULWVB}4jr^e5oUqY`zA&NUvzseI% z+XCvzS+n|m7WJoyjXXk(PE8;i^r$#Pq|NFd!{g~m2OecA1&>$7SYFw z;}Q{`F3LCE34Z>5;5dDtz&2Z&w|B9fwvU<@S<BBo(L4SbDV#X3%uS+<2q7iH+0baiGzlVP5n0fBDP z7kx+7|Cws+?T|cw-pt~SIa7BRDI_ATZ9^aQS^1I?WfnfEHZ*sGlT#Wk9djDL?dWLA zk%(B?<8L?iV*1m803UW|*sU$raq<(!N!CrQ&y7?7_g zF2!aAfw5cWqO}AX)+v)5_GvQ$1W8MV8bTMr3P{^!96Q4*YhS}9ne|+3GxDJmZEo zqh;%RqD5&32iTh7kT>EEo_%`8BeK&)$eXQ-o+pFIP!?lee z&kos;Q)_afg1H&{X|FTQ0V z@yxv4KGGN)X|n|J+(P6Q`wmGB;J}bBY{+LKVDN9#+_w9s$>*$z)mVQDOTe#JG)Zz9*<$LGBZ-umW@5k5b zbIHp=SJ13oX%IU>2@oqcN?)?0AFN#ovwS^|hpf5EGk0#N<)uC{F}GG}%;clhikp2* zu6ra2gL@2foI>7sL`(x5Q)@K2$nG$S?g`+JK(Q0hNjw9>kDM|Gpjmy=Sw5&{x5$&b zE%T6x(9i|z4?fMDhb%$*CIe2LvVjuHca`MiMcC|+IU51XfLx(BMMdLBq_ z65RKiOC$0w-t)Cyz0i-HEZpkfr$>LK%s5kga^FIY_|fadzu*r^$MkNMc!wMAz3b4P+Z3s(z^(%(04}dU>ef$Xmof(A|XXLbR z2`&3VeR1&jjKTut_i?rR_47Z`|1#$NE$&x#;NQM|hxDZ>biQ*+lg5E62o65ILRnOOOcz%Q;X$MJ?G5dYmk$oL_bONX4 zT^0yom^=NsRO^c$l02#s0T^dAAS&yYiA=;rLx;{ro6w08EeTdVF@j^}Bl;o=`L%h! zMKIUv(!a+>G^L3{z7^v3W$FUUHA+-AMv~<}e?2?VG|!itU~T>HcOKaqknSog zE}yY1^VrdNna1B6qA`s?grI>Y4W%)N;~*MH35iKGAp*gtkg=FE*mFDr5n2vbhwE|4 zZ!_Ss*NMZdOKsMRT=uU{bHGY%Gi=K{OD(YPa@i}RCc+mExn zQogd@w%>14cfQrB@d5G#>Lz1wEg?jJ0|(RwBzD74Eij@%3lyoBXVJpB{q0vHFmE7^ zc91!c%pt&uLa|(NyGF2_L6T{!xih@hpK;7B&bJ#oZM0`{T6D9)J2IXxP?DODPdc+T zC>+Zq8O%DXd5Gog2(s$BDE3suv=~s__JQnX@uGt+1r!vPd^MM}=0((G+QopU?VWgR zqj8EF0?sC`&&Nv-m-nagB}UhXPJUBn-UaDW9;(IX#)uc zL*h%hG>ry@a|U=^=7%k%V{n=eJ%Nl0Oqs!h^>_PgNbD>m;+b)XAk+4Cp=qYxTKDv& zq1soWt*hFf%X8}MpQZL-Lg7jc0?CcWuvAOE(i^j1Km^m8tav)lMx1GF{?J#*xwms2 z3N_KN-31f;@JcW(fTA`J5l$&Q8x{gb=9frpE8K0*0Rm;yzHnDY0J{EvLRF0 zRo6ca)gfv6C)@D#1I|tgL~uHJNA-{hwJQXS?Kw=8LU1J$)nQ-&Jhwxpe+%WeL@j0q z?)92i;tvzRki1P2#poL;YI?9DjGM4qvfpsHZQkJ{J^GNQCEgUn&Sg=966 zq?$JeQT+vq%zuq%%7JiQq(U!;Bsu% zzW%~rSk1e+_t89wUQOW<8%i|5_uSlI7BcpAO20?%EhjF%s%EE8aY15u(IC za2lfHgwc;nYnES7SD&Lf5IyZvj_gCpk47H}e05)rRbfh(K$!jv69r5oI| z?){!<{InPJF6m|KOe5R6++UPlf(KUeb+*gTPCvE6! z(wMCuOX{|-p(b~)zmNcTO%FA z$-6}lkc*MKjIJ(Fyj^jkrjVPS);3Qyq~;O$p+XT+m~0$HsjB@}3}r*h(8wGbH9ktQ zbaiiMSJf`6esxC3`u@nNqvxP1nBwerm|KN)aBzu$8v_liZ0(G8}*jB zv<8J%^S2E_cu+Wp1;gT66rI$>EwubN4I(Lo$t8kzF@?r0xu8JX`tUCpaZi(Q0~_^K zs6pBkie9~06l>(Jpy*d&;ZH{HJ^Ww6>Hs!DEcD{AO42KX(rTaj)0ox`;>}SRrt)N5 zX)8L4Fg)Y6EX?He?I`oHeQiGJRmWOAboAC4Jaf;FXzspuG{+3!lUW8?IY>3%)O546 z5}G94dk)Y>d_%DcszEgADP z8%?i~Ak~GQ!s(A4eVwxPxYy3|I~3I=7jf`yCDEk_W@yfaKjGmPdM}($H#8xGbi3l3 z5#?bjI$=*qS~odY6IqL-Q{=gdr2B5FVq7!lX}#Lw**Pyk!`PHN7M3Lp2c=T4l}?kn zVNWyrIb(k&`CckYH;dcAY7-kZ^47EPY6{K(&jBj1Jm>t$FD=u9U z#LI%MnI3wPice+0WeS5FDi<>~6&jlqx=)@n=g5TZVYdL@2BW3w{Q%MkE%sx}=1ihvj(HDjpx!*qqta?R?| zZ(Ju_SsUPK(ZK*&EdAE(Fj%eABf2+T>*fZ6;TBP%$xr(qv;}N@%vd5iGbzOgyMCk* z3X|-CcAz%}GQHalIwd<-FXzA3btVs-_;!9v7QP)V$ruRAURJhMlw7IO@SNM~UD)2= zv}eqKB^kiB))Yhh%v}$ubb#HBQHg3JMpgNF+pN*QbIx(Rx1ofpVIL5Y{)0y&bMO(@ zyK1vv{8CJQidtiI?rgYVynw{knuc!EoQ5-eete(AmM`32lI7{#eS#!otMBRl21|g^SVHWljl8jU?GU@#pYMIqrt3mF|SSYI&I+Vz|%xuXv8;pHg zlzFl!CZ>X%V#KWL3+-743fzYJY)FkKz>GJ<#uKB)6O8NbufCW%8&bQ^=8fHYfE(lY z1Fl@4l%|iaTqu=g7tTVk)wxjosZf2tZ2`8xs9a$b1X29h!9QP#WaP#~hRNL>=IZO@SX4uYQR_c0pSt89qQR@8gJhL*iXBTSBDtlsiNvc_ewvY-cm%bd&sJTnd@hE zwBGvqGW$X^oD~%`b@yeLW%An*as@4QzwdrpKY9-E%5PLqvO6B+bf>ph+TWiPD?8Ju z-V}p@%LcX{e)?*0o~#!S%XU<+9j>3{1gfU=%sHXhukgH+9z!)AOH_A{H3M}wmfmU8 z&9jjfwT-@iRwCbIEwNP4zQHvX3v-d*y87LoudeB9Jh5+mf9Mnj@*ZCpwpQ*2Z9kBWdL19Od7q|Hdbwv+zP*FuY zQc4CJ6}NIz7W+&BrB5V%{4Ty$#gf#V<%|igk)b@OV`0@<)cj(tl8~lLtt^c^l4{qP z=+n&U0LtyRpmg(_8Qo|3aXCW77i#f{VB?JO3nG!IpQ0Y~m!jBRchn`u>HfQuJwNll zVAMY5XHOX8T?hO@7Vp3b$H)uEOy{AMdsymZ=q)bJ%n&1;>4%GAjnju}Osg@ac*O?$ zpu9dxg-*L(%G^LSMhdnu=K)6ySa|}fPA@*Saj}Z>2Dlk~3%K(Py3yDG7wKij!7zVp zUZ@h$V0wJ|BvKc#AMLqMleA*+$rN%#d95$I;;Iy4PO6Cih{Usrvwt2P0lh!XUx~PGNySbq#P%`8 zb~INQw3Woiu#ONp_p!vp3vDl^#ItB06tRXw88L}lJV)EruM*!ZROYtrJHj!X@K$zJ zp?Tb=Dj_x1^)&>e@yn{^$B93%dFk~$Q|0^$=qT~WaEU-|YZZzi`=>oTodWz>#%%Xk z(GpkgQEJAibV%jL#dU)#87T0HOATp~V<(hV+CcO?GWZ_tOVjaCN13VQbCQo=Dt9cG znSF9X-~WMYDd66Rg8Ktop~CyS7@Pj@Vr<#Ja4zcq1}FIoW$@3mfd;rY_Ak^gzwqqD z^4<_kC2Eyd#=i8_-iZ&g_e#$P`;4v zduoZTdyRyEZ-5WOJwG-bfw*;7L7VXUZ8aIA{S3~?()Yly@ga|-v%?@2vQ;v&BVZlo7 z49aIo^>Cv=gp)o?3qOraF_HFQ$lO9vHVJHSqq4bNNL5j%YH*ok`>ah?-yjdEqtWPo z+8i0$RW|$z)pA_vvR%IVz4r$bG2kSVM&Z;@U*{Lug-ShiC+IScOl?O&8aFYXjs!(O z^xTJ|QgnnC2!|xtW*UOI#vInXJE!ZpDob9x`$ox|(r#A<5nqbnE)i<6#(=p?C~P-7 zBJN5xp$$)g^l};@EmMIe;PnE=vmPsTRMaMK;K`YTPGP0na6iGBR8bF%;crF3>ZPoLrlQytOQrfTAhp;g){Mr$zce#CA`sg^R1AT@tki!m1V zel8#WUNZfj(Fa#lT*nT>^pY*K7LxDql_!IUB@!u?F&(tfPspwuNRvGdC@z&Jg0(-N z(oBb3QX4em;U=P5G?Y~uIw@E7vUxBF-Ti*ccU05WZ7`m=#4?_38~VZvK2{MW*3I#fXoFG3?%B;ki#l%i#$G_bwYQR-4w>y;2` zMPWDvmL6|DP1GVXY)x+z8(hqaV5RloGn$l&imhzZEZP6v^d4qAgbQ~bHZEewbU~Z2 zGt?j~7`0?3DgK+)tAiA8rEst>p#;)W=V+8m+%}E$p-x#)mZa#{c^3pgZ9Cg}R@XB) zy_l7jHpy(u;fb+!EkZs6@Z?uEK+$x3Ehc8%~#4V?0AG0l(vy{8u@Md5r!O+5t zsa{*GBn?~+l4>rChlbuT9xzEx2yO_g!ARJO&;rZcfjzxpA0Chj!9rI_ZD!j` z6P@MWdDv&;-X5X8o2+9t%0f1vJk3R~7g8qL%-MY9+NCvQb)%(uPK4;>y4tozQ2Dl* zEoR_1#S~oFrd9s%NOkoS8$>EQV|uE<9U*1uqAYWCZigiGlMK~vSUU}f5M9o{<*WW? z$kP)2nG$My*fUNX3SE!g7^r#zTT^mVa#A*5sBP8kz4se+o3y}`EIa)6)VpKmto6Ew z1J-r2$%PM4XUaASlgVNv{BBeL{CqJfFO|+QpkvsvVBdCA7|vlwzf1p$Vq50$Vy*O+ z5Eb85s^J2MMVj53l4_?&Wpd1?faYE-X1ml-FNO-|a;ZRM*Vp!(ods{DY6~yRq%{*< zgq5#k|KJ70q47aO1o{*gKrMHt)6+m(qJi#(rAUw0Uy8~z8IX)>9&PTxhLzh#Oh*vZ zPd1b$Z&R{yc&TF^x?iQCw#tV}la&8^W)B*QZ${19LlRYgu#nF7Zj`~CtO^0S#xp+r zLYwM~si$I>+L}5gLGhN=dyAKO)KqPNXUOeFm#o+3 z&#!bD%aTBT@&;CD_5MMC&_Yi+d@nfuxWSKnYh0%~{EU`K&DLx}ZNI2osu#(gOF2}2 zZG#DdQ|k0vXj|PxxXg-MYSi9gI|hxI%iP)YF2$o< zeiC8qgODpT?j!l*pj_G(zXY2Kevy~q=C-SyPV$~s#f-PW2>yL}7V+0Iu^wH;AiI$W zcZDeX<2q%!-;Ah!x_Ld;bR@`bR4<`FTXYD(%@CI#biP z5BvN;=%AmP;G0>TpInP3gjTJanln8R9CNYJ#ziKhj(+V33zZorYh0QR{=jpSSVnSt zGt9Y7Bnb#Ke$slZGDKti&^XHptgL7 zkS)+b>fuz)B8Lwv&JV*};WcE2XRS63@Vv8V5vXeNsX5JB?e|7dy$DR9*J#J= zpKL@U)Kx?Y3C?A3oNyJ5S*L+_pG4+X*-P!Er~=Tq7=?t&wwky3=!x!~wkV$Ufm(N| z1HY?`Ik8?>%rf$6&0pxq8bQl16Jk*pwP`qs~x~Trcstqe-^hztuXOG zrYfI7ZKvK$eHWi9d{C${HirZ6JU_B`f$v@SJhq?mPpC-viPMpAVwE;v|G|rqJrE5p zRVf904-q{rjQ=P*MVKXIj7PSUEzu_jFvTksQ+BsRlArK&A*=>wZPK3T{Ki-=&WWX= z7x3VMFaCV5;Z=X&(s&M^6K=+t^W=1>_FFrIjwjQtlA|-wuN7&^v1ymny{51gZf4-V zU8|NSQuz!t<`JE%Qbs||u-6T*b*>%VZRWsLPk&umJ@?Noo5#{z$8Q0oTIv00`2A`# zrWm^tAp}17z72^NDu^95q1K)6Yl`Wvi-EZA+*i&8%HeLi*^9f$W;f1VF^Y*W;$3dk|eLMVb_H{;0f*w!SZMoon+#=CStnG-7ZU8V>Iy( zmk;42e941mi7!e>J0~5`=NMs5g)WrdUo^7sqtEvwz8>H$qk=nj(pMvAb4&hxobPA~p&-L5a_pTs&-0XCm zKXZ8BkkriiwE)L2CN$O-`#b15yhuQO7f_WdmmG<-lKeTBq_LojE&)|sqf;dt;llff znf|C$@+knhV_QYVxjq*>y@pDK|DuZg^L{eIgMZnyTEoe3hCgVMd|u)>9knXeBsbP_$(guzw>eV{?5l$ z063cqIysrx82-s6k;vE?0jxzV{@`jY3|*Wp?EdNUMl0#cBP$~CHqv$~sB5%50`m(( zSfD%qnxbGNM2MCwB+KA?F>u__Ti>vD%k0#C*Unf?d)bBG6-PYM!!q;_?YWptPiHo} z8q3M~_y9M6&&0#&uatQD6?dODSU)%_rHen`ANb z{*-xROTC1f9d!8`LsF&3jf{OE8~#;>BxHnOmR}D80c2Eh zd867kq@O$I#zEm!CCZJw8S`mCx}HrCl_Rh4Hsk{Cb_vJ4VA3GK+icku z%lgw)Y@$A0kzEV^#=Zj8i6jPk&Mt_bKDD!jqY3&W(*IPbzYu$@x$|3*aP{$bz-~xE^AOxtbyWvzwaCOHv6+99llI&xT_8)qX3u|y|0rDV z(Hu*#5#cN0mw4OSdY$g_xHo-zyZ-8WW&4r%qW(=5N>0O-t{k;#G9X81F~ynLV__Kz zbW1MA>Pjg0;3V?iV+-zQsll_0jimGuD|0GNW^av|4yes(PkR1bGZwO6xvgCy}ThR7?d&$N`kA3N!Xn5uSKKCT-`{lE1ZYYy?GzL}WF+mh|sgT6K2Z*c9YB zFSpGRNgYvk&#<2@G(vUM5GB|g?gk~-w+I4C{vGu{`%fiNuZIeu@V1qt`-x$E?OR;zu866Y@2^et5GTNCpX#3D=|jD5>lT^vD$ zr}{lRL#Lh4g45Yj43Vs7rxUb*kWC?bpKE1@75OJQ=XahF z5(C0DyF;at%HtwMTyL!*vq6CLGBi^Ey}Mx39TC2$a)UmekKDs&!h>4Hp2TmSUi!xo zWYGmyG)`$|PeDuEL3C6coVtit>%peYQ6S1F4AcA*F`OA;qM+1U6UaAI(0VbW#!q9* zz82f@(t35JH!N|P4_#WKK6Rc6H&5blD6XA&qXahn{AP=oKncRgH!&=b6WDz?eexo* z9pzh}_aBc_R&dZ+OLk+2mK-5UhF`>}{KN7nOxb{-1 zd`S-o1wgCh7k0u%QY&zoZH}!<;~!)3KTs-KYRg}MKP3Vl%p$e6*MOXLKhy)<1F5L* z+!IH!RHQKdpbT8@NA+BFd=!T==lzMU95xIyJ13Z6zysYQ1&zzH!$BNU(GUm1QKqm< zTo#f%;gJ@*o;{#swM4lKC(QQ<%@;7FBskc7$5}W9Bi=0heaVvuvz$Ml$TR8@}qVn>72?6W1VAc{Mt}M zkyTBhk|?V}z`z$;hFRu8Vq;IvnChm+no@^y9C1uugsSU`0`46G#kSN9>l_ozgzyqc zZnEVj_a-?v@?JmH1&c=~>-v^*zmt`_@3J^eF4e))l>}t2u4L`rueBR=jY9gZM;`nV z>z(i<0eedu2|u-*#`SH9lRJ7hhDI=unc z?g^30aePzkL`~hdH*V7IkDGnmHzVr%Q{d7sfb7(|)F}ijXMa7qg!3eHex)_-$X;~* z>Zd8WcNqR>!`m#~Xp;r4cjvfR{i04$&f1)7sgen9i>Y|3)DCt^f)`uq@!(SG?w|tdSLS+<;ID74 zTq8FJYHJHrhSwvKL|O1ZnSbG-=l6Eg-Suv60Xc;*bq~g+LYk*Q&e)tR_h3!(y)O}$ zLi*i5ec^uHkd)fz2KWiR;{RosL%peU`TxM7w*M9m#rAiG`M)FTB>=X@|A`7x)zn5- z$MB5>0qbweFB249EI@!zL~I7JSTZbzjSMMJ=!DrzgCS!+FeaLvx~jZXwR`BFxZ~+A z=!Pifk?+2awS3DVi32fgZRaqXZq2^->izZpIa1sEog@01#TuEzq%*v359787rZoC( z9%`mDR^Hdxb%XzUt&cJN3>Cl{wmv{@(h>R38qri1jLKds0d|I?%Mmhu2pLy=< zOkKo4UdS`E9Y~z3z{5_K+j~i7Ou}q0?Qv4YebBya1%VkkWzR%+oB!c?9(Ydaka32! zTEv*zgrNWs`|~Q{h?O|8s0Clv{Kg0$&U}?VFLkGg_y=0Qx#=P${6SNQFp!tDsTAPV z0Ra{(2I7LAoynS0GgeQ6_)?rYhUy}AE^$gwmg?i!x#<9eP=0N=>ZgB#LV9|aH8q#B za|O-vu(GR|$6Ty!mKtIfqWRS-RO4M0wwcSr9*)2A5`ZyAq1`;6Yo)PmDLstI zL2%^$1ikF}0w^)h&000z8Uc7bKN6^q3NBfZETM+CmMTMU`2f^a#BqoYm>bNXDxQ z`3s6f6zi5sj70>rMV-Mp$}lP|jm6Zxg}Sa*$gNGH)c-upqOC7vdwhw}e?`MEMdyaC zP-`+83ke+stJPTsknz0~Hr8ea+iL>2CxK-%tt&NIO-BvVt0+&zsr9xbguP-{3uW#$ z<&0$qcOgS{J|qTnP;&!vWtyvEIi!+IpD2G%Zs>;k#+d|wbodASsmHX_F#z?^$)zN5 zpQSLH`x4qglYj*{_=8p>!q39x(y`B2s$&MFQ>lNXuhth=8}R}Ck;1}MI2joNIz1h| zjlW@TIPxM_7 zKBG{Thg9AP%B2^OFC~3LG$3odFn_mr-w2v**>Ub7da@>xY&kTq;IGPK5;^_bY5BP~ z2fiPzvC&osO@RL)io905e4pY3Yq2%j&)cfqk|($w`l`7Pb@407?5%zIS9rDgVFfx! zo89sD58PGBa$S$Lt?@8-AzR)V{@Q#COHi-EKAa5v!WJtJSa3-Wo`#TR%I#UUb=>j2 z7o-PYd_OrbZ~3K`pn*aw2)XKfuZnUr(9*J<%z@WgC?fexFu%UY!Yxi6-63kAk7nsM zlrr5RjxV45AM~MPIJQqKpl6QmABgL~E+pMswV+Knrn!0T)Ojw{<(yD8{S|$(#Z!xX zpH9_Q>5MoBKjG%zzD*b6-v>z&GK8Dfh-0oW4tr(AwFsR(PHw_F^k((%TdkglzWR`iWX>hT1rSX;F90?IN4&}YIMR^XF-CEM(o(W@P#n?HF z!Ey(gDD_0vl+{DDDhPsxspBcks^JCEJ$X74}9MsLt=S?s3)m zQ0cSrmU*<u;KMgi1(@Ip7nX@4Zq>yz;E<(M8-d0ksf0a2Ig8w2N-T69?f}j}ufew}LYD zxr7FF3R7yV0Gu^%pXS^49){xT(nPupa(8aB1>tfKUxn{6m@m1lD>AYVP=<)fI_1Hp zIXJW9gqOV;iY$C&d=8V)JJIv9B;Cyp7cE}gOoz47P)h)Y?HIE73gOHmotX1WKFOvk z5(t$Wh^13vl;+pnYvJGDz&_0Hd3Z4;Iwa-i3p|*RN7n?VJ(whUPdW>Z-;6)Re8n2# z-mvf6o!?>6wheB9q}v~&dvd0V`8x&pQkUuK_D?Hw^j;RM-bi_`5eQE5AOIzG0y`Hr zceFx7x-<*yfAk|XDgPyOkJ?){VGnT`7$LeSO!n|o=;?W4SaGHt4ngsy@=h-_(^qX)(0u=Duy02~Fr}XWzKB5nkU$y`$67%d^(`GrAYwJ? zN75&RKTlGC%FP27M06zzm}Y6l2(iE*T6kdZPzneMK9~m)s7J^#Q=B(Okqm1xB7wy< zNC>)8Tr$IG3Q7?bxF%$vO1Y^Qhy>ZUwUmIW5J4=ZxC|U)R+zg4OD$pnQ{cD`lp+MM zS3RitxImPC0)C|_d18Shpt$RL5iIK~H z)F39SLwX^vpz;Dcl0*WK*$h%t0FVt`Wkn<=rQ6@wht+6|3?Yh*EUe+3ISF zbbV(J6NNG?VNIXC)AE#(m$5Q?&@mjIzw_9V!g0#+F?)2LW2+_rf>O&`o;DA!O39Rg ziOyYKXbDK!{#+cj_j{g;|IF`G77qoNBMl8r@EIUBf+7M|eND2#Y#-x=N_k3a52*fi zp-8K}C~U4$$76)@;@M@6ZF*IftXfwyZ0V+6QESKslI-u!+R+?PV=#65d04(UI%}`r z{q6{Q#z~xOh}J=@ZN<07>bOdbSI(Tfcu|gZ?{YVVcOPTTVV52>&GrxwumlIek}OL? zeGFo#sd|C_=JV#Cu^l9$fSlH*?X|e?MdAj8Uw^@Dh6+eJa?A?2Z#)K zvr7I|GqB~N_NU~GZ?o1A+fc@%HlF$71Bz{jOC{B*x=?TsmF0DbFiNcnIuRENZA43a zfFR89OAhqSn|1~L4sA9nVHsFV4xdIY_Ix>v0|gdP(tJ^7ifMR_2i4McL#;94*tSY) zbwcRqCo$AnpV)qGHZ~Iw_2Q1uDS2XvFff#5BXjO!w&1C^$Pv^HwXT~vN0l}QsTFOz zp|y%Om9}{#!%cPR8d8sc4Y@BM+smy{aU#SHY>>2oh1pK+%DhPqc2)`!?wF{8(K$=~ z<4Sq&*`ThyQETvmt^NaN{Ef2FQ)*)|ywK%o-@1Q9PQ_)$nJqzHjxk4}L zJRnK{sYP4Wy(5Xiw*@M^=SUS9iCbSS(P{bKcfQ(vU?F~)j{~tD>z2I#!`eFrSHf;v zquo)*?AW$#+qP}n$%<{;wr$()*yw5N`8_rOTs^kOqyY;dIjsdw*6k_mL}v2V9C_*sK<_L8 za<3)C%4nRybn^plZ(y?erFuRVE9g%mzsJzEi5CTx?wwx@dpDFSOAubRa_#m+=AzZ~ z^0W#O2zIvWEkxf^QF660(Gy8eyS`R$N#K)`J732O1rK4YHBmh|7zZ`!+_91uj&3d} zKUqDuDQ8YCmvx-Jv*$H%{MrhM zw`g@pJYDvZp6`2zsZ(dm)<*5p3nup(AE6}i#Oh=;dhOA=V7E}98CO<1Lp3*+&0^`P zs}2;DZ15cuT($%cwznqmtTvCvzazAVu5Ub5YVn#Oo1X|&MsVvz8c5iwRi43-d3T%tMhcK#ke{i-MYad@M~0B_p`Iq){RLadp-6!peP^OYHTq~^vM zqTr5=CMAw|k3QxxiH;`*;@GOl(PXrt(y@7xo$)a3Fq4_xRM_3+44!#E zO-YL^m*@}MVI$5PM|N8Z2kt-smM>Jj@Dkg5%`lYidMIbt4v=Miqj4-sEE z)1*5VCqF1I{KZVw`U0Wa!+)|uiOM|=gM65??+k|{E6%76MqT>T+;z{*&^5Q9ikL2D zN2}U$UY)=rIyUnWo=yQ@55#sCZeAC}cQA(tg5ZhqLtu*z>4}mbfoZ>JOj-|a2fR$L zQ(7N$spJL_BHb6Bf%ieO10~pQX%@^WKmQOQNOUe4h|M}XOTRL`^QVpN$MjJ7t+UdP zDdzcK3e7_fdv)PPR>O|-`kVC1_O08_WGcQXj*W5d?}3yE?-fZ_@mE-zcq6^Mn49!; zDDcus*@4dFIyZ%_d3*MO=kk3$MQ^?zaDR1-o<<7T=;`8 zz2(w>U9IQ+pZ<*B;4dE@LnlF7YwNG>la#rQ@mC4u@@0_pf40+<&t)+9(YOgCP9(aJ z5v7SRi(y4;fWR)oHRxf2|Va=?P zXq&7GtTYd+3U{Wm5?#e7gDwz#OFbvHL4Jq{BGhNYzh|U!1$_WEJef&NKDD9)*$d+e ztXF1-rvO5OBm{g9Mo8x?^YB;J|G*~3m@2y%Fyx6eb*O^lW- z`JUL?!exvd&SL_w89KoQxw5ZZ}7$FD4s>z`!3R}6vcFf0lWNYjH$#P z<)0DiPN%ASTkjWqlBB;8?RX+X+y>z*$H@l%_-0-}UJ>9l$`=+*lIln9lMi%Q7CK-3 z;bsfk5N?k~;PrMo)_!+-PO&)y-pbaIjn;oSYMM2dWJMX6tsA5>3QNGQII^3->manx z(J+2-G~b34{1^sgxplkf>?@Me476Wwog~$mri{^`b3K0p+sxG4oKSwG zbl!m9DE87k>gd9WK#bURBx%`(=$J!4d*;!0&q;LW82;wX{}KbPAZtt86v(tum_1hN z0{g%T0|c(PaSb+NAF^JX;-?=e$Lm4PAi|v%(9uXMU>IbAlv*f{Ye3USUIkK`^A=Vn zd))fSFUex3D@nsdx6-@cfO1%yfr4+0B!uZ)cHCJdZNcsl%q9;#%k@1jh9TGHRnH2(ef0~sB(`82IC_71#zbg=NL$r=_9UD-~ z8c54_zA@jEhkJpL?U`$p&|XF}OpRvr`~}+^BYBtiFB1!;FX;a3=7jkFSET)41C@V` zxhfS)O-$jRJ|R}CL{=N{{^0~c8WuLOC?`>JKmFGi?dlfss4Y^AAtV#FoLvWoHsEeg zAAOc+PXl@WoSOOu_6Tz~K=>OK@KL#^re(1oPrhcen@+#ouGG|g(;A5(SVuE~rp$?# zR$o(46m}O~QtU{!N-s}RfYh+?*m9v#w@;=DEXI;!CEf0bHEgI<~T7&VnIvtG%o=s@3c zG1AT(J>!bph%Z1^xT_aO>@%jWnTW=8Z^2k0?aJ(8R5VA}H+mDh>$b9ua{)I5X9$%b z&O%F;3AIW&9j3=Q1#8uL%4_2mc3xX2AdzYJi%#Q#PEY3lk<#u=Pc?EJ7qt4WZX)bH481F8hwMr^9C^N8KUiWIgcVa=V` z4_7By=0Fkq>M6N?Bis+nc$YOqN4Qs@KDdQCy0TTi;SQ7^#<wi9E4T)##ZVvS(SK4#6j^QjHIUh<0_ZD2Yl+t?Z2;4zA zvI<(>jLvJae#sIA`qHl0lnkcU$>Rrkcnp{E;VZwW`cucIIWi{hftjEx-7>xXWRsa4VH(CCyuleyG8a+wOY8l*y>n@ zxZb}o=p9lR)9N^FKfkvPH-t2{qDE=hG8Z!`JO>6aJ^hKJVyIV&qGo*YSpoU(d)&OE ziv2#o`&W>(IK~sH{_5aPL;qcn{2%Gae+r5G4yMl5U)EB>ZidEo|F@f)70WN%Pxo`= zQ+U-W9}iLlF=`VeGD0*EpI!(lVJHy(%9yFZkS_GMSF?J*$bq+2vW37rwn;9?9%g(Jhwc<`lHvf6@SfnQaA&aF=los z0>hw9*P}3mWaZ|N5+NXIqz#8EtCtYf-szHPI`%!HhjmeCnZCim3$IX?5Il%muqrPr zyUS#WRB(?RNxImUZHdS&sF8%5wkd0RIb*O#0HH zeH~m^Rxe1;4d(~&pWGyPBxAr}E(wVwlmCs*uyeB2mcsCT%kwX|8&Pygda=T}x{%^7 z)5lE5jl0|DKd|4N*_!(ZLrDL5Lp&WjO7B($n9!_R3H(B$7*D zLV}bNCevduAk2pJfxjpEUCw;q$yK=X-gH^$2f}NQyl(9ymTq>xq!x0a7-EitRR3OY zOYS2Qh?{_J_zKEI!g0gz1B=_K4TABrliLu6nr-`w~g2#zb zh7qeBbkWznjeGKNgUS8^^w)uLv*jd8eH~cG-wMN+{*42Z{m(E{)>K7O{rLflN(vC~ zRcceKP!kd)80=8ttH@14>_q|L&x0K^N0Ty{9~+c>m0S<$R@e11>wu&=*Uc^^`dE9RnW+)N$re2(N@%&3A?!JdI?Vx;X=8&1+=;krE8o%t z32Gi2=|qi=F?kmSo19LqgEPC5kGeJ5+<3TpUXV3Yik_6(^;SJw=Cz`dq(LN)F9G<$ za-aTiEiE}H(a>WITnJ+qG$3eCqrKgXFRiIv=@1C4zGNV!+ z{{7_AulEPXdR+~$sJ+yHA73j_w^4>UHZFnK$xsp}YtpklHa57+9!NfhOuU7m4@WQp z5_qb`)p|6atW#^b;KIj?8mWxF(!eN<#8h=Ohzw&bagGAS4;O^;d-~#Ct0*gpp_4&( ztwlS2Jf#9i>=e5+X8QSy**-JE&6{$GlkjNzNJY;K5&h|iDT-6%4@g;*JK&oA8auCovoA0+S(t~|vpG$yI+;aKSa{{Y(Tnm{ zzWuo^wgB?@?S9oKub=|NZNEDc;5v@IL*DBqaMkgn@z+IeaE^&%fZ0ZGLFYEubRxP0WG`S| zRCRXWt+ArtBMCRqB725odpDu(qdG;jez|6*MZE_Ml<4ehK_$06#r3*=zC9q}YtZ*S zBEb2?=5|Tt;&QV^qXpaf?<;2>07JVaR^L9-|MG6y=U9k{8-^iS4-l_D(;~l=zLoq% zVw05cIVj1qTLpYcQH0wS1yQ47L4OoP;otb02V!HGZhPnzw`@TRACZZ_pfB#ez4wObPJYcc%W>L8Z*`$ZPypyFuHJRW>NAha3z?^PfHsbP*-XPPq|`h} zljm&0NB7EFFgWo%0qK`TAhp220MRLHof1zNXAP6At4n#(ts2F+B`SaIKOHzEBmCJ3 z$7Z&kYcKWH&T!=#s5C8C_UMQ4F^CFeacQ{e0bG?p5J~*mOvg>zy_C{A4sbf!JT+JK z>9kMi=5@{1To&ILA)1wwVpOJ&%@yfuRwC9cD2`0CmsURi5pr2nYb6oBY&EmL9Gd@i zj{F}h!T*#a<@6mKzogszCSUCq5pxGeCq-w2|M>ZzLft79&A-&!AH~#ER1?Z=ZavC0 z)V05~!^Nl{E5wrkBLnrxLoO|AG&hoOa6AV2{KWL#X*UItj_W`}DEbIUxa;huN0S#` zUtXHi+cPyg-=Gad`2Aw-HWO*;`_&j9B3GHLy(f^@Do@Wu*5{FANC+>M*e6(YAz4k^ zcb_n4oJgrykBM1T!VN(2`&(rNBh+UcE}oL@A~Fj}xf0|qtJK?WzUk{t=M15p!)i7k zM!`qg^o;xR*VM49 zcY_1Yv0?~;V7`h7c&Rj;yapzw2+H%~-AhagWAfI0U`2d7$SXt=@8SEV_hpyni~8B| zmy7w?04R$7leh>WYSu8)oxD`88>7l=AWWJmm9iWfRO z!Aa*kd7^Z-3sEIny|bs9?8<1f)B$Xboi69*|j5E?lMH6PhhFTepWbjvh*7 zJEKyr89j`X>+v6k1O$NS-`gI;mQ(}DQdT*FCIIppRtRJd2|J?qHPGQut66-~F>RWs=TMIYl6K=k7`n1c%*gtLMgJM2|D;Hc|HNidlC>-nKm5q2 zBXyM)6euzXE&_r%C06K*fES5`6h-_u>4PZs^`^{bxR?=s!7Ld0`}aJ?Z6)7x1^ zt3Yi`DVtZ*({C;&E-sJ1W@dK29of-B1lIm)MV4F?HkZ_3t|LrpIuG~IZdWO@(2S6& zB2jA7qiiGi%HO2fU5|yY#aC<57DNc7T%q9L>B_Qh@v#)x(?}*zr1f4C4p8>~v2JFR z8=g|BIpG$W)QEc#GV1A}_(>v&=KTqZbfm)rqdM>}3n%;mv2z*|8%@%u)nQWi>X=%m?>Thn;V**6wQEj#$rU&_?y|xoCLe4=2`e&7P16L7LluN^#&f1#Gsf<{` z>33Bc8LbllJfhhAR?d7*ej*Rty)DHwVG)3$&{XFKdG?O-C=-L9DG$*)_*hQicm`!o zib(R-F%e@mD*&V`$#MCK=$95r$}E<4%o6EHLxM0&K$=;Z#6Ag0Tcl9i+g`$Pcz&tP zgds)TewipwlXh0T)!e~d+ES8zuwFIChK+c4;{!RC4P(|E4$^#0V*HhXG80C;ZD-no z!u+uQ;GCpm^iAW&odDVeo+LJU6qc$4+CJ6b6T&Y^K3(O_bN{@A{&*c6>f6y@EJ+34 zscmnr_m{V`e8HdZ>xs*=g6DK)q2H5Xew?8h;k{)KBl;fO@c_1uRV>l#Xr+^vzgsub zMUo8k!cQ>m1BnO>TQ<)|oBHVATk|}^c&`sg>V5)u-}xK*TOg%E__w<*=|;?? z!WptKGk*fFIEE-G&d8-jh%~oau#B1T9hDK;1a*op&z+MxJbO!Bz8~+V&p-f8KYw!B zIC4g_&BzWI98tBn?!7pt4|{3tm@l+K-O>Jq08C6x(uA)nuJ22n`meK;#J`UK0b>(e z2jhQ{rY;qcOyNJR9qioLiRT51gfXchi2#J*wD3g+AeK>lm_<>4jHCC>*)lfiQzGtl zPjhB%U5c@-(o}k!hiTtqIJQXHiBc8W8yVkYFSuV_I(oJ|U2@*IxKB1*8gJCSs|PS+EIlo~NEbD+RJ^T1 z@{_k(?!kjYU~8W&!;k1=Q+R-PDVW#EYa(xBJ2s8GKOk#QR92^EQ_p-?j2lBlArQgT z0RzL+zbx-Y>6^EYF-3F8`Z*qwIi_-B5ntw#~M}Q)kE% z@aDhS7%)rc#~=3b3TW~c_O8u!RnVEE10YdEBa!5@&)?!J0B{!Sg}Qh$2`7bZR_atZ zV0Nl8TBf4BfJ*2p_Xw+h;rK@{unC5$0%X}1U?=9!fc2j_qu13bL+5_?jg+f$u%)ZbkVg2a`{ZwQCdJhq%STYsK*R*aQKU z=lOv?*JBD5wQvdQIObh!v>HG3T&>vIWiT?@cp$SwbDoV(?STo3x^DR4Yq=9@L5NnN z_C?fdf!HDWyv(?Uw={r`jtv_67bQ5WLFEsf@p!P3pKvnKh_D}X@WTX^xml)D^Sj8Er?RRo2GLWxu`-Bsc ztZ*OU?k$jdB|C6uJtJ#yFm{8!oAQj<0X}2I(9uuw#fiv5bdF$ZBOl@h<#V401H;_` zu5-9V`$k1Mk44+9|F}wIIjra8>7jLUQF|q zIi8JCWez)_hj3aHBMn6(scZd9q#I<3MZzv}Yjc^t_gtGunP?|mAs+s!nGtNlDQ?ZO zgtG2b3s#J8Wh#0z1E|n_(y*F5-s7_LM0Rj3atDhs4HqmZc|?8LDFFu}YWZ}^8D`Yi z`AgJWbQ)dK(Qn?%Z=YDi#f%pLZu_kRnLrC2Qu|V>iD=z=8Y%}YY=g8bb~&dj;h7(T zPhji+7=m2hP~Xw`%Ma7o#?jo#+{IY&YkSeg^os)9>3?ZB z|Bt1-;uj0%|M_9k;#6c+)a)0oA}8+=h^#A_o=QR@jX^|y`YIR9V8ppGX>)FS%X>eB zD&v$!{eebt&-}u8z2t`KZLno>+UPceqXzuZe2u zHYz7U9}_Sw2da@ugQjBJCp(MNp~mVSk>b9nN*8UE`)88xXr88KXWmTa;FKKrd{Zy> zqL}@fo*7-ImF(Ad!5W7Z#;QLsABck0s8aWQohc@PmX3TK#f$`734%ifVd{M!J1;%A z)qjpf=kxPgv5NpUuUyc=C%MzLufCgTEFXQawxJo)rv4xG&{TKfV;V#ggkxefi`{sS zX+NQ8yc>qcdU zUuLM~0x32S& z|NdQ-wE6O{{U-(dCn@}Ty2i=)pJeb-?bP+BGRkLHp&;`Vup!}`pJdth`04rFPy;$a zkU=wWy;P$BMzf+0DM(IbYh`Dk*60l?3LAU;z3I^tHbXtB5H$Op=VEPL8!mydG>$T@S9;?^}mmDK)+x*TCN_Z`%SG{Hv0;P*>(P@^xe2%mUldaqF9$ zG+Oq<5)pQ+V4%%R>bK|~veGY4T&ALmnT@W*I)aT~2(zk>&L9PVG9&;LdC%xAUA`gC4KOGLHiqxbxMTA^!+T*7G;rF z;7ZNc3t&xd!^{e|E(7-FHu@!VrWQ8CB=pP;#jG#yi6(!BfCV(rrY~7D)0vCp_Ra@9 zSuu)to5ArdCAYX}MU&4u6}*{oe=Ipe09Z7|z41Y&lh`olz{lmO>wZpnwx+x4!~7@37|N~@wr=Tqf*+}4H{7GE*BvptMyhTAwu?VYEaj~BiJm7 zQw98FiwJTx0`qY8Y+268mkV#!grHt3S_69w?1TRi-P^2iNv=ajmQIkoX7OkY=Cpvk zs;-Gv?R(YEAb(%@0tNz)_r8bwE zPh75RwYWr?wPZ0rkG<5WwX|fjqCBP4^etDs4{ZF9+|c#@Y60nB)I_U5Z$FYe=SLXI zn}7T@%LLA>*fWf9X?vSD3tpXSEk%H{*`ZmRik>=se}`HWHKL|HHiXovNzTS~-4e?1 zgVLCWv@)(($B*C3rGn`N#nzUyVrSw>OiD;4`i15QHhdicm}A(CP)UO>PO(3!(=v-x zrsKIUCbJMb>=IB}20b{69IdU(vQ%Ti0Zm?VLQoL++HK(G%^P{wuH;|@Cn7Ncybw%D zDhWh??1)6j5j7RbEy-{rVefvMhV|Su8n9`m>4LU^TanMzUIy>S&UbSKJW56C(K5NX z*Ypzh@KaMD=ank_G}Di5SaDTz3@Ze;5$pkK$7Pz?SBj&njRD4so5e0Msp_p}|D8aq zDvU@2s@T_?)?f5XEWS3j_%6%AK-4aXU5!Xzk{fL%mI~AYWP?q}8X}}ZV3ZzKLFvmm zOHWR3OY0l)pZ#y@qGPkjS~mGj&J8uJnU<~+n?qrBTsf>8jN~i17c~Ry=4wM6YrgqZ@h`8`?iL&$8#fYrt7MinX)gEl7Sh_TS zOW{AyVh%SzW|QYBJo8iEVrA!yL(Lm&j6GB0|c?~N{~?Qyj^qjbs>E~lpWo!q!lNwfr(DPZVe zaazh2J{{o=*AQ|Wxz*!pBwYx_9+G$12{5G3V!0F=yB=tPa zEgh47ryFGZc;E%A{m4lJoik6@^k%E0{99pIL1gE;NqT!1dl5UV>RkEWtP)3f_5hG6 zs%M}qX?DNaI+4HN*-wn`HOjlEz0}K{o0fG~_%%c8sDq)6Z2)6msormgjhmtdzv;Hy{BwHXKp&3Bf9paw+J4r-E zBoWmEr6%r3t?F`38eCyr+)`In1&qS9`gcQ|rHBP`LlCl=_x?ck0lISju@hW*d~EQ) zU2sgl#~^(ye%SeZR%gZ=&?1ZxeU1v@44;`}yi^j0*Efg1lIFcC*xEj}Y~k|(I&}7z zXXi2xe>mc_cC`K=v8&-5p%=m=z47Z6HQUzNi5=oCeJ$-Bo#B0=i}CemYbux7I~B*e z3hSneMn$KHNXf4;wr5fkuA+)IzWs8gJ%$o0Q^vfnXQLnABJW;NRN(83Dcbu9dLnvo z6mweq2@yPK%0|R9vT)B$&|S!QO6f(~J^Z+b`G(j1;HKOq_fG$-36zvBI$`hvA94i( zGPGVo&Y%nRsodWyzn0bD0VZlG?=0M23Mc2V1_7>R^3`|z_5B;}JnIp0FI}9XNKJ^o z7xYKOFdYxX?UW~4PC!hVz86aP+dsOkBA(sz3J+6$KL`SU4tRwWnnCQN z&+C92x#?WNBaxf?Q^Q}@QD5rC=@aj8SIg;(QG06k^C5bZFwmiAyFl|qPX^@e2*J%m z1Fu_Jk5oZEB&%YN54Y8;?#l#GYHr->Q>-?72QSIc+Gx^C%;!$ezH>t<=o$&#w*Y_Y7=|PH*+o57yb>b&zpTUQv)0raRzrkL=hA-Z(10vNYDiT487% zzp2zr4ujA#rQ;Hxh7moX(VldzylrhKvPnl9Fb?LCt#|==!=?2aiZ`$Wx*^Lv@5r_ySpQ_vQ{h2_>I`Wd|GjXY?!>=X8v}wmTc+Nqi-?ln zQa28}pDfvjpheaM2>AYDC2x`+&QYH(jGqHDYLi}w55O5^e9s=Ui^hQ~xG*&TU8I}Y zeH~7!$!=a+1_RZe{6G$BICI6R2PKE{gYW8_ss!VY*4uXw8`?o>p=fC>n&DGzxJ$&w zoIxdMA4I503p(>m9*FnFeEJQ5Nd^WK*>I_79(IA)e#hr2qZ8Y!RMcbS}R z(2;{C#FXUv_o-0C=w18S!7fh!MXAN-iF!Oq4^n#Q{ktGsqj0nd~}H&v#Brb}6cd=q75>E;O8p?6a;CR4FiN zxyB?rmw)!Kxrh&7DbPei$lj)r+fDY&=qH+ zKX`VtQ=2fc?BwarW+heGX&C!Qk;F;mEuPC*8 z0Tv0h2v&J#wCU_0q-Wq9SHLOvx@F!QQQN+qN^-r-OgGRYhpu%J-L~SiU7o@0&q6t( zxtimUlrTO)Zk6SnXsm8l$`GW-ZHKNo1a}<%U4Ng z(k8=jTPjoZZ%$(tdr@17t|MV8uhdF4s|HbPO)SF`++T%r=cNRx&$BkW7|$)u%Anm; zGOv)GmwW*J5DzeI8Vk_HZ4v?Mmz$vpL#M%+vyeiW;BK6w|_S0 z{pqGZxI%-~r~b@=F#^|^+pwQE*qc8+b7!b}A$8OjqA%6=i?yI;3BcDP1xU_UVYa?^ z3o-aYI`X%p!w>>cRe_3rtp}@f1d&AQZ_2eeB;1_+9(`jpC22z+w%(kh6G3}Rz&~U_ z5_LxI)7~`nP=ZdVO&`rUP8`b-t^Vqi;Yt~Ckxauk>cj@W0v=E}$00?Jq(sxBcQHKc z(W}uAA*+e%Q)ybLANOe7gb4w^eX#gI%i56{GJz6NVMA{tQ! z3-}Mdjxfy6C#;%_-{5h|d0xP0YQ!qQ^uV*Y&_F9pP!A;qx#0w*)&xPF0?%{;8t+uWA#vrZ|CBD0wz@?M=ge(^#$y< zIEBv1wmL`NKAe&)7@UC9H^t0E0$}Odd>u4cQGdKdlfCn0`goK~uQ0xrP*{VJ*TjR; za16!CM>-msM@KcxU|HsEGgn{v>uy1R?slG}XL5)*rLTNHdYowI*;qe~TZH z|1Ez0TXrc@khWdmgZJKV6+aJVlFsv5z~PhdC>=^tL5BC|3tyMuXSdsEC3L0qw60S>ecX zi&`-rZ=GqxfrH{+JvkuOY?{d?;HZmv z2@4+ep(g+yG6W%NrdJe2%miVnb8nX{yXK>?5DC#GA6IIXU-`!?8+xm(8r)Vi;=?g! zmOK)$jQv~nakv-|`0=Z`-Ir1%2q8~>T7-k=DyG^Rjk7|!y(QO&)cBEKdBrv~E$7_y z&?K!6DP;Qr_0fbbj86^W(4M{lqGx6Mb;`H;>IDqqGG@3I+oZg_)nb=k|ItMkuX2Y@ zYzDmMV~3{y43}y%IT+)nBCIzi^Cr1gEfyrjrQ7gXAmE$4Hj(&CuyWXjDrkV~uP>9T zCX5cXn!1oEjO!P#71iyGh#q+8qrD8)h#wE#x;bz+a^sQyAntO(UhxFVUqR^dux8 zOsN=Nzw5imC7U~@t^#gLo}j#vge3C6o(%0V5<0d~1qlxe4%yD~{EDGzZ40)ZIXytB zg3^NFa(98n#OwV!DJqgy;xitYp)Q(W$(J0<0Xr5DHFYO$zuUkC(4}Zv2uB`O@_TR7 zG3Ehp!K;YLl%2&*oz3`{p|hj`Bzd(@BMVVA2ruucGsD0mj`^a1Qw3WsT7_z)c_<&j zvy(u5yod#@5~XT5KRPqKKp*2Q`rN!6gd#Wdh9;806oaWGi6~pB78)SYEhIYZDo*^} z-93olUg^Vh29G^}wQ8p(BK0(<7R6(8><}Bia@h%62o%ONE`~PiaIdfy!HGUm0GZdJ z&^aK^@JP|8YL`L(zI6Y#c%Q{6*APf`DU#$22PjfSP@T4xKHW~A(vL$pvf+~p{QLdx^j4sUA;?IZ zVWID3OA_VkZ_3?~Yy1yn?4Ev^r}1~c!n9;Z7pRn*D$^J%4QyWNvPkKF5{{bMBefvT zFZu|hco!0Me-__dyLe6S!}>m?I-x%1{Zr3_Qi!(T@)hh%zBE1my2AWl^XY#v%TSX3 z;?rn8Chf+?>SQ|v8gl$*f5dpix{i;?651ezum2tQCU`9sKxuZG2A9o(M~}G`*q2m#iW# z?0fJS+j_XxOk1fb+Nx6$rZqhg!x}eO!3nMy6a@4doqY&?(c`8$^B?0InG4T&{mu*3 zpcYaf)z__Dgr%+6UFYYXSu(oRrPYGviL~FKc{0X%tnt+9slAC|W0F8l^(@8qDXks~ zOZgs?O-6e-12Q>w5d?|E$P&oyah^mqd(Cu#uNtjCpp&F}G&biuW49LGkFCDEYe0S* zo-W_}-yR$%Z^03i8{&R&oU1BbY9$ER3RR5LjocL5er=CclJwCH>M6ge$R*Wi zd3zUoE*~?a1owq&DiT2#_Q)~tr$;Q=BJrMHrG@j3^J=#U3 zmd)ubgUu(9g(qmjx~7+!$9^%~fpi9$*n=+HfX&<>a}qkD;Ky@piqolGdF>VEX?(!DuO z{=7v}0Y|$@o3c`s^K3&3uMD0T1NMMrgwn$+g{=Tr&IHH@S`Aj4zn z{Mpln$!B->uUYTFe+75e!ee*euX`W%xA&g!-%s-YJ-sJP*(~t=44RSN6K5u7}a9;40`KN#fg#N>-s?YE6*qS9zkP2*=!a%O&aJ4>)JR>{O6n)(@ z$2mBny!kLLgnPgrX&!fTVnSXLEY}ZR{fLL4Jw;uI;)DhJJ<;%5&X%lg5)mYwwyHK=W zS`3yPe&Ncy_OA!;HvQV1TI3}7jib>EhqT!PZIoDg_Wm4OraFX|nGmCsXj|{&g!(_; z;(_uG68gxxy{T#wPPuETHggw6G8nCyc`=x89;arkuB%&7rbL&VzCm|jQFg8me78tu z2l-K|IsFgX@am)(c=1IWYX5fhCjIZ&9MBs9(Qg*`U5T`@H2xqzQxj`1bK#2gmDn2=yI!n0*6A2{JuA3~uX7 zsXocdxHHMV^?dsW+s}S8j8Mq!pjB8=NytY%-MEgx+HnavDcotwYmA{J%RzlLhZ{?t-W6 zr-JA(qw%OVMtv?N?75aid-cY`ZJLFT`fh-fZ0()^P(3wyQ`wDHG$9cUmEr^~!;iGV z#ukG&nXeLHarXD$=({)#Es!?%=2*`or!FE4N6XWEo>>`}ocE?kmQb+2JP;-))sn0V zoC6&be>gf!XD#yJO`FCF(Ts|~ zUbO#y44!V-U|&SEr1#r^_fJ1Ql3isjfCVAfvNga7OBJG^YAP`r8d{))?5D{xm+FB~ z*>D&s+(Z(o*)gx|EpJAYlnk@A&=zpkYvak{W~Y}~8M_p7Uu1bY#7m{Mq-#4-xw3lH z{(8=+O+WrU)^C(;qRm%NiKnO+<0W6EF|>n#fw%OKxr!@d%dWHOmv~#M2{eIlxaRW% z;k6v=< zZ{5W}@ik?!__~T?0QX0xX^^}Isw8Ey-yXCwQkS!)xT-ZdV6A`#HdMECf78X){%6)7 znLSKwqK}!hdkVk2QjAZ?j%&Id%WY~^<$ntL2p8J;eq$VCp%Cg{)oW&%Z3vp6ihm9D zIlPC#zVE^>62fNwZqsk)mt+E#rrU@%4vWtkYK)Qv$a*}$T2ZJCtTFI`tuLb*7j`!^eR`?d9h2TjF-h2Yr+ z){T|kWBNyrA5vpZE{Ez_)pG7Zf%QXqW)R@(<_0oOP?cwg&gib`IjKTzN_R*5A)G>_ z1r#qXr5i)U$$wv(kXfodOg=h$UZk78c@50K^wOMcKCx26s{q}vdOioj1n!&if0FRY zSi@$}gn4KW;2<;+lY?&>M6GNrRtfUTEIzqih@yLMQA2(17m3)hLTa@zlj=oHqaCG5 zYg71D3e}v36DjH++<*=MXgd2q&dP^6f&^KctfDe(SQrvy5JXC@BG#|N_^XbfxhcV) z>KV$aMxcL*ISc0|0;+<2ix7U7xq8m48=~j!a`g?SzE5}(Y;hxqEHJg_+qB99$}py7 z*ZPXL?FKLA>0uVicvq3okpoLZE#OG@fv^+k0{35pf`XdVT)1< z#mV4mcikkivZcE(=0rgfv&#+yZJrAOX&VDL(}Zx8@&$yi4Y1kmEK&uL<}ZqWr05mr zcSwaqH=squnLs+UCn@yp#WNQuIv$~B*sN_NAACD>N3k_$E(j~}Uvqda!_ zZcu7UrsR_q-P2YTrg|lijt8kyqL>T@ab#-a7i>%#*eoxFfgx(FoPa(y1nDI{z#Pz^ zfF~)6RBc?#ivEF<@XVD*#9r^r-;*<^(tE%UtWw^oom83;$5d{UoUbmAP(3Z)14YTK zMXQ#mz9yw>*8D^82vL^|%lyo|ZiQPd&{<*wCZI%up=wadl~C~cRJ!=Hjc&F)FNlnd zgNI|iSIMyqh=qV(z+HbldU4}!sqMs1R?t*RV!S*WW>qW_GF4NJ&vb-{2sJjiTIpL; z{bC@V&EhO|>GuDv7`%$kO<-P@^VI+y zl0tXGm|eISy)fiY3m8_Yaz>`Q=B(Yi8EH71{wfM*8ziS3BIju?26ujw==Xh4x5rH71h?Z859IWq(i#9 zLt0wt?(QBsL(q4yCv&g4t0jJvu^@FtJJk`8YXb{{(OdTS%rGxnPR)xY#6=?AWjD5M2n z5GZ@@ulO|JN34J-2y*-Nh@6|?RkFHwSj$e}p}mbc3Y}*el{O31RU0Z_E48@5O~5n;kDJy}a$x&Lc;27DTvAd@s^9>IA@$q{m6K?eZqOJGKpgCT!Zhld>#d^DAK+MDP}|3h zZ{i!ENw;mW62Pq^|FY#w?@8U6Nvjgi(sKW}&uvgjz0YIS>%Sxk1`5 z`qk`C2*bWd|0I4L=_~s(^2F$Bv7OTjo*G+gBD=Rq-~$7t{Bo|mmck(d6ywQ*UbIjkS>qtkH~Zs(sq zEYNB4xxdYmy+G=${gOjGGfSQQLi1D*{&en*3{wyd7U3M)y^FX(+d)eFi?9oMy@64c zwL?!q#*eJ$eayb4lc!B$W%M4B$4dH>9eFXwjfk5U@}6vXOWDiiLMYP3^VYlG$yDjaC({9tyL4NxPb{x=ADdJ7Bl5EHzU6h-Cbke zwi+34LGVF=G%>d5Q7C>n!)%!LT`UZ0v^YN1WrcjC(pS!&vek-SK#kj^EL9!l?TvY% zOkz%!#5Cf^2JFrvNeU5ZL1_aI(M~e4?~kId$T!A@Z$?f40q#~5HuElkRMQV+6r0>J zK9y=%I^m-_xwRNyO<2Zq-0W6!frE$jT$C3Qi3d>0911QPc`Ky6`~Y<)?mMy*u`nz8 z={b()Z;8DqbWJ?MdOsaF6Zn)$d>DQpRHM~bD3cq=Rw_fzWpiwtJFY`BF}hTFCeh+C zs-4A}MCP}`EInNzh3hRoZ6L1a`J7}T&wh9#HItmHBCRwefpQ97*u{--QH=5>MSZud zv_%DacJS+lsxlJ0q=40vs-8P$Q$_Pt)JM=)|1dcFO&JWY8KwhiP$a&Ua*Z z$BTW#lu4QZna#vZECq#Q?Up_(@`0#(@~0?mG{qA#^rZDq^&6T=pbGL8nU?BY-TwKE zPmMqhP_w?q1B~|43T5=Hl(Bi-+{yY;Acv4i9u}oWC+@^i*}l}=dg`Y~E%dTn;rqj5 z&3pLFHjC62jcxW_a@Jj2Ce%eToCB!6OV*6I0!XF9Hq7orpm-RpizSSHx890&_kCQ% z$cKVw-`WnDvv5Lq?L!qGDcUPtgmotX=C`~Smjg&oM5V?}gAzL%WkRwLmNZyrCbKwC zcsUD3O0ruLr%s`B5W)IYjzLTXcAqinas75T_j&1_m!m!^ORvk6_bYvK||DIVE@IUjWQ z0dQ(H9=a-c`@{Q=uj?JC8g`r$a>)gR#=2%vuea5B_BAp;*QX&I;N?>jHYFR=q?8sq zatBJBYX`tr1BQxIgACJ==*ivk$UjW^Maod6-=SzI3MMUbCqu!3wVHt!Be?M@)2aK+$Rv(?iH18-}e+rDznPRv< zi!{-5NNHE)eqVEeYl>F5S{6w^8L$0p7l|M;(^c+Ei|{V7!!8;xiDx@QK4Pl8Iel7N z*9%$ISyQPK_+5tc2c9jhX%sfIOCZf-E%K9X7Z6N0Nvp!~v(KAZvWnaHK^SQSragIF zVIC_7tGTXeU(TRqj?owTmj{SXNtf7;9evoBURMB5R`8R1$@$}FCS%ugA{4igxOhRi z*q_y$&&!mHF1$S}2279&m0^nFxDV#WvV&?Pphq(craPjcBtveg0Nqdm9tXL4lN{t= z?BLepVnp$U5KskjvVX-GjEf=M3mOTZb|Z$Hp*yytey0C^{cH*v>gqF&-j?gcEj4)l)cdGBmB(^HrSe_)qzf z+TZ^Yo4|GWz=Oi3m`r(hV`iZHb_mu63g(JXPMW4p9JhL_(tg+XQnmR0&52UUA|nZI zvjwOx(fNtZ`8!#|4$7GoJPQ`;T?hKOi`^`kFOyX;C4KfC(U-(CX?Qh2!RTe!4raMP zjLaC7qL_tJ?^0!T9ibZe!m-x!u7o%2dHK{uYZ~#+vERAv-G-MQeYQ*~DILuFpu02u z(Qc)=bHqb4{fs+hdKa5etlX z3EW#vlbEZmWT>X{3WbgW)8~u=8IGuRc<=?KoDXg5V`jf%i^Ai`Cd9=&FH6d|N9uJl z>QhxtW_{}H10BF}GQNitk~V=GnB%NI1Xv-6-OeaI&Amg0s{4i4;HhP$6oc(L-}yHt zej63({`5VLSoIef7D3Z9BA5x<9$^x?PhV=6A@Nu=QiJo@*o?M@*6-UA@EdV@bQCR< z9>{N%eK;Y#U-@XDBBCT^j=?<|y|lsAWrXsf`t%4VT{)63oxQe^u_5NuOq{rsrRd}Z zOx&OldRtR4leEX#r$9`gPJtbHccH!JgZK&3x`tJ<_{kv)E?$LhZ?brv`Cc}X%cWC7<@6yqM2O&m(rB`1v-TiqcQmA5n$rbGJ4zs({=R-I%6}*^UQ)wi9WuzW%Ri%&5 zTdd%>+GvADk+4q#3s5qne99`MC)X_#=p1!d?(mcKDW=Efc31Jso)9M49O0OMeP&7~ zIm!vorpxBSbvSiczr^?WP&e&-!3GLxCIaR5?PGeLgwYT;lYu9UE8SwmXR(D?A^s`7 z^F4di(+oHh%$DZjj7F3_-Y9}k^uCKeSC?Jd7h>RZIDZ{wcbh|9w4)p$dmv7|gX1n& zkrYjSso~;~qMMzZUQ5AC+GUvuj@y{4E&&v(+OE-rS^J7iE~Yz1 zCQ9hAI&0X2_H8CKZMqo00MsxtwjvM{`AdSaZ8#Y?5zPI;a+0`JF52!uVwr@5Ufctm zm;5G%gI&utfGa~fv6!jHh9d1r3TYD zEOlrbyFnDl5J%sEO>HErK~WWE6I$_eXp!dbphDf zc;~oWDQylVa=y?q;c>SKzvZ~R(ZE2csFwf@10@zaZxFAYWaV9TFMh(QuqxNhPUav~ zzCkoe8-lM{?vh}kdM6EMCH(eLK3Rt{HsEJ+4fve=xAVq(cUc9fO9g1%zI+QfFOb@0 zePFU(&?Np9w3&xs)ZwPnQniC0%xs8(Hyx{7*Ot51*`9&2^h7@!nmzuF`3pl8ep#Ls z<)nk7ts}`9tGgaVJWC-3w;B~$juY6m+7XgfzjR4I=oV}E9LRGf4@cI>d3z%CYyURI z7lRn11g!D34zI6|26>?CELeIh?cEv_GCCMd5&g<=9-)pe8iXINQ}4IljYsQyfRz|( z<%w=HN4ZOQKJ9e7DOUhjA7A%-xcR%2`@1?U&u}rvqNc_8l9dUT_S`4TKJ;yezIdp} z?qDAfx6IHQ7YlO;EAP%d4U2O7jU`Uh(um!J`hJ_3&mmQez8AqWLQEftYJuMdCj27t zoV#b!c0d8al0j1yveY6)U#kPCh%OfL>P=%WE^LQew^k-QqZ{rjX6PqOd2K7>1^VUB z`&H@+vW=wH0UY>88nXCH@RKCY&?bR%8-53b{;@>|;uzDd5f`Z% zaSC<8OLh|b@ZnBET?My38fV9~ku2cPfcWZl7nW|pkQKfFlp@xRt+K0Tj@gdvVAQXP z?i45RNE4W#Kf0%Pp2=?hESkG}EK557cwn0r1{uWeG53_tb!9bg&R8R_d4s5N0poc- zr>1g0W~1oha&#@_irbqnL)jJ@Z=y7J3fCQ@qlr{6(%rSs2rpkS1QIU^tieJ-xq%nd ze-C=#{@E+Kzb&SJ2KM~9q^4Yk^jyXa#{;P)y`YsFvfzX?%V~r6GciP4eX~$vk{-C? zeipAYsMSp`Z~&-Jc*dt}m-A_w&cnb#~sIdbU{uCayd>nWKDxQ9!%R zTrgS~+>TqXgrN~e2&eeWdPhuHP2*#K1=f^B@UGZBjFq- z;mtKYyul9ZNuq89XEoeSg7^qld5^R}FHpbyRyk1pRPMDO$_Kqi*sp1hk&UpUKc!V! zJZpCQc!)@X+%qOQMP)CU@Qe|=IG@|DZ~o#j>TBFQxH>8rJ#0y`XO9ukvc)kJ6LY3$ zY}{(tri#32!LjVY^exC3Ky)i$NY6v^*>X5y8F65pYYjt^T^X<=zm=)Cr=>dcId>?I zR^0I?)=)|}ak7wG)&Ar#A&60BRp}&NWFPy7zt)yl3aObS?sB8fxfU9ayR{$#%S<#3 zrsbmi#bDSP)@w%iYS%&wyyIB??LJ0Q%aD^!XXYk3)tQt~x_YU?y4KVKl{MJ)KSz&f zV;tJ1smY(dLM6zZXVAWND3L|(W=q~HjA6OkjQ+kx-EuqtaaQQPaa=2_wwuW@G*1>e z_TqB;+1@yuHg}YYpEJL&Sw~jD3Xeb(Wo(-nz6`#gbP7?agYT>j_R%+^h{1>7W&cP{s8epLY9Ky6mU*u*!QBn zI7T~WL-_qj+~Hdpr}qtfjZmD;eI%H0SP~~ifqoD59-q)R9_Z zKr6OeoZT!Za#k5yo&CCmzLbGP*6ggJ@2QPhIY^aMXjVjQ@D+-E#qmAjuL{o@NCUDF zFy)B~$j`rK7Iz$L>_Jl~O?IJu2P3 zlHQ@${Jgcvp`PKu7p;6Fr=4y1?8nJ;=~jls^gx4&_O4+)C-OGc5)L0+R!&uI&qQID zhV&ZQ@+2={Z|2F%WoOu9Ljt}|0r;!e zCBx(uAViqOffibUBOVEH_IlV=57ZQSQ~Te5(wmsO+o_CCNAgCJzZ3ly84J34_Zf#SwQ9q8i41 zE>u$JuO$kQq*W6MDo$Eu?3jJAFUt&>Qy#K{lT-Vx z6=kceU^v`;vBRoFxQED5TL+=>QJ!iaxV^Z2r#%CaaEWgbs1ysT$&~sem&74AEC!;< zcGDH;CENBJ&hfI!@G5ezCK!sXzdB@m#a(q8KeX;U=yl6AujNz z{}huJlo1yL$DlAsi{12aS?CJ*{xuIIV4wf-V6E?L4E!5BWMQ0Zh4uel*xZJ}QQuPE z-u#DdD6hH6`;nVJ>O}8iuWxH>Z2vc>a;iFbm)nrbj$ps$6aa4TjfVZVZr7dK+E_E# z+S`ErJDM9i{HX815lax33Wl(;H~m|sF28cs+hB$%2pjyXgubo5p_%ay3!*?212bxX z@1{$rzY6~DK*{`5@oRm0>(9INQX61!{Ip#NymIM*g~u=D)UFH!NcfQ(AsZXVOPv5) zX?=4bI9>9;>HvTACiBNDt)x;_}tsJousTuWrG- zDUSM9|4|IRSy@PhdB$sAk4b;vRr>Nt@t3OB<#_*dl_7P>FGcFF3-DA?KBW00A<;2=*&`^P8}cEZW!GSO9(+{;-V@ zd%%C8KEDYD$pC#x%zb4bfVJ|kgWcG0-UNZT9@2=R|Wz+H2iJ2A29LV z#Dye7Qn~^KUqOIS)8EGZC9w+k*Sq|}?ze$| zKpJrq7cvL=dV^7%ejE4Cn@aE>Q}b^ELnd#EUUf703IedX{*S;n6P|BELgooxW`$lE z2;lhae}w#VCPR>N+{A=T+qyn;-Jk!Dn2`C1H{l?&Wv&mW{)_(?+|T+JGMPf)s$;=d z5J27Mw}F4!tB`@`mkAnI1_G4%{WjW<(=~4PFy#B)>ubz@;O|2J^F9yq(EB<9e9})4 z{&vv)&j^s`f|tKquM7lG$@pD_AFY;q=hx31Z;lY;$;aa>NbnT| kh{^d0>dn0}#6IV5TMroUdkH8gdhnkj_&0LYo6ArC2O!h?t^fc4 literal 0 HcmV?d00001 diff --git a/cas-secured-app/.mvn/wrapper/maven-wrapper.properties b/cas-secured-app/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..c315043703 --- /dev/null +++ b/cas-secured-app/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/cas-secured-app/mvnw b/cas-secured-app/mvnw new file mode 100644 index 0000000000..5bf251c077 --- /dev/null +++ b/cas-secured-app/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/cas-secured-app/mvnw.cmd b/cas-secured-app/mvnw.cmd new file mode 100644 index 0000000000..019bd74d76 --- /dev/null +++ b/cas-secured-app/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/cas-secured-app/pom.xml b/cas-secured-app/pom.xml new file mode 100644 index 0000000000..f66d54ae67 --- /dev/null +++ b/cas-secured-app/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.baeldung + cas-secured-app + 0.0.1-SNAPSHOT + jar + + cas-secured-app + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.0.0.BUILD-SNAPSHOT + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.security + spring-security-cas + + + org.springframework.boot + spring-boot-starter-freemarker + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java new file mode 100644 index 0000000000..fc05e3b38f --- /dev/null +++ b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java @@ -0,0 +1,91 @@ +package com.baeldung.cassecuredapp; + +import org.jasig.cas.client.session.SingleSignOutFilter; +import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; +import org.jasig.cas.client.validation.Cas30ServiceTicketValidator; +import org.jasig.cas.client.validation.TicketValidator; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import org.springframework.context.event.EventListener; +import org.springframework.security.cas.ServiceProperties; +import org.springframework.security.cas.authentication.CasAuthenticationProvider; +import org.springframework.security.cas.web.CasAuthenticationEntryPoint; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.logout.LogoutFilter; +import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; + +import javax.servlet.http.HttpSessionEvent; + +@SpringBootApplication +public class CasSecuredAppApplication { + + public static void main(String[] args) { + SpringApplication.run(CasSecuredAppApplication.class, args); + } + + @Bean + public ServiceProperties serviceProperties() { + ServiceProperties serviceProperties = new ServiceProperties(); + serviceProperties.setService("http://localhost:9000/login/cas"); + serviceProperties.setSendRenew(false); + return serviceProperties; + } + + @Bean + @Primary + public AuthenticationEntryPoint authenticationEntryPoint(ServiceProperties sP) { + CasAuthenticationEntryPoint entryPoint = new CasAuthenticationEntryPoint(); + entryPoint.setLoginUrl("https://localhost:8443/cas/login"); + entryPoint.setServiceProperties(sP); + return entryPoint; + } + + @Bean + public TicketValidator ticketValidator() { + return new Cas30ServiceTicketValidator("https://localhost:8443/cas"); + } + + @Bean + public CasAuthenticationProvider casAuthenticationProvider() { + CasAuthenticationProvider provider = new CasAuthenticationProvider(); + provider.setServiceProperties(serviceProperties()); + provider.setTicketValidator(ticketValidator()); + provider.setUserDetailsService((s) -> new User("test@test.com", "smatt", + true, true, true, true, + AuthorityUtils.createAuthorityList("ROLE_ADMIN"))); + provider.setKey("CAS_PROVIDER_LOCALHOST_9000"); + return provider; + } + + + @Bean + public SecurityContextLogoutHandler securityContextLogoutHandler() { + return new SecurityContextLogoutHandler(); + } + + @Bean + public LogoutFilter logoutFilter() { + LogoutFilter logoutFilter = new LogoutFilter( + "https://localhost:8443/cas/logout", securityContextLogoutHandler()); + logoutFilter.setFilterProcessesUrl("/logout/cas"); + return logoutFilter; + } + + @Bean + public SingleSignOutFilter singleSignOutFilter() { + SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter(); + singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443/cas"); + singleSignOutFilter.setIgnoreInitConfiguration(true); + return singleSignOutFilter; + } + + @EventListener + public SingleSignOutHttpSessionListener singleSignOutHttpSessionListener(HttpSessionEvent event) { + return new SingleSignOutHttpSessionListener(); + } +} diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java new file mode 100644 index 0000000000..2eabed49e1 --- /dev/null +++ b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java @@ -0,0 +1,83 @@ +package com.baeldung.cassecuredapp.config; + +import org.jasig.cas.client.session.SingleSignOutFilter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.ProviderManager; +import org.springframework.security.cas.ServiceProperties; +import org.springframework.security.cas.authentication.CasAuthenticationProvider; +import org.springframework.security.cas.web.CasAuthenticationFilter; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.logout.LogoutFilter; + +import java.util.Arrays; + +@EnableWebSecurity +@Configuration +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + private AuthenticationProvider authenticationProvider; + private AuthenticationEntryPoint authenticationEntryPoint; + private SingleSignOutFilter singleSignOutFilter; + private LogoutFilter logoutFilter; + + @Autowired + public SecurityConfig(CasAuthenticationProvider casAuthenticationProvider, AuthenticationEntryPoint eP, + LogoutFilter lF + , SingleSignOutFilter ssF + ) { + this.authenticationProvider = casAuthenticationProvider; + this.authenticationEntryPoint = eP; + + this.logoutFilter = lF; + this.singleSignOutFilter = ssF; + + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http + .authorizeRequests() + .regexMatchers("/secured.*", "/login") + .authenticated() + .and() + .authorizeRequests() + .regexMatchers("/") + .permitAll() + .and() + .httpBasic() + .authenticationEntryPoint(authenticationEntryPoint) + .and() + .logout().logoutSuccessUrl("/logout") + .and() + .addFilterBefore(singleSignOutFilter, CasAuthenticationFilter.class) + .addFilterBefore(logoutFilter, LogoutFilter.class); + + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.authenticationProvider(authenticationProvider); + } + + @Override + protected AuthenticationManager authenticationManager() throws Exception { + return new ProviderManager(Arrays.asList(authenticationProvider)); + } + + @Bean + public CasAuthenticationFilter casAuthenticationFilter(ServiceProperties sP) throws Exception { + CasAuthenticationFilter filter = new CasAuthenticationFilter(); + filter.setServiceProperties(sP); + filter.setAuthenticationManager(authenticationManager()); + return filter; + } + +} diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java new file mode 100644 index 0000000000..703e6abf7a --- /dev/null +++ b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java @@ -0,0 +1,35 @@ +package com.baeldung.cassecuredapp.controllers; + +import org.apache.log4j.Logger; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.logout.CookieClearingLogoutHandler; +import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; +import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Controller +public class AuthController { + + private Logger logger = Logger.getLogger(AuthController.class); + + @GetMapping("/logout") + public String logout( + HttpServletRequest request, HttpServletResponse response, SecurityContextLogoutHandler logoutHandler) { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + logoutHandler.logout(request, response, auth ); + new CookieClearingLogoutHandler(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY).logout(request, response, auth); + return "auth/logout"; + } + + + @GetMapping("/login") + public String login() { + return "redirect:/secured"; + } + +} diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java new file mode 100644 index 0000000000..75956cf493 --- /dev/null +++ b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java @@ -0,0 +1,15 @@ +package com.baeldung.cassecuredapp.controllers; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + + +@Controller +public class IndexController { + + @GetMapping("/") + public String index() { + return "index"; + } +} diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java new file mode 100644 index 0000000000..9a872d1f40 --- /dev/null +++ b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java @@ -0,0 +1,24 @@ +package com.baeldung.cassecuredapp.controllers; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping(value = "/secured") +public class SecuredPageController { + + @GetMapping + public String index(ModelMap modelMap) { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + if( auth != null && auth.getPrincipal() != null + && auth.getPrincipal() instanceof UserDetails) { + modelMap.put("username", ((UserDetails) auth.getPrincipal()).getUsername()); + } + return "secure/index"; + } +} diff --git a/cas-secured-app/src/main/resources/application.properties b/cas-secured-app/src/main/resources/application.properties new file mode 100644 index 0000000000..99802c632f --- /dev/null +++ b/cas-secured-app/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=9000 \ No newline at end of file diff --git a/cas-secured-app/src/main/resources/templates/auth/logout.ftl b/cas-secured-app/src/main/resources/templates/auth/logout.ftl new file mode 100644 index 0000000000..eac345ec33 --- /dev/null +++ b/cas-secured-app/src/main/resources/templates/auth/logout.ftl @@ -0,0 +1,10 @@ + + + Cas Secured App - Logout + + +

    You have logged out of Cas Secured Spring Boot App Successfully

    +
    +Log out of all other Services + + \ No newline at end of file diff --git a/cas-secured-app/src/main/resources/templates/index.ftl b/cas-secured-app/src/main/resources/templates/index.ftl new file mode 100644 index 0000000000..d407756044 --- /dev/null +++ b/cas-secured-app/src/main/resources/templates/index.ftl @@ -0,0 +1,11 @@ + + + Cas Secured App - Index + + +

    Welcome to Cas Secured Spring Boot App

    +

    This is a Public Page

    +
    +Login + + \ No newline at end of file diff --git a/cas-secured-app/src/main/resources/templates/secure/index.ftl b/cas-secured-app/src/main/resources/templates/secure/index.ftl new file mode 100644 index 0000000000..210ebecc7b --- /dev/null +++ b/cas-secured-app/src/main/resources/templates/secure/index.ftl @@ -0,0 +1,12 @@ + + + Cas Secured App - Secured + + +

    Welcome to Cas Secured Spring Boot App

    +

    This is a Secured Page

    +

    Welcome home ${username!""}

    +
    +Logout + + \ No newline at end of file diff --git a/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java b/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java new file mode 100644 index 0000000000..09dbaf0c61 --- /dev/null +++ b/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java @@ -0,0 +1,16 @@ +package com.baeldung.cassecuredapp; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class CasSecuredAppApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/cas-server/.gitignore b/cas-server/.gitignore new file mode 100644 index 0000000000..5304519922 --- /dev/null +++ b/cas-server/.gitignore @@ -0,0 +1,14 @@ +.classpath +!/.project +.project +.settings +target/ +.idea/ +.DS_Store +.idea +overlays/ +.gradle/ +build/ +bin/ +*.iml +*.log diff --git a/cas-server/LICENSE.txt b/cas-server/LICENSE.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/cas-server/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/cas-server/README.md b/cas-server/README.md new file mode 100644 index 0000000000..bae8b648e5 --- /dev/null +++ b/cas-server/README.md @@ -0,0 +1,88 @@ +CAS Overlay Template +============================ + +Generic CAS WAR overlay to exercise the latest versions of CAS. This overlay could be freely used as a starting template for local CAS war overlays. The CAS services management overlay is available [here](https://github.com/apereo/cas-services-management-overlay). + +# Versions + +```xml +5.1.x +``` + +# Requirements +* JDK 1.8+ + +# Configuration + +The `etc` directory contains the configuration files and directories that need to be copied to `/etc/cas/config`. + +# Build + +To see what commands are available to the build script, run: + +```bash +./build.sh help +``` + +To package the final web application, run: + +```bash +./build.sh package +``` + +To update `SNAPSHOT` versions run: + +```bash +./build.sh package -U +``` + +# Deployment + +- Create a keystore file `thekeystore` under `/etc/cas`. Use the password `changeit` for both the keystore and the key/certificate entries. +- Ensure the keystore is loaded up with keys and certificates of the server. + +On a successful deployment via the following methods, CAS will be available at: + +* `http://cas.server.name:8080/cas` +* `https://cas.server.name:8443/cas` + +## Executable WAR + +Run the CAS web application as an executable WAR. + +```bash +./build.sh run +``` + +## Spring Boot + +Run the CAS web application as an executable WAR via Spring Boot. This is most useful during development and testing. + +```bash +./build.sh bootrun +``` + +### Warning! + +Be careful with this method of deployment. `bootRun` is not designed to work with already executable WAR artifacts such that CAS server web application. YMMV. Today, uses of this mode ONLY work when there is **NO OTHER** dependency added to the build script and the `cas-server-webapp` is the only present module. See [this issue](https://github.com/apereo/cas/issues/2334) and [this issue](https://github.com/spring-projects/spring-boot/issues/8320) for more info. + + +## Spring Boot App Server Selection +There is an app.server property in the pom.xml that can be used to select a spring boot application server. +It defaults to "-tomcat" but "-jetty" and "-undertow" are supported. +It can also be set to an empty value (nothing) if you want to deploy CAS to an external application server of your choice and you don't want the spring boot libraries included. + +```xml +-tomcat +``` + +## Windows Build +If you are building on windows, try build.cmd instead of build.sh. Arguments are similar but for usage, run: + +``` +build.cmd help +``` + +## External + +Deploy resultant `target/cas.war` to a servlet container of choice. diff --git a/cas-server/build.cmd b/cas-server/build.cmd new file mode 100644 index 0000000000..f907dcb388 --- /dev/null +++ b/cas-server/build.cmd @@ -0,0 +1,82 @@ +@echo off + +@set JAVA_ARGS=-Xms500m -Xmx1g +@set CAS_DIR=\etc\cas +@set CONFIG_DIR=\etc\cas\config + +@rem Call this script with DNAME and CERT_SUBJ_ALT_NAMES already set to override +@if "%DNAME%" == "" set DNAME=CN=cas.example.org,OU=Example,OU=Org,C=US +@rem List other host names or ip addresses you want in your certificate, may help with host name verification, +@rem if client apps make https connection for ticket validation and compare name in cert (include sub. alt. names) +@rem to name used to access CAS +@if "%CERT_SUBJ_ALT_NAMES%" == "" set CERT_SUBJ_ALT_NAMES=dns:example.org,dns:localhost,dns:%COMPUTERNAME%,ip:127.0.0.1 + +@rem Check for mvn in path, use it if found, otherwise use maven wrapper +@set MAVEN_CMD=mvn +@where /q mvn +@if %ERRORLEVEL% neq 0 set MAVEN_CMD=.\mvnw.bat + +@if "%1" == "" call:help +@if "%1" == "copy" call:copy +@if "%1" == "clean" call:clean %2 %3 %4 +@if "%1" == "package" call:package %2 %3 %4 +@if "%1" == "bootrun" call:bootrun %2 %3 %4 +@if "%1" == "debug" call:debug %2 %3 %4 +@if "%1" == "run" call:run %2 %3 %4 +@if "%1" == "help" call:help +@if "%1" == "gencert" call:gencert + +@rem function section starts here +@goto:eof + +:copy + @echo "Creating configuration directory under %CONFIG_DIR%" + if not exist %CONFIG_DIR% mkdir %CONFIG_DIR% + + @echo "Copying configuration files from etc/cas to /etc/cas" + xcopy /S /Y etc\cas\* \etc\cas +@goto:eof + +:help + @echo "Usage: build.bat [copy|clean|package|run|debug|bootrun|gencert] [optional extra args for maven]" + @echo "To get started on a clean system, run "build.bat copy" and "build.bat gencert", then "build.bat run" + @echo "Note that using the copy or gencert arguments will create and/or overwrite the %CAS_DIR% which is outside this project" +@goto:eof + +:clean + call %MAVEN_CMD% clean %1 %2 %3 + exit /B %ERRORLEVEL% +@goto:eof + +:package + call %MAVEN_CMD% clean package -T 5 %1 %2 %3 + exit /B %ERRORLEVEL% +@goto:eof + +:bootrun + call %MAVEN_CMD% clean package spring-boot:run -T 5 %1 %2 %3 + exit /B %ERRORLEVEL% +@goto:eof + +:debug + call:package %1 %2 %3 & java %JAVA_ARGS% -Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n -jar target/cas.war +@goto:eof + +:run + call:package %1 %2 %3 & java %JAVA_ARGS% -jar target/cas.war +@goto:eof + +:gencert + where /q keytool + if ERRORLEVEL 1 ( + @echo Java keytool.exe not found in path. + exit /b 1 + ) else ( + if not exist %CAS_DIR% mkdir %CAS_DIR% + @echo on + @echo Generating self-signed SSL cert for %DNAME% in %CAS_DIR%\thekeystore + keytool -genkeypair -alias cas -keyalg RSA -keypass changeit -storepass changeit -keystore %CAS_DIR%\thekeystore -dname %DNAME% -ext SAN=%CERT_SUBJ_ALT_NAMES% + @echo Exporting cert for use in trust store (used by cas clients) + keytool -exportcert -alias cas -storepass changeit -keystore %CAS_DIR%\thekeystore -file %CAS_DIR%\cas.cer + ) +@goto:eof diff --git a/cas-server/build.sh b/cas-server/build.sh new file mode 100644 index 0000000000..e33f7de854 --- /dev/null +++ b/cas-server/build.sh @@ -0,0 +1,97 @@ +#!/bin/bash + + +function copy() { + echo -e "Creating configuration directory under /etc/cas" + mkdir -p /etc/cas/config + + echo -e "Copying configuration files from etc/cas to /etc/cas" + cp -rfv etc/cas/* /etc/cas +} + +function help() { + echo "Usage: build.sh [copy|clean|package|run|debug|bootrun|gencert]" + echo " copy: Copy config from ./etc/cas/config to /etc/cas/config" + echo " clean: Clean Maven build directory" + echo " package: Clean and build CAS war, also call copy" + echo " run: Build and run CAS.war via spring boot (java -jar target/cas.war)" + echo " debug: Run CAS.war and listen for Java debugger on port 5000" + echo " bootrun: Run with maven spring boot plugin, doesn't work with multiple dependencies" + echo " gencert: Create keystore with SSL certificate in location where CAS looks by default" +} + +function clean() { + ./mvnw clean "$@" +} + +function package() { + ./mvnw clean package -T 5 "$@" + copy +} + +function bootrun() { + ./mvnw clean package spring-boot:run -T 5 "$@" +} + +function debug() { + package && java -Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n -jar target/cas.war +} + +function run() { + package && java -jar target/cas.war +} + +function gencert() { + if [[ ! -d /etc/cas ]] ; then + copy + fi + which keytool + if [[ $? -ne 0 ]] ; then + echo Error: Java JDK \'keytool\' is not installed or is not in the path + exit 1 + fi + # override DNAME and CERT_SUBJ_ALT_NAMES before calling or use dummy values + DNAME="${DNAME:-CN=cas.example.org,OU=Example,OU=Org,C=US}" + CERT_SUBJ_ALT_NAMES="${CERT_SUBJ_ALT_NAMES:-dns:example.org,dns:localhost,ip:127.0.0.1}" + echo "Generating keystore for CAS with DN ${DNAME}" + keytool -genkeypair -alias cas -keyalg RSA -keypass changeit -storepass changeit -keystore /etc/cas/thekeystore -dname ${DNAME} -ext SAN=${CERT_SUBJ_ALT_NAMES} + keytool -exportcert -alias cas -storepass changeit -keystore /etc/cas/thekeystore -file /etc/cas/cas.cer +} + +if [ $# -eq 0 ]; then + echo -e "No commands provided. Defaulting to [run]\n" + run + exit 0 +fi + + +case "$1" in +"copy") + copy + ;; +"clean") + shift + clean "$@" + ;; +"package") + shift + package "$@" + ;; +"bootrun") + shift + bootrun "$@" + ;; +"debug") + debug "$@" + ;; +"run") + run "$@" + ;; +"gencert") + gencert "$@" + ;; +*) + help + ;; +esac + diff --git a/cas-server/etc/cas/config/application.yml b/cas-server/etc/cas/config/application.yml new file mode 100644 index 0000000000..be1f7c3edd --- /dev/null +++ b/cas-server/etc/cas/config/application.yml @@ -0,0 +1,2 @@ +info: + description: CAS Configuration \ No newline at end of file diff --git a/cas-server/etc/cas/config/cas.properties b/cas-server/etc/cas/config/cas.properties new file mode 100644 index 0000000000..47a1477308 --- /dev/null +++ b/cas-server/etc/cas/config/cas.properties @@ -0,0 +1,7 @@ +cas.server.name: https://cas.example.org:8443 +cas.server.prefix: https://cas.example.org:8443/cas + +cas.adminPagesSecurity.ip=127\.0\.0\.1 + +logging.config: file:/etc/cas/config/log4j2.xml +# cas.serviceRegistry.config.location: classpath:/services diff --git a/cas-server/etc/cas/config/log4j2.xml b/cas-server/etc/cas/config/log4j2.xml new file mode 100644 index 0000000000..53b30b4228 --- /dev/null +++ b/cas-server/etc/cas/config/log4j2.xml @@ -0,0 +1,117 @@ + + + + + + . + + warn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cas-server/etc/cas/thekeystore b/cas-server/etc/cas/thekeystore new file mode 100644 index 0000000000000000000000000000000000000000..15f9af2dae6366804459009361140e8526f811b9 GIT binary patch literal 2225 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 Lt(?_lzc& literal 0 HcmV?d00001 diff --git a/cas-server/maven/maven-wrapper.properties b/cas-server/maven/maven-wrapper.properties new file mode 100644 index 0000000000..b368e4609a --- /dev/null +++ b/cas-server/maven/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https\://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/cas-server/mvnw b/cas-server/mvnw new file mode 100644 index 0000000000..2275ac7647 --- /dev/null +++ b/cas-server/mvnw @@ -0,0 +1,234 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + wdir=$(cd "$wdir/.."; pwd) + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER="org.apache.maven.wrapper.MavenWrapperMain" + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + -classpath \ +"$MAVEN_PROJECTBASEDIR/maven/maven-wrapper.jar" \ + ${WRAPPER_LAUNCHER} "$@" diff --git a/cas-server/mvnw.bat b/cas-server/mvnw.bat new file mode 100644 index 0000000000..d391151aa7 --- /dev/null +++ b/cas-server/mvnw.bat @@ -0,0 +1,174 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:chkMHome +if not "%M2_HOME%"=="" goto valMHome + +SET "M2_HOME=%~dp0.." +if not "%M2_HOME%"=="" goto valMHome + +echo. +echo Error: M2_HOME not found in your environment. >&2 +echo Please set the M2_HOME variable in your environment to match the >&2 +echo location of the Maven installation. >&2 +echo. +goto error + +:valMHome + +:stripMHome +if not "_%M2_HOME:~-1%"=="_\" goto checkMCmd +set "M2_HOME=%M2_HOME:~0,-1%" +goto stripMHome + +:checkMCmd +if exist "%M2_HOME%\bin\mvn.cmd" goto init + +echo. +echo Error: M2_HOME is set to an invalid directory. >&2 +echo M2_HOME = "%M2_HOME%" >&2 +echo Please set the M2_HOME variable in your environment to match the >&2 +echo location of the Maven installation >&2 +echo. +goto error +@REM ==== END VALIDATION ==== + +:init + +set MAVEN_CMD_LINE_ARGS=%* + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\maven\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% + +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/cas-server/pom.xml b/cas-server/pom.xml new file mode 100644 index 0000000000..e8625b48f7 --- /dev/null +++ b/cas-server/pom.xml @@ -0,0 +1,158 @@ + + + 4.0.0 + com.baeldung + cas-server + war + 1.0 + + + + + com.rimerosolutions.maven.plugins + wrapper-maven-plugin + 0.0.4 + + true + MD5 + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + org.springframework.boot.loader.WarLauncher + true + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + cas + false + false + + false + ${project.build.directory}/war/work/org.apereo.cas/cas-server-webapp${app.server}/META-INF/MANIFEST.MF + + + + + org.apereo.cas + cas-server-webapp${app.server} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + + cas + + + + + org.apereo.cas + cas-server-webapp${app.server} + ${cas.version} + war + runtime + + + org.apereo.cas + cas-server-support-json-service-registry + ${cas.version} + + + org.apereo.cas + cas-server-support-jdbc + ${cas.version} + + + org.apereo.cas + cas-server-support-jdbc-drivers + ${cas.version} + + + + + 5.1.4 + 1.5.3.RELEASE + + -tomcat + 1.8 + 1.8 + UTF-8 + + + + + sonatype-releases + http://oss.sonatype.org/content/repositories/releases/ + + false + + + true + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + true + + + false + + + + shibboleth-releases + https://build.shibboleth.net/nexus/content/repositories/releases + + + spring-milestones + https://repo.spring.io/milestone + + + + + + + false + + pgp + + + + com.github.s4u.plugins + pgpverify-maven-plugin + 1.1.0 + + + + check + + + + + hkp://pool.sks-keyservers.net + ${settings.localRepository}/pgpkeys-cache + test + true + false + + + + + + + diff --git a/cas-server/src/main/resources/application.properties b/cas-server/src/main/resources/application.properties new file mode 100644 index 0000000000..2d5e9a7277 --- /dev/null +++ b/cas-server/src/main/resources/application.properties @@ -0,0 +1,126 @@ +## +# CAS Server Context Configuration +# +server.context-path=/cas +server.port=8443 + +server.ssl.key-store=file:/etc/cas/thekeystore +server.ssl.key-store-password=changeit +server.ssl.key-password=changeit +# server.ssl.ciphers= +# server.ssl.client-auth= +# server.ssl.enabled= +# server.ssl.key-alias= +# server.ssl.key-store-provider= +# server.ssl.key-store-type= +# server.ssl.protocol= +# server.ssl.trust-store= +# server.ssl.trust-store-password= +# server.ssl.trust-store-provider= +# server.ssl.trust-store-type= + +server.max-http-header-size=2097152 +server.use-forward-headers=true +server.connection-timeout=20000 +server.error.include-stacktrace=NEVER + +server.tomcat.max-http-post-size=2097152 +server.tomcat.basedir=build/tomcat +server.tomcat.accesslog.enabled=true +server.tomcat.accesslog.pattern=%t %a "%r" %s (%D ms) +server.tomcat.accesslog.suffix=.log +server.tomcat.max-threads=10 +server.tomcat.port-header=X-Forwarded-Port +server.tomcat.protocol-header=X-Forwarded-Proto +server.tomcat.protocol-header-https-value=https +server.tomcat.remote-ip-header=X-FORWARDED-FOR +server.tomcat.uri-encoding=UTF-8 + +spring.http.encoding.charset=UTF-8 +spring.http.encoding.enabled=true +spring.http.encoding.force=true + +## +# CAS Cloud Bus Configuration +# +spring.cloud.bus.enabled=false +# spring.cloud.bus.refresh.enabled=true +# spring.cloud.bus.env.enabled=true +# spring.cloud.bus.destination=CasCloudBus +# spring.cloud.bus.ack.enabled=true + +endpoints.enabled=false +endpoints.sensitive=true + +endpoints.restart.enabled=false +endpoints.shutdown.enabled=false + +management.security.enabled=true +management.security.roles=ACTUATOR,ADMIN +management.security.sessions=if_required +management.context-path=/status +management.add-application-context-header=false + +security.basic.authorize-mode=role +security.basic.enabled=false +security.basic.path=/cas/status/** + +## +# CAS Web Application Session Configuration +# +server.session.timeout=300 +server.session.cookie.http-only=true +server.session.tracking-modes=COOKIE + +## +# CAS Thymeleaf View Configuration +# +spring.thymeleaf.encoding=UTF-8 +spring.thymeleaf.cache=true +spring.thymeleaf.mode=HTML +## +# CAS Log4j Configuration +# +# logging.config=file:/etc/cas/log4j2.xml +server.context-parameters.isLog4jAutoInitializationDisabled=true + +## +# CAS AspectJ Configuration +# +spring.aop.auto=true +spring.aop.proxy-target-class=true + +## +# CAS Authentication Credentials +# +#cas.authn.accept.users=casuser::Mellon +cas.authn.accept.users= +cas.authn.accept.name= + +#CAS Database Authentication Property +cas.authn.jdbc.query[0].sql=SELECT * FROM users WHERE email = ? +cas.authn.jdbc.query[0].url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC +cas.authn.jdbc.query[0].dialect=org.hibernate.dialect.MySQLDialect +cas.authn.jdbc.query[0].user=root +cas.authn.jdbc.query[0].password= +cas.authn.jdbc.query[0].ddlAuto=none +cas.authn.jdbc.query[0].driverClass=com.mysql.jdbc.Driver +cas.authn.jdbc.query[0].fieldPassword=password +cas.authn.jdbc.query[0].passwordEncoder.type=BCRYPT + + +## +# CAS Delegated Authentication +# +cas.authn.pac4j.bitbucket.clientName=Bitbucket +cas.authn.pac4j.dropbox.clientName=Dropbox +cas.authn.pac4j.facebook.clientName=Facebook +cas.authn.pac4j.foursquare.clientName=Foursquare +cas.authn.pac4j.github.clientName=Github +cas.authn.pac4j.google.clientName=Google +cas.authn.pac4j.linkedIn.clientName=LinkedIn +cas.authn.pac4j.paypal.clientName=PayPal +cas.authn.pac4j.twitter.clientName=Twitter +cas.authn.pac4j.yahoo.clientName=Yahoo +cas.authn.pac4j.windowsLive.clientName=Windows Live +cas.authn.pac4j.wordpress.clientName=WordPress diff --git a/cas-server/src/main/resources/cas.properties b/cas-server/src/main/resources/cas.properties new file mode 100644 index 0000000000..be2babcd14 --- /dev/null +++ b/cas-server/src/main/resources/cas.properties @@ -0,0 +1,41 @@ +cas.server.name: https://localhost:8443 +cas.server.prefix: https://localhost:8443/cas + +cas.adminPagesSecurity.ip=127\.0\.0\.1 + +logging.config: file:/etc/cas/config/log4j2.xml + +cas.serviceRegistry.initFromJson=true +cas.serviceRegistry.config.location=classpath:/services + +cas.authn.accept.users= +cas.authn.accept.name= + +#CAS Database Authentication Property + +# cas.authn.jdbc.query[0].healthQuery= +# cas.authn.jdbc.query[0].isolateInternalQueries=false +# cas.authn.jdbc.query[0].failFast=true +# cas.authn.jdbc.query[0].isolationLevelName=ISOLATION_READ_COMMITTED +# cas.authn.jdbc.query[0].leakThreshold=10 +# cas.authn.jdbc.query[0].propagationBehaviorName=PROPAGATION_REQUIRED +# cas.authn.jdbc.query[0].batchSize=1 +# cas.authn.jdbc.query[0].maxAgeDays=180 +# cas.authn.jdbc.query[0].autocommit=false +# cas.authn.jdbc.query[0].idleTimeout=5000 +# cas.authn.jdbc.query[0].credentialCriteria= +# cas.authn.jdbc.query[0].name= +# cas.authn.jdbc.query[0].order=0 +# cas.authn.jdbc.query[0].dataSourceName= +# cas.authn.jdbc.query[0].dataSourceProxy=false +# cas.authn.jdbc.query[0].fieldExpired= +# cas.authn.jdbc.query[0].fieldDisabled= +# cas.authn.jdbc.query[0].principalAttributeList=sn,cn:commonName,givenName +# cas.authn.jdbc.query[0].passwordEncoder.type=NONE|DEFAULT|STANDARD|BCRYPT|SCRYPT|PBKDF2|com.example.CustomPasswordEncoder +# cas.authn.jdbc.query[0].passwordEncoder.characterEncoding= +# cas.authn.jdbc.query[0].passwordEncoder.encodingAlgorithm= +# cas.authn.jdbc.query[0].passwordEncoder.secret= +# cas.authn.jdbc.query[0].passwordEncoder.strength=16 +# cas.authn.jdbc.query[0].principalTransformation.suffix= +# cas.authn.jdbc.query[0].principalTransformation.caseConversion=NONE|UPPERCASE|LOWERCASE +# cas.authn.jdbc.query[0].principalTransformation.prefix= \ No newline at end of file diff --git a/cas-server/src/main/resources/services/casSecuredApp.json b/cas-server/src/main/resources/services/casSecuredApp.json new file mode 100644 index 0000000000..336007e484 --- /dev/null +++ b/cas-server/src/main/resources/services/casSecuredApp.json @@ -0,0 +1,8 @@ +{ + "@class" : "org.apereo.cas.services.RegexRegisteredService", + "serviceId" : "^http://localhost:9000/login/cas", + "name" : "CAS Spring Secured App", + "description": "This is a Spring App that usses the CAS Server for it's authentication", + "id" : 19991, + "evaluationOrder" : 1 +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index f44cf9481e..3d28707b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,8 @@ core-java-8 core-java-concurrency couchbase + cas-server + cas-secured-app deltaspike dozer From f753a86e845be37b041e9f2dd94344c7d02e1d07 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 18 Oct 2017 17:13:04 +0200 Subject: [PATCH 033/197] Refactor RxJava (#2749) * Refactor RxJava * Merge fix --- .../algorithms/bubblesort/BubbleSort.java | 23 ++++++++----------- .../rxjava/ComputeFunction.java | 2 +- .../rxjava/ConnectableObservableImpl.java | 2 +- .../rxjava/ObservableImpl.java | 12 +++++----- .../rxjava/ResourceManagement.java | 2 +- .../rxjava/SingleImpl.java | 2 +- .../rxjava/SubjectImpl.java | 12 +++++----- .../com/baeldung/rxjava/jdbc/Connector.java | 6 ++--- .../rxjava/operator/ToCleanString.java | 2 +- .../rxjava/operator/ToLength.java | 2 +- .../com/baeldung/rxjava/ObservableTest.java | 2 +- .../rxjava/RxJavaCustomOperatorUnitTest.java | 4 ++-- ...ulersTest.java => SchedulersLiveTest.java} | 2 +- .../java/com/baeldung/rxjava/SubjectTest.java | 1 - .../jdbc/BasicQueryTypesIntegrationTest.java | 12 +++++----- 15 files changed, 41 insertions(+), 45 deletions(-) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/ComputeFunction.java (97%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/ConnectableObservableImpl.java (94%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/ObservableImpl.java (87%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/ResourceManagement.java (95%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/SingleImpl.java (92%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/SubjectImpl.java (85%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/operator/ToCleanString.java (96%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/operator/ToLength.java (90%) rename rxjava/src/test/java/com/baeldung/rxjava/{SchedulersTest.java => SchedulersLiveTest.java} (99%) diff --git a/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java b/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java index aa5e085153..f5080efa40 100644 --- a/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java @@ -4,22 +4,20 @@ import java.util.stream.IntStream; public class BubbleSort { - public void bubbleSort(Integer[] arr) { + void bubbleSort(Integer[] arr) { int n = arr.length; IntStream.range(0, n - 1) - .forEach(i -> { - IntStream.range(i + 1, n - i) - .forEach(j -> { - if (arr[j - 1] > arr[j]) { - int temp = arr[j]; - arr[j] = arr[j - 1]; - arr[j - 1] = temp; - } - }); - }); + .flatMap(i -> IntStream.range(i + 1, n - i)) + .forEach(j -> { + if (arr[j - 1] > arr[j]) { + int temp = arr[j]; + arr[j] = arr[j - 1]; + arr[j - 1] = temp; + } + }); } - public void optimizedBubbleSort(Integer[] arr) { + void optimizedBubbleSort(Integer[] arr) { int i = 0, n = arr.length; boolean swapNeeded = true; while (i < n - 1 && swapNeeded) { @@ -37,5 +35,4 @@ public class BubbleSort { i++; } } - } diff --git a/rxjava/src/main/java/com/baelding/rxjava/ComputeFunction.java b/rxjava/src/main/java/com/baeldung/rxjava/ComputeFunction.java similarity index 97% rename from rxjava/src/main/java/com/baelding/rxjava/ComputeFunction.java rename to rxjava/src/main/java/com/baeldung/rxjava/ComputeFunction.java index 924862ab37..7f9787a9d5 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/ComputeFunction.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/ComputeFunction.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; diff --git a/rxjava/src/main/java/com/baelding/rxjava/ConnectableObservableImpl.java b/rxjava/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java similarity index 94% rename from rxjava/src/main/java/com/baelding/rxjava/ConnectableObservableImpl.java rename to rxjava/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java index 005487dae8..a3e20a33f0 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/ConnectableObservableImpl.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; import rx.observables.ConnectableObservable; diff --git a/rxjava/src/main/java/com/baelding/rxjava/ObservableImpl.java b/rxjava/src/main/java/com/baeldung/rxjava/ObservableImpl.java similarity index 87% rename from rxjava/src/main/java/com/baelding/rxjava/ObservableImpl.java rename to rxjava/src/main/java/com/baeldung/rxjava/ObservableImpl.java index 9ab0d0e1e6..305aba6381 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/ObservableImpl.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/ObservableImpl.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; import rx.observables.BlockingObservable; @@ -8,13 +8,13 @@ import java.util.List; public class ObservableImpl { - static Integer[] numbers = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + private static Integer[] numbers = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - static String[] letters = {"a", "b", "c", "d", "e", "f", "g", "h", "i"}; - static String[] titles = {"title"}; - public static List titleList = Arrays.asList(titles); + private static String[] letters = {"a", "b", "c", "d", "e", "f", "g", "h", "i"}; + private static String[] titles = {"title"}; + private static List titleList = Arrays.asList(titles); - public static Observable getTitle() { + static Observable getTitle() { return Observable.from(titleList); } diff --git a/rxjava/src/main/java/com/baelding/rxjava/ResourceManagement.java b/rxjava/src/main/java/com/baeldung/rxjava/ResourceManagement.java similarity index 95% rename from rxjava/src/main/java/com/baelding/rxjava/ResourceManagement.java rename to rxjava/src/main/java/com/baeldung/rxjava/ResourceManagement.java index 44bbd7edda..272442098f 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/ResourceManagement.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/ResourceManagement.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; diff --git a/rxjava/src/main/java/com/baelding/rxjava/SingleImpl.java b/rxjava/src/main/java/com/baeldung/rxjava/SingleImpl.java similarity index 92% rename from rxjava/src/main/java/com/baelding/rxjava/SingleImpl.java rename to rxjava/src/main/java/com/baeldung/rxjava/SingleImpl.java index f625ab6b44..f0fda5d4df 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/SingleImpl.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/SingleImpl.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; import rx.Single; diff --git a/rxjava/src/main/java/com/baelding/rxjava/SubjectImpl.java b/rxjava/src/main/java/com/baeldung/rxjava/SubjectImpl.java similarity index 85% rename from rxjava/src/main/java/com/baelding/rxjava/SubjectImpl.java rename to rxjava/src/main/java/com/baeldung/rxjava/SubjectImpl.java index aac9b4454a..ceef3ab5f3 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/SubjectImpl.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/SubjectImpl.java @@ -1,14 +1,14 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observer; import rx.subjects.PublishSubject; public class SubjectImpl { - public static Integer subscriber1 = 0; - public static Integer subscriber2 = 0; + static Integer subscriber1 = 0; + static Integer subscriber2 = 0; - public static Integer subjectMethod() { + private static Integer subjectMethod() { PublishSubject subject = PublishSubject.create(); subject.subscribe(getFirstObserver()); @@ -25,7 +25,7 @@ public class SubjectImpl { } - public static Observer getFirstObserver() { + static Observer getFirstObserver() { return new Observer() { @Override @@ -46,7 +46,7 @@ public class SubjectImpl { }; } - public static Observer getSecondObserver() { + static Observer getSecondObserver() { return new Observer() { @Override diff --git a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java index b7416e471a..25cd0bde83 100644 --- a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java @@ -5,9 +5,9 @@ import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; class Connector { - static final String DB_CONNECTION = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"; - static final String DB_USER = ""; - static final String DB_PASSWORD = ""; + private static final String DB_CONNECTION = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"; + private static final String DB_USER = ""; + private static final String DB_PASSWORD = ""; static final ConnectionProvider connectionProvider = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); } diff --git a/rxjava/src/main/java/com/baelding/rxjava/operator/ToCleanString.java b/rxjava/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java similarity index 96% rename from rxjava/src/main/java/com/baelding/rxjava/operator/ToCleanString.java rename to rxjava/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java index 32db92c8fe..708f7e9b86 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/operator/ToCleanString.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava.operator; +package com.baeldung.rxjava.operator; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava/src/main/java/com/baelding/rxjava/operator/ToLength.java b/rxjava/src/main/java/com/baeldung/rxjava/operator/ToLength.java similarity index 90% rename from rxjava/src/main/java/com/baelding/rxjava/operator/ToLength.java rename to rxjava/src/main/java/com/baeldung/rxjava/operator/ToLength.java index 006d59de36..70ba8b8ca9 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/operator/ToLength.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/operator/ToLength.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava.operator; +package com.baeldung.rxjava.operator; import rx.Observable; import rx.Observable.Transformer; diff --git a/rxjava/src/test/java/com/baeldung/rxjava/ObservableTest.java b/rxjava/src/test/java/com/baeldung/rxjava/ObservableTest.java index 3d3bb021d2..beb2cbeed3 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/ObservableTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/ObservableTest.java @@ -3,7 +3,7 @@ package com.baeldung.rxjava; import org.junit.Test; import rx.Observable; -import static com.baelding.rxjava.ObservableImpl.getTitle; +import static com.baeldung.rxjava.ObservableImpl.getTitle; import static junit.framework.Assert.assertTrue; public class ObservableTest { diff --git a/rxjava/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java b/rxjava/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java index bba891da88..414d951b86 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static com.baelding.rxjava.operator.ToCleanString.toCleanString; -import static com.baelding.rxjava.operator.ToLength.toLength; +import static com.baeldung.rxjava.operator.ToCleanString.toCleanString; +import static com.baeldung.rxjava.operator.ToLength.toLength; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; diff --git a/rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java b/rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java similarity index 99% rename from rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java rename to rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java index 05b86e52b9..712f07324c 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.Matchers.hasItems; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -public class SchedulersTest { +public class SchedulersLiveTest { private String result = ""; private String result1 = ""; private String result2 = ""; diff --git a/rxjava/src/test/java/com/baeldung/rxjava/SubjectTest.java b/rxjava/src/test/java/com/baeldung/rxjava/SubjectTest.java index 210ceaa636..628b1e5476 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/SubjectTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/SubjectTest.java @@ -1,6 +1,5 @@ package com.baeldung.rxjava; -import com.baelding.rxjava.SubjectImpl; import org.junit.Test; import rx.subjects.PublishSubject; diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java index c2fb2c32e3..5f445234d7 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java @@ -18,25 +18,25 @@ public class BasicQueryTypesIntegrationTest { private ConnectionProvider connectionProvider = Connector.connectionProvider; private Database db = Database.from(connectionProvider); - private Observable create, insert1, insert2, insert3, update, delete = null; + private Observable create; @Test public void whenCreateTableAndInsertRecords_thenCorrect() { create = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int primary key, name varchar(255))") .count(); - insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'John')") + Observable insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'John')") .dependsOn(create) .count(); - update = db.update("UPDATE EMPLOYEE SET name = 'Alan' WHERE id = 1") + Observable update = db.update("UPDATE EMPLOYEE SET name = 'Alan' WHERE id = 1") .dependsOn(create) .count(); - insert2 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(2, 'Sarah')") + Observable insert2 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(2, 'Sarah')") .dependsOn(create) .count(); - insert3 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(3, 'Mike')") + Observable insert3 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(3, 'Mike')") .dependsOn(create) .count(); - delete = db.update("DELETE FROM EMPLOYEE WHERE id = 2") + Observable delete = db.update("DELETE FROM EMPLOYEE WHERE id = 2") .dependsOn(create) .count(); List names = db.select("select name from EMPLOYEE where id < ?") From 1a4812d722d7c4f065b71864d2570cb2929a3a4a Mon Sep 17 00:00:00 2001 From: aietcn Date: Wed, 18 Oct 2017 17:01:51 -0500 Subject: [PATCH 034/197] BAEL-1064 (#2748) * BAEL-1064 * add spring-milestones repo to pom * more endpoints for spring integration metrics --- metrics/pom.xml | 58 +++- .../metrics/micrometer/MicrometerApp.java | 20 ++ .../metrics/micrometer/PeopleController.java | 54 +++ .../micrometer/MicrometerAtlasTest.java | 308 ++++++++++++++++++ 4 files changed, 438 insertions(+), 2 deletions(-) create mode 100644 metrics/src/main/java/com/baeldung/metrics/micrometer/MicrometerApp.java create mode 100644 metrics/src/main/java/com/baeldung/metrics/micrometer/PeopleController.java create mode 100644 metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java diff --git a/metrics/pom.xml b/metrics/pom.xml index 574c1ac132..926b6a95c5 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -16,6 +16,8 @@ 3.1.2 3.1.0 0.12.17 + 1.0.0-rc.2 + 2.0.0.M5 @@ -57,12 +59,64 @@ ${netflix.servo.ver} test     + + + io.micrometer + micrometer-registry-atlas + ${micrometer.ver} + + + + io.micrometer + micrometer-spring-legacy + ${micrometer.ver} + + + + org.springframework.boot + spring-boot-starter-web + ${spring.boot.ver} + + + + com.fasterxml.jackson.core + jackson-databind + 2.9.1 + com.fasterxml.jackson.dataformat jackson-dataformat-smile - 2.8.9 - test + 2.9.1 + + + + com.netflix.spectator + spectator-api + 0.57.1 + + + + org.springframework.boot + spring-boot-dependencies + pom + import + ${spring.boot.ver} + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone + + false + + + + diff --git a/metrics/src/main/java/com/baeldung/metrics/micrometer/MicrometerApp.java b/metrics/src/main/java/com/baeldung/metrics/micrometer/MicrometerApp.java new file mode 100644 index 0000000000..cf818f6600 --- /dev/null +++ b/metrics/src/main/java/com/baeldung/metrics/micrometer/MicrometerApp.java @@ -0,0 +1,20 @@ +package com.baeldung.metrics.micrometer; + +import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +public class MicrometerApp { + + @Bean + JvmThreadMetrics threadMetrics() { + return new JvmThreadMetrics(); + } + + public static void main(String[] args) throws Exception { + SpringApplication.run(MicrometerApp.class, args); + } + +} diff --git a/metrics/src/main/java/com/baeldung/metrics/micrometer/PeopleController.java b/metrics/src/main/java/com/baeldung/metrics/micrometer/PeopleController.java new file mode 100644 index 0000000000..789e975a7f --- /dev/null +++ b/metrics/src/main/java/com/baeldung/metrics/micrometer/PeopleController.java @@ -0,0 +1,54 @@ +package com.baeldung.metrics.micrometer; + +import io.micrometer.core.annotation.Timed; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** + * @author aiet + */ +@RestController +@Timed("people") +public class PeopleController { + + private static final SecureRandom SECURE_RANDOM = new SecureRandom(); + + @GetMapping("/people") + @Timed(value = "people.all", longTask = true) + public List listPeople() throws InterruptedException { + int seconds2Sleep = SECURE_RANDOM.nextInt(500); + System.out.println(seconds2Sleep); + TimeUnit.MILLISECONDS.sleep(seconds2Sleep); + return Arrays.asList("Jim", "Tom", "Tim"); + } + + @PostMapping("/people") + @Timed(value = "people.update", longTask = true) + public List putPeople() throws InterruptedException { + int seconds2Sleep = SECURE_RANDOM.nextInt(1000); + System.out.println(seconds2Sleep); + TimeUnit.MILLISECONDS.sleep(seconds2Sleep); + return Arrays.asList("Jim", "Tom", "Tim"); + } + + @GetMapping("/asset") + @Timed(value = "people.asset", longTask = true) + public void test() throws Exception { + throw new Exception("error!"); + } + + @GetMapping("/property") + @Timed(value = "people.property", longTask = true) + public void property(HttpServletResponse response) throws IOException { + response.sendRedirect("/asset"); + } + +} diff --git a/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java b/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java new file mode 100644 index 0000000000..b2eb0ee7dc --- /dev/null +++ b/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java @@ -0,0 +1,308 @@ +package com.baeldung.metrics.micrometer; + +import com.netflix.spectator.atlas.AtlasConfig; +import io.micrometer.atlas.AtlasMeterRegistry; +import io.micrometer.core.instrument.*; +import io.micrometer.core.instrument.Timer; +import io.micrometer.core.instrument.composite.CompositeMeterRegistry; +import io.micrometer.core.instrument.simple.SimpleMeterRegistry; +import io.micrometer.core.instrument.stats.hist.Histogram; +import io.micrometer.core.instrument.stats.quantile.WindowSketchQuantiles; +import org.junit.Before; +import org.junit.Test; + +import java.time.Duration; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.collection.IsMapContaining.hasEntry; +import static org.hamcrest.core.IsCollectionContaining.hasItems; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + +/** + * @author aiet + */ +public class MicrometerAtlasTest { + + AtlasConfig atlasConfig; + + @Before + public void init() { + atlasConfig = new AtlasConfig() { + + @Override + public Duration step() { + return Duration.ofSeconds(1); + } + + @Override + public String get(String k) { + return null; + } + }; + } + + @Test + public void givenCompositeRegistries_whenRecordMeter_thenAllRegistriesRecorded() { + CompositeMeterRegistry compositeRegistry = new CompositeMeterRegistry(); + + SimpleMeterRegistry oneSimpleMeter = new SimpleMeterRegistry(); + AtlasMeterRegistry atlasMeterRegistry = new AtlasMeterRegistry(atlasConfig, Clock.SYSTEM); + + compositeRegistry.add(oneSimpleMeter); + compositeRegistry.add(atlasMeterRegistry); + + compositeRegistry.gauge("baeldung.heat", 90); + + Optional oneGauge = oneSimpleMeter + .find("baeldung.heat") + .gauge(); + assertTrue(oneGauge.isPresent()); + Iterator measurements = oneGauge + .get() + .measure() + .iterator(); + + assertTrue(measurements.hasNext()); + assertThat(measurements + .next() + .getValue(), equalTo(90.00)); + + Optional atlasGauge = atlasMeterRegistry + .find("baeldung.heat") + .gauge(); + assertTrue(atlasGauge.isPresent()); + Iterator anotherMeasurements = atlasGauge + .get() + .measure() + .iterator(); + + assertTrue(anotherMeasurements.hasNext()); + assertThat(anotherMeasurements + .next() + .getValue(), equalTo(90.00)); + } + + @Test + public void givenGlobalRegistry_whenIncrementAnywhere_thenCounted() { + class CountedObject { + private CountedObject() { + Metrics + .counter("objects.instance") + .increment(1.0); + } + } + Metrics.addRegistry(new SimpleMeterRegistry()); + + Metrics + .counter("objects.instance") + .increment(); + new CountedObject(); + + Optional counterOptional = Metrics.globalRegistry + .find("objects.instance") + .counter(); + + assertTrue(counterOptional.isPresent()); + assertTrue(counterOptional + .get() + .count() == 2.0); + } + + @Test + public void givenCounter_whenIncrement_thenValueChanged() { + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + Counter counter = Counter + .builder("objects.instance") + .description("indicates instance count of the object") + .tags("dev", "performance") + .register(registry); + + counter.increment(2.0); + assertTrue(counter.count() == 2); + + counter.increment(-1); + assertTrue(counter.count() == 2); + } + + @Test + public void givenTimer_whenWrapTasks_thenTimeRecorded() { + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + Timer timer = registry.timer("app.event"); + timer.record(() -> { + try { + TimeUnit.MILLISECONDS.sleep(1500); + } catch (InterruptedException ignored) { + } + }); + + timer.record(3000, TimeUnit.MILLISECONDS); + + assertTrue(2 == timer.count()); + assertTrue(4510 > timer.totalTime(TimeUnit.MILLISECONDS) && 4500 <= timer.totalTime(TimeUnit.MILLISECONDS)); + } + + @Test + public void givenLongTimer_whenRunTasks_thenTimerRecorded() { + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + LongTaskTimer longTaskTimer = LongTaskTimer + .builder("3rdPartyService") + .register(registry); + + long currentTaskId = longTaskTimer.start(); + try { + TimeUnit.SECONDS.sleep(2); + } catch (InterruptedException ignored) { + } + long timeElapsed = longTaskTimer.stop(currentTaskId); + + assertTrue(timeElapsed / (int) 1e9 == 2); + } + + @Test + public void givenGauge_whenMeterListSize_thenCurrentSizeMonitored() { + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + List list = new ArrayList<>(4); + Gauge gauge = Gauge + .builder("cache.size", list, List::size) + .register(registry); + + assertTrue(gauge.value() == 0.0); + + list.add("1"); + assertTrue(gauge.value() == 1.0); + } + + @Test + public void givenDistributionSummary_whenRecord_thenSummarized() { + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + DistributionSummary distributionSummary = DistributionSummary + .builder("request.size") + .baseUnit("bytes") + .register(registry); + distributionSummary.record(3); + distributionSummary.record(4); + distributionSummary.record(5); + + assertTrue(3 == distributionSummary.count()); + assertTrue(12 == distributionSummary.totalAmount()); + } + + @Test + public void givenTimer_whenEnrichWithQuantile_thenQuantilesComputed() { + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + Timer timer = Timer + .builder("test.timer") + .quantiles(WindowSketchQuantiles + .quantiles(0.3, 0.5, 0.95) + .create()) + .register(registry); + + timer.record(2, TimeUnit.SECONDS); + timer.record(2, TimeUnit.SECONDS); + timer.record(3, TimeUnit.SECONDS); + timer.record(4, TimeUnit.SECONDS); + timer.record(8, TimeUnit.SECONDS); + timer.record(13, TimeUnit.SECONDS); + + List quantileGauges = registry + .getMeters() + .stream() + .filter(meter -> meter + .getType() + .name() + .equals("Gauge")) + .map(meter -> (Gauge) meter) + .collect(Collectors.toList()); + assert (3 == quantileGauges.size()); + + Map quantileMap = quantileGauges + .stream() + .collect(Collectors.toMap(gauge -> { + Tag tag = gauge + .getId() + .getTags() + .iterator() + .next(); + return tag.getKey() + "=" + tag.getValue(); + }, gauge -> (int) (gauge.value() / 1e9))); + + assertThat(quantileMap.keySet(), hasItems("quantile=0.3", "quantile=0.5", "quantile=0.95")); + assertThat(quantileMap.get("quantile=0.3"), is(2)); + assertThat(quantileMap.get("quantile=0.5"), is(3)); + assertThat(quantileMap.get("quantile=0.95"), is(8)); + } + + @Test + public void givenDistributionSummary_whenEnrichWithHistograms_thenDataAggregated() { + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + DistributionSummary hist = DistributionSummary + .builder("summary") + .histogram(Histogram.linear(0, 10, 5)) + .register(registry); + hist.record(3); + hist.record(8); + hist.record(20); + hist.record(40); + hist.record(13); + hist.record(26); + + Map histograms = registry + .getMeters() + .stream() + .filter(meter -> meter.getType() == Meter.Type.Counter) + .collect(Collectors.toMap(counter -> { + Tag tag = counter + .getId() + .getTags() + .iterator() + .next(); + return tag.getKey() + "=" + tag.getValue(); + }, counter -> (int) counter + .measure() + .iterator() + .next() + .getValue())); + + assertThat(histograms, allOf(hasEntry("bucket=0.0", 0), hasEntry("bucket=10.0", 2), hasEntry("bucket=20.0", 2), hasEntry("bucket=30.0", 1), hasEntry("bucket=40.0", 1), hasEntry("bucket=Infinity", 0))); + } + + @Test + public void givenTimer_whenEnrichWithTimescaleHistogram_thenTimeScaleDataCollected() { + SimpleMeterRegistry registry = new SimpleMeterRegistry(); + Timer timer = Timer + .builder("timer") + .histogram(Histogram.linearTime(TimeUnit.MILLISECONDS, 0, 200, 3)) + .register(registry); + + timer.record(1000, TimeUnit.MILLISECONDS); + timer.record(23, TimeUnit.MILLISECONDS); + timer.record(450, TimeUnit.MILLISECONDS); + timer.record(341, TimeUnit.MILLISECONDS); + timer.record(500, TimeUnit.MILLISECONDS); + + Map histograms = registry + .getMeters() + .stream() + .filter(meter -> meter.getType() == Meter.Type.Counter) + .collect(Collectors.toMap(counter -> { + Tag tag = counter + .getId() + .getTags() + .iterator() + .next(); + return tag.getKey() + "=" + tag.getValue(); + }, counter -> (int) counter + .measure() + .iterator() + .next() + .getValue())); + + assertThat(histograms, allOf(hasEntry("bucket=0.0", 0), hasEntry("bucket=2.0E8", 1), hasEntry("bucket=4.0E8", 1), hasEntry("bucket=Infinity", 3))); + + } + +} From 325ba1f1475a66d96609e93e685048c3ad6d05da Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Thu, 19 Oct 2017 12:50:18 +0200 Subject: [PATCH 035/197] RxJava refactor (#2754) * RxJava refactor * RxJava refactor --- .../operators/RxAggregateOperatorsTest.java | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/rxjava/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsTest.java b/rxjava/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsTest.java index 1af41f795f..6733aa08c5 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsTest.java @@ -4,7 +4,12 @@ import org.junit.Test; import rx.Observable; import rx.observers.TestSubscriber; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; public class RxAggregateOperatorsTest { @@ -29,7 +34,6 @@ public class RxAggregateOperatorsTest { subscriber.assertNoErrors(); subscriber.assertValueCount(8); subscriber.assertValues(1, 2, 3, 4, 5, 6, 7, 8); - } @Test @@ -41,7 +45,7 @@ public class RxAggregateOperatorsTest { // when Observable sourceObservable = Observable.from(lettersList) - .count(); + .count(); sourceObservable.subscribe(subscriber); // then @@ -60,7 +64,7 @@ public class RxAggregateOperatorsTest { // when Observable reduceObservable = Observable.from(list) - .reduce((letter1, letter2) -> letter2 + letter1); + .reduce((letter1, letter2) -> letter2 + letter1); reduceObservable.subscribe(subscriber); // then @@ -78,15 +82,15 @@ public class RxAggregateOperatorsTest { TestSubscriber subscriber = TestSubscriber.create(); // when - Observable reduceListObservable = Observable.from(list) - .collect(() -> new HashSet(), (set, item) -> set.add(item)); + Observable> reduceListObservable = Observable.from(list) + .collect(HashSet::new, HashSet::add); reduceListObservable.subscribe(subscriber); // then subscriber.assertCompleted(); subscriber.assertNoErrors(); subscriber.assertValueCount(1); - subscriber.assertValues(new HashSet(list)); + subscriber.assertValues(new HashSet<>(list)); } @Test @@ -104,7 +108,6 @@ public class RxAggregateOperatorsTest { subscriber.assertNoErrors(); subscriber.assertValueCount(1); subscriber.assertValue(Arrays.asList(1, 2, 3, 4, 5)); - } @Test @@ -139,17 +142,21 @@ public class RxAggregateOperatorsTest { subscriber.assertNoErrors(); subscriber.assertValueCount(1); subscriber.assertValue(Arrays.asList(14, 13, 12, 11, 10)); - } @Test public void givenObservable_whenUsingToMap_thenObtainedAMap() { // given - Observable bookObservable = Observable.just(new Book("The North Water", 2016), new Book("Origin", 2017), new Book("Sleeping Beauties", 2017)); + Observable bookObservable = Observable + .just( + new Book("The North Water", 2016), + new Book("Origin", 2017), + new Book("Sleeping Beauties", 2017)); TestSubscriber subscriber = TestSubscriber.create(); // when - Observable> mapObservable = bookObservable.toMap(Book::getTitle, Book::getYear, HashMap::new); + Observable> mapObservable = bookObservable + .toMap(Book::getTitle, Book::getYear, HashMap::new); mapObservable.subscribe(subscriber); @@ -169,11 +176,16 @@ public class RxAggregateOperatorsTest { @Test public void givenObservable_whenUsingToMultiMap_thenObtainedAMultiMap() { // given - Observable bookObservable = Observable.just(new Book("The North Water", 2016), new Book("Origin", 2017), new Book("Sleeping Beauties", 2017)); + Observable bookObservable = Observable + .just( + new Book("The North Water", 2016), + new Book("Origin", 2017), + new Book("Sleeping Beauties", 2017)); TestSubscriber subscriber = TestSubscriber.create(); // when - Observable multiMapObservable = bookObservable.toMultimap(Book::getYear, Book::getTitle, () -> new HashMap(), (key) -> new ArrayList()); + Observable multiMapObservable = bookObservable + .toMultimap(Book::getYear, Book::getTitle, () -> new HashMap<>(), (key) -> new ArrayList<>()); multiMapObservable.subscribe(subscriber); @@ -187,7 +199,6 @@ public class RxAggregateOperatorsTest { put(2017, Arrays.asList("Origin", "Sleeping Beauties")); } }); - } class Book { From e6d82e8cedc0b9df2e9929abcf573dfabc5cea4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Walter=20G=C3=B3mez?= Date: Thu, 19 Oct 2017 06:08:45 -0600 Subject: [PATCH 036/197] Fix/hibernate tests fix (#2758) * Add project for hibernate immutable article Add Event entity Add hibernate configuration file Add hibernateutil for configuration Add test to match snippets from article * Update master * Update hibernate tests Change sesssion handling Modify event creation --- .../HibernateImmutableIntegrationTest.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java index b8cc3dc1a6..d6ecdb29d6 100644 --- a/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java +++ b/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java @@ -23,11 +23,8 @@ public class HibernateImmutableIntegrationTest { @Before public void before() { - session = HibernateUtil.getSessionFactory().getCurrentSession(); + session = HibernateUtil.getSessionFactory().openSession(); session.beginTransaction(); - createEvent(); - createEventGenerated(); - session.setCacheMode(CacheMode.REFRESH); } @BeforeClass @@ -40,8 +37,6 @@ public class HibernateImmutableIntegrationTest { HibernateUtil.getSessionFactory().close(); } - // - @Test public void addEvent() { Event event = new Event(); @@ -49,15 +44,18 @@ public class HibernateImmutableIntegrationTest { event.setTitle("Public Event"); session.save(event); session.getTransaction().commit(); + session.close(); } @Test public void updateEvent() { + createEvent(); Event event = (Event) session.createQuery("FROM Event WHERE title='New Event'").list().get(0); event.setTitle("Private Event"); session.update(event); session.flush(); session.refresh(event); + session.close(); assertThat(event.getTitle(), equalTo("New Event")); assertThat(event.getId(), equalTo(5L)); @@ -65,13 +63,16 @@ public class HibernateImmutableIntegrationTest { @Test public void deleteEvent() { + createEvent(); Event event = (Event) session.createQuery("FROM Event WHERE title='New Event'").list().get(0); session.delete(event); session.getTransaction().commit(); + session.close(); } @Test public void addGuest() { + createEvent(); Event event = (Event) session.createQuery("FROM Event WHERE title='New Event'").list().get(0); String newGuest = "Sara"; event.getGuestList().add(newGuest); @@ -79,6 +80,7 @@ public class HibernateImmutableIntegrationTest { exception.expect(PersistenceException.class); session.save(event); session.getTransaction().commit(); + session.close(); } @Test @@ -94,18 +96,18 @@ public class HibernateImmutableIntegrationTest { @Test public void updateEventGenerated() { + createEventGenerated(); EventGeneratedId eventGeneratedId = (EventGeneratedId) session.createQuery("FROM EventGeneratedId WHERE name LIKE '%John%'").list().get(0); eventGeneratedId.setName("Mike"); session.update(eventGeneratedId); session.flush(); session.refresh(eventGeneratedId); + session.close(); assertThat(eventGeneratedId.getName(), equalTo("John")); assertThat(eventGeneratedId.getId(), equalTo(1L)); } - // - private static void createEvent() { Event event = new Event(5L, "New Event", Sets.newHashSet("guest")); session.save(event); From fc0ed8fe3d5fc9be981d2c2e546461892f2504ad Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Thu, 19 Oct 2017 17:32:02 +0200 Subject: [PATCH 037/197] Rest-assured fix (#2759) --- .../RestAssured2IntegrationTest.java | 72 ++++----- .../RestAssuredIntegrationTest.java | 150 +++++++++--------- .../RestAssuredXML2IntegrationTest.java | 78 +++++---- .../RestAssuredXMLIntegrationTest.java | 143 ++++++++--------- .../java/com/baeldung/restassured/Util.java | 37 +---- 5 files changed, 218 insertions(+), 262 deletions(-) diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java b/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java index 13ba3ccac9..e99db2a232 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java @@ -1,55 +1,51 @@ package com.baeldung.restassured; +import com.github.tomakehurst.wiremock.WireMockServer; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.configureFor; import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.hasItems; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static io.restassured.RestAssured.get; - -import com.github.tomakehurst.wiremock.WireMockServer; - public class RestAssured2IntegrationTest { - private WireMockServer wireMockServer = new WireMockServer(); + private static WireMockServer wireMockServer = new WireMockServer(); - private static final String EVENTS_PATH = "/odds"; - private static final String APPLICATION_JSON = "application/json"; - private static final String ODDS = getJson(); + private static final String EVENTS_PATH = "/odds"; + private static final String APPLICATION_JSON = "application/json"; + private static final String ODDS = getJson(); - @Before - public void before() throws Exception { - System.out.println("Setting up!"); - wireMockServer.start(); - configureFor("localhost", 8080); - stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( - aResponse().withStatus(200) - .withHeader("Content-Type", APPLICATION_JSON) - .withBody(ODDS))); - } + @BeforeClass + public static void before() throws Exception { + System.out.println("Setting up!"); + wireMockServer.start(); + configureFor("localhost", 8080); + stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( + aResponse().withStatus(200) + .withHeader("Content-Type", APPLICATION_JSON) + .withBody(ODDS))); + } - @Test - public void givenUrl_whenVerifiesOddPricesAccuratelyByStatus_thenCorrect() { - get("/odds").then().body("odds.findAll { it.status > 0 }.price", - hasItems(5.25f, 1.2f)); - } + @Test + public void givenUrl_whenVerifiesOddPricesAccuratelyByStatus_thenCorrect() { + get("/odds").then().body("odds.findAll { it.status > 0 }.price", + hasItems(5.25f, 1.2f)); + } - private static String getJson() { + private static String getJson() { - return Util.inputStreamToString(new RestAssured2IntegrationTest().getClass() - .getResourceAsStream("/odds.json")); - - } - - @After - public void after() throws Exception { - System.out.println("Running: tearDown"); - wireMockServer.stop(); - } + return Util.inputStreamToString(RestAssured2IntegrationTest.class + .getResourceAsStream("/odds.json")); + } + @AfterClass + public static void after() throws Exception { + System.out.println("Running: tearDown"); + wireMockServer.stop(); + } } diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java index f14d9920b6..5edf200a40 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java @@ -1,5 +1,13 @@ package com.baeldung.restassured; +import com.github.fge.jsonschema.SchemaVersion; +import com.github.fge.jsonschema.cfg.ValidationConfiguration; +import com.github.fge.jsonschema.main.JsonSchemaFactory; +import com.github.tomakehurst.wiremock.WireMockServer; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.configureFor; import static com.github.tomakehurst.wiremock.client.WireMock.get; @@ -11,96 +19,84 @@ import static io.restassured.module.jsv.JsonSchemaValidatorSettings.settings; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItems; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.github.fge.jsonschema.SchemaVersion; -import com.github.fge.jsonschema.cfg.ValidationConfiguration; -import com.github.fge.jsonschema.main.JsonSchemaFactory; -import com.github.tomakehurst.wiremock.WireMockServer; - public class RestAssuredIntegrationTest { - private WireMockServer wireMockServer = new WireMockServer(); - private static final String EVENTS_PATH = "/events?id=390"; - private static final String APPLICATION_JSON = "application/json"; - private static final String GAME_ODDS = getEventJson(); + private static WireMockServer wireMockServer = new WireMockServer(); + private static final String EVENTS_PATH = "/events?id=390"; + private static final String APPLICATION_JSON = "application/json"; + private static final String GAME_ODDS = getEventJson(); - @Before - public void before() throws Exception { - System.out.println("Setting up!"); - wireMockServer.start(); - configureFor("localhost", 8080); - stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( - aResponse().withStatus(200) - .withHeader("Content-Type", APPLICATION_JSON) - .withBody(GAME_ODDS))); - } + @BeforeClass + public static void before() throws Exception { + System.out.println("Setting up!"); + wireMockServer.start(); + configureFor("localhost", 8080); + stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( + aResponse().withStatus(200) + .withHeader("Content-Type", APPLICATION_JSON) + .withBody(GAME_ODDS))); + } - @Test - public void givenUrl_whenCheckingFloatValuePasses_thenCorrect() { - get("/events?id=390").then().assertThat() - .body("odd.ck", equalTo(12.2f)); - } + @Test + public void givenUrl_whenCheckingFloatValuePasses_thenCorrect() { + get("/events?id=390").then().assertThat() + .body("odd.ck", equalTo(12.2f)); + } - @Test - public void givenUrl_whenSuccessOnGetsResponseAndJsonHasRequiredKV_thenCorrect() { + @Test + public void givenUrl_whenSuccessOnGetsResponseAndJsonHasRequiredKV_thenCorrect() { - get("/events?id=390").then().statusCode(200).assertThat() - .body("id", equalTo("390")); + get("/events?id=390").then().statusCode(200).assertThat() + .body("id", equalTo("390")); + } - } + @Test + public void givenUrl_whenJsonResponseHasArrayWithGivenValuesUnderKey_thenCorrect() { + get("/events?id=390").then().assertThat() + .body("odds.price", hasItems("1.30", "5.25", "2.70", "1.20")); + } - @Test - public void givenUrl_whenJsonResponseHasArrayWithGivenValuesUnderKey_thenCorrect() { - get("/events?id=390").then().assertThat() - .body("odds.price", hasItems("1.30", "5.25", "2.70", "1.20")); - } + @Test + public void givenUrl_whenJsonResponseConformsToSchema_thenCorrect() { - @Test - public void givenUrl_whenJsonResponseConformsToSchema_thenCorrect() { + get("/events?id=390").then().assertThat() + .body(matchesJsonSchemaInClasspath("event_0.json")); + } - get("/events?id=390").then().assertThat() - .body(matchesJsonSchemaInClasspath("event_0.json")); - } + @Test + public void givenUrl_whenValidatesResponseWithInstanceSettings_thenCorrect() { + JsonSchemaFactory jsonSchemaFactory = JsonSchemaFactory + .newBuilder() + .setValidationConfiguration( + ValidationConfiguration.newBuilder() + .setDefaultVersion(SchemaVersion.DRAFTV4) + .freeze()).freeze(); - @Test - public void givenUrl_whenValidatesResponseWithInstanceSettings_thenCorrect() { - JsonSchemaFactory jsonSchemaFactory = JsonSchemaFactory - .newBuilder() - .setValidationConfiguration( - ValidationConfiguration.newBuilder() - .setDefaultVersion(SchemaVersion.DRAFTV4) - .freeze()).freeze(); + get("/events?id=390") + .then() + .assertThat() + .body(matchesJsonSchemaInClasspath("event_0.json").using( + jsonSchemaFactory)); + } - get("/events?id=390") - .then() - .assertThat() - .body(matchesJsonSchemaInClasspath("event_0.json").using( - jsonSchemaFactory)); + @Test + public void givenUrl_whenValidatesResponseWithStaticSettings_thenCorrect() { - } + get("/events?id=390") + .then() + .assertThat() + .body(matchesJsonSchemaInClasspath("event_0.json").using( + settings().with().checkedValidation(false))); + } - @Test - public void givenUrl_whenValidatesResponseWithStaticSettings_thenCorrect() { - - get("/events?id=390") - .then() - .assertThat() - .body(matchesJsonSchemaInClasspath("event_0.json").using( - settings().with().checkedValidation(false))); - } - - @After - public void after() throws Exception { - System.out.println("Running: tearDown"); - wireMockServer.stop(); - } - - private static String getEventJson() { - return Util.inputStreamToString(RestAssuredIntegrationTest.class - .getResourceAsStream("/event_0.json")); - } + @AfterClass + public static void after() throws Exception { + System.out.println("Running: tearDown"); + wireMockServer.stop(); + } + private static String getEventJson() { + return Util.inputStreamToString(RestAssuredIntegrationTest.class + .getResourceAsStream("/event_0.json")); + } } diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java index b77f24b15f..9eef9654a3 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java @@ -1,54 +1,52 @@ package com.baeldung.restassured; +import com.github.tomakehurst.wiremock.WireMockServer; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.configureFor; import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.hasItems; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static io.restassured.RestAssured.get; - -import com.github.tomakehurst.wiremock.WireMockServer; - public class RestAssuredXML2IntegrationTest { - private WireMockServer wireMockServer = new WireMockServer(); + private static WireMockServer wireMockServer = new WireMockServer(); - private static final String EVENTS_PATH = "/teachers"; - private static final String APPLICATION_XML = "application/xml"; - private static final String TEACHERS = getXml(); + private static final String EVENTS_PATH = "/teachers"; + private static final String APPLICATION_XML = "application/xml"; + private static final String TEACHERS = getXml(); - @Before - public void before() throws Exception { - System.out.println("Setting up!"); - wireMockServer.start(); - configureFor("localhost", 8080); - stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( - aResponse().withStatus(200) - .withHeader("Content-Type", APPLICATION_XML) - .withBody(TEACHERS))); - } - @Test - public void givenUrl_whenVerifiesScienceTeacherFromXml_thenCorrect() { - get("/teachers") - .then() - .body("teachers.teacher.find { it.@department == 'science' }.subject", - hasItems("math", "physics")); - } - private static String getXml() { - - return Util - .inputStreamToString(new RestAssuredXML2IntegrationTest().getClass().getResourceAsStream("/teachers.xml")); - -} - @After -public void after() throws Exception { - System.out.println("Running: tearDown"); - wireMockServer.stop(); -} + @BeforeClass + public static void before() throws Exception { + System.out.println("Setting up!"); + wireMockServer.start(); + configureFor("localhost", 8080); + stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( + aResponse().withStatus(200) + .withHeader("Content-Type", APPLICATION_XML) + .withBody(TEACHERS))); + } + @Test + public void givenUrl_whenVerifiesScienceTeacherFromXml_thenCorrect() { + get("/teachers") + .then() + .body("teachers.teacher.find { it.@department == 'science' }.subject", + hasItems("math", "physics")); + } + + private static String getXml() { + return Util.inputStreamToString(RestAssuredXML2IntegrationTest.class + .getResourceAsStream("/teachers.xml")); + } + + @AfterClass + public static void after() throws Exception { + System.out.println("Running: tearDown"); + wireMockServer.stop(); + } } diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java index 10aef63cdb..de2dfa1c89 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java @@ -1,99 +1,86 @@ package com.baeldung.restassured; +import com.github.tomakehurst.wiremock.WireMockServer; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.configureFor; -import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.post; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static io.restassured.RestAssured.post; -import static io.restassured.RestAssured.get; -import static io.restassured.module.jsv.JsonSchemaValidator.matchesJsonSchemaInClasspath; -import static io.restassured.module.jsv.JsonSchemaValidatorSettings.settings; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.xml.HasXPath.hasXPath; -import java.io.FileNotFoundException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.github.fge.jsonschema.SchemaVersion; -import com.github.fge.jsonschema.cfg.ValidationConfiguration; -import com.github.fge.jsonschema.main.JsonSchemaFactory; -import com.github.tomakehurst.wiremock.WireMockServer; public class RestAssuredXMLIntegrationTest { - private WireMockServer wireMockServer = new WireMockServer(); - private static final String EVENTS_PATH = "/employees"; - private static final String APPLICATION_XML = "application/xml"; - private static final String EMPLOYEES = getXml(); + private static WireMockServer wireMockServer = new WireMockServer(); + private static final String EVENTS_PATH = "/employees"; + private static final String APPLICATION_XML = "application/xml"; + private static final String EMPLOYEES = getXml(); - @Before - public void before() throws Exception { - System.out.println("Setting up!"); - wireMockServer.start(); - configureFor("localhost", 8080); - stubFor(post(urlEqualTo(EVENTS_PATH)).willReturn( - aResponse().withStatus(200) - .withHeader("Content-Type", APPLICATION_XML) - .withBody(EMPLOYEES))); - } - @Test - public void givenUrl_whenXmlResponseValueTestsEqual_thenCorrect() { - post("/employees").then().assertThat() - .body("employees.employee.first-name", equalTo("Jane")); - } + @BeforeClass + public static void before() throws Exception { + System.out.println("Setting up!"); + wireMockServer.start(); + configureFor("localhost", 8080); + stubFor(post(urlEqualTo(EVENTS_PATH)).willReturn( + aResponse().withStatus(200) + .withHeader("Content-Type", APPLICATION_XML) + .withBody(EMPLOYEES))); + } - @Test - public void givenUrl_whenMultipleXmlValuesTestEqual_thenCorrect() { - post("/employees").then().assertThat() - .body("employees.employee.first-name", equalTo("Jane")) - .body("employees.employee.last-name", equalTo("Daisy")) - .body("employees.employee.sex", equalTo("f")); - } + @Test + public void givenUrl_whenXmlResponseValueTestsEqual_thenCorrect() { + post("/employees").then().assertThat() + .body("employees.employee.first-name", equalTo("Jane")); + } - @Test - public void givenUrl_whenMultipleXmlValuesTestEqualInShortHand_thenCorrect() { - post("/employees") - .then() - .assertThat() - .body("employees.employee.first-name", equalTo("Jane"), - "employees.employee.last-name", equalTo("Daisy"), - "employees.employee.sex", equalTo("f")); - } + @Test + public void givenUrl_whenMultipleXmlValuesTestEqual_thenCorrect() { + post("/employees").then().assertThat() + .body("employees.employee.first-name", equalTo("Jane")) + .body("employees.employee.last-name", equalTo("Daisy")) + .body("employees.employee.sex", equalTo("f")); + } - @Test - public void givenUrl_whenValidatesXmlUsingXpath_thenCorrect() { - post("/employees") - .then() - .assertThat() - .body(hasXPath("/employees/employee/first-name", - containsString("Ja"))); + @Test + public void givenUrl_whenMultipleXmlValuesTestEqualInShortHand_thenCorrect() { + post("/employees") + .then() + .assertThat() + .body("employees.employee.first-name", equalTo("Jane"), + "employees.employee.last-name", equalTo("Daisy"), + "employees.employee.sex", equalTo("f")); + } - } + @Test + public void givenUrl_whenValidatesXmlUsingXpath_thenCorrect() { + post("/employees") + .then() + .assertThat() + .body(hasXPath("/employees/employee/first-name", + containsString("Ja"))); + } - @Test - public void givenUrl_whenValidatesXmlUsingXpath2_thenCorrect() { - post("/employees") - .then() - .assertThat() - .body(hasXPath("/employees/employee/first-name[text()='Jane']")); + @Test + public void givenUrl_whenValidatesXmlUsingXpath2_thenCorrect() { + post("/employees") + .then() + .assertThat() + .body(hasXPath("/employees/employee/first-name[text()='Jane']")); + } - } + private static String getXml() { + return Util + .inputStreamToString(RestAssuredXMLIntegrationTest.class.getResourceAsStream("/employees.xml")); + } - - private static String getXml() { - - return Util - .inputStreamToString(new RestAssuredXMLIntegrationTest().getClass().getResourceAsStream("/employees.xml")); - -} - @After -public void after() throws Exception { - System.out.println("Running: tearDown"); - wireMockServer.stop(); -} + @AfterClass + public static void after() throws Exception { + System.out.println("Running: tearDown"); + wireMockServer.stop(); + } } diff --git a/rest-assured/src/test/java/com/baeldung/restassured/Util.java b/rest-assured/src/test/java/com/baeldung/restassured/Util.java index c75c52eb34..02dec87927 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/Util.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/Util.java @@ -1,36 +1,15 @@ package com.baeldung.restassured; -import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; +import java.util.Scanner; -public class Util { - public static String inputStreamToString(InputStream is) { - BufferedReader br = null; - StringBuilder sb = new StringBuilder(); +final class Util { - String line; - try { + private Util() { + } - br = new BufferedReader(new InputStreamReader(is)); - while ((line = br.readLine()) != null) { - sb.append(line); - } - - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (br != null) { - try { - br.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - return sb.toString(); - - } + static String inputStreamToString(InputStream is) { + Scanner s = new Scanner(is).useDelimiter("\\A"); + return s.hasNext() ? s.next() : ""; + } } From 01406f1c8ba6817b7419f0c492a2804356e58fd9 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Thu, 19 Oct 2017 17:51:31 +0200 Subject: [PATCH 038/197] Cucumber fix (#2761) * Rest-assured fix * Cucumber fix --- .../java/com/baeldung/BaeldungController.java | 13 +++++----- .../com/baeldung/SpringDemoApplication.java | 9 +------ .../src/main/resources/application.properties | 1 + .../baeldung/OtherDefsIntegrationTest.java | 4 +-- .../com/baeldung/SpringIntegrationTest.java | 26 +++++++------------ .../com/baeldung/StepDefsIntegrationTest.java | 2 +- 6 files changed, 21 insertions(+), 34 deletions(-) diff --git a/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java b/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java index 8e87ed3028..e74e773106 100644 --- a/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java +++ b/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java @@ -1,22 +1,21 @@ package com.baeldung; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; + @RestController public class BaeldungController { - @RequestMapping(method = { RequestMethod.GET }, value = { "/hello" }) + @GetMapping("/hello") public String sayHello(HttpServletResponse response) { return "hello"; } - @RequestMapping(method = { RequestMethod.POST }, value = { "/baeldung" }) + @PostMapping("/baeldung") public String sayHelloPost(HttpServletResponse response) { return "hello"; } - } diff --git a/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java b/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java index 820e7e8004..ff9b12ad85 100644 --- a/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java +++ b/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java @@ -2,23 +2,16 @@ package com.baeldung; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.web.SpringBootServletInitializer; import org.springframework.context.annotation.Bean; import org.springframework.web.client.RestTemplate; @SpringBootApplication -public class SpringDemoApplication extends SpringBootServletInitializer { +public class SpringDemoApplication { public static void main(String[] args) { SpringApplication.run(SpringDemoApplication.class, args); } - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(SpringDemoApplication.class); - } - @Bean public RestTemplate getRestTemplate() { return new RestTemplate(); diff --git a/spring-cucumber/src/main/resources/application.properties b/spring-cucumber/src/main/resources/application.properties index e69de29bb2..8d51d0c619 100644 --- a/spring-cucumber/src/main/resources/application.properties +++ b/spring-cucumber/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=8082 \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java index 17f298c3fb..400452c3fa 100644 --- a/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java @@ -6,11 +6,11 @@ import cucumber.api.java.en.When; public class OtherDefsIntegrationTest extends SpringIntegrationTest { @When("^the client calls /baeldung$") public void the_client_issues_POST_hello() throws Throwable { - executePost("http://localhost:8080/baeldung"); + executePost("http://localhost:8082/baeldung"); } @Given("^the client calls /hello$") public void the_client_issues_GET_hello() throws Throwable { - executeGet("http://localhost:8080/hello"); + executeGet("http://localhost:8082/hello"); } } \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java index 34efff63fb..159ff5dc21 100644 --- a/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java @@ -32,14 +32,11 @@ public class SpringIntegrationTest { final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler(); restTemplate.setErrorHandler(errorHandler); - latestResponse = restTemplate.execute(url, HttpMethod.GET, requestCallback, new ResponseExtractor() { - @Override - public ResponseResults extractData(ClientHttpResponse response) throws IOException { - if (errorHandler.hadError) { - return (errorHandler.getResults()); - } else { - return (new ResponseResults(response)); - } + latestResponse = restTemplate.execute(url, HttpMethod.GET, requestCallback, response -> { + if (errorHandler.hadError) { + return (errorHandler.getResults()); + } else { + return (new ResponseResults(response)); } }); @@ -56,14 +53,11 @@ public class SpringIntegrationTest { } restTemplate.setErrorHandler(errorHandler); - latestResponse = restTemplate.execute(url, HttpMethod.POST, requestCallback, new ResponseExtractor() { - @Override - public ResponseResults extractData(ClientHttpResponse response) throws IOException { - if (errorHandler.hadError) { - return (errorHandler.getResults()); - } else { - return (new ResponseResults(response)); - } + latestResponse = restTemplate.execute(url, HttpMethod.POST, requestCallback, response -> { + if (errorHandler.hadError) { + return (errorHandler.getResults()); + } else { + return (new ResponseResults(response)); } }); diff --git a/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java index 8220d5e861..42fb8a44ee 100644 --- a/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java @@ -13,7 +13,7 @@ public class StepDefsIntegrationTest extends SpringIntegrationTest { @When("^the client calls /version$") public void the_client_issues_GET_version() throws Throwable { - executeGet("http://localhost:8080/version"); + executeGet("http://localhost:8082/version"); } @Then("^the client receives status code of (\\d+)$") From aed9c8bfa8dafdc25349c0712d33fbf3ebfcbbf1 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Thu, 19 Oct 2017 19:13:29 +0200 Subject: [PATCH 039/197] Rest-assured fix (#2764) --- .../baeldung/restassured/RestAssured2IntegrationTest.java | 8 +++++--- .../baeldung/restassured/RestAssuredIntegrationTest.java | 7 +++++-- .../restassured/RestAssuredXML2IntegrationTest.java | 7 +++++-- .../restassured/RestAssuredXMLIntegrationTest.java | 8 ++++++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java b/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java index e99db2a232..1b691414db 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/RestAssured2IntegrationTest.java @@ -1,6 +1,7 @@ package com.baeldung.restassured; import com.github.tomakehurst.wiremock.WireMockServer; +import io.restassured.RestAssured; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -14,7 +15,8 @@ import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.hasItems; public class RestAssured2IntegrationTest { - private static WireMockServer wireMockServer = new WireMockServer(); + private static final int PORT = 8084; + private static WireMockServer wireMockServer = new WireMockServer(PORT); private static final String EVENTS_PATH = "/odds"; private static final String APPLICATION_JSON = "application/json"; @@ -24,7 +26,8 @@ public class RestAssured2IntegrationTest { public static void before() throws Exception { System.out.println("Setting up!"); wireMockServer.start(); - configureFor("localhost", 8080); + configureFor("localhost", PORT); + RestAssured.port = PORT; stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( aResponse().withStatus(200) .withHeader("Content-Type", APPLICATION_JSON) @@ -38,7 +41,6 @@ public class RestAssured2IntegrationTest { } private static String getJson() { - return Util.inputStreamToString(RestAssured2IntegrationTest.class .getResourceAsStream("/odds.json")); } diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java index 5edf200a40..4ad3cea22c 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredIntegrationTest.java @@ -4,6 +4,7 @@ import com.github.fge.jsonschema.SchemaVersion; import com.github.fge.jsonschema.cfg.ValidationConfiguration; import com.github.fge.jsonschema.main.JsonSchemaFactory; import com.github.tomakehurst.wiremock.WireMockServer; +import io.restassured.RestAssured; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -20,8 +21,9 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItems; public class RestAssuredIntegrationTest { + private static final int PORT = 8083; + private static WireMockServer wireMockServer = new WireMockServer(PORT); - private static WireMockServer wireMockServer = new WireMockServer(); private static final String EVENTS_PATH = "/events?id=390"; private static final String APPLICATION_JSON = "application/json"; private static final String GAME_ODDS = getEventJson(); @@ -30,7 +32,8 @@ public class RestAssuredIntegrationTest { public static void before() throws Exception { System.out.println("Setting up!"); wireMockServer.start(); - configureFor("localhost", 8080); + RestAssured.port = PORT; + configureFor("localhost", PORT); stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( aResponse().withStatus(200) .withHeader("Content-Type", APPLICATION_JSON) diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java index 9eef9654a3..4a29d8832f 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXML2IntegrationTest.java @@ -1,6 +1,7 @@ package com.baeldung.restassured; import com.github.tomakehurst.wiremock.WireMockServer; +import io.restassured.RestAssured; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -14,7 +15,8 @@ import static io.restassured.RestAssured.get; import static org.hamcrest.Matchers.hasItems; public class RestAssuredXML2IntegrationTest { - private static WireMockServer wireMockServer = new WireMockServer(); + private static final int PORT = 8082; + private static WireMockServer wireMockServer = new WireMockServer(PORT); private static final String EVENTS_PATH = "/teachers"; private static final String APPLICATION_XML = "application/xml"; @@ -24,7 +26,8 @@ public class RestAssuredXML2IntegrationTest { public static void before() throws Exception { System.out.println("Setting up!"); wireMockServer.start(); - configureFor("localhost", 8080); + RestAssured.port = PORT; + configureFor("localhost", PORT); stubFor(get(urlEqualTo(EVENTS_PATH)).willReturn( aResponse().withStatus(200) .withHeader("Content-Type", APPLICATION_XML) diff --git a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java index de2dfa1c89..f1a22831f4 100644 --- a/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java +++ b/rest-assured/src/test/java/com/baeldung/restassured/RestAssuredXMLIntegrationTest.java @@ -1,6 +1,7 @@ package com.baeldung.restassured; import com.github.tomakehurst.wiremock.WireMockServer; +import io.restassured.RestAssured; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -16,7 +17,9 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.xml.HasXPath.hasXPath; public class RestAssuredXMLIntegrationTest { - private static WireMockServer wireMockServer = new WireMockServer(); + private static final int PORT = 8081; + private static WireMockServer wireMockServer = new WireMockServer(PORT); + private static final String EVENTS_PATH = "/employees"; private static final String APPLICATION_XML = "application/xml"; private static final String EMPLOYEES = getXml(); @@ -25,7 +28,8 @@ public class RestAssuredXMLIntegrationTest { public static void before() throws Exception { System.out.println("Setting up!"); wireMockServer.start(); - configureFor("localhost", 8080); + configureFor("localhost", PORT); + RestAssured.port = PORT; stubFor(post(urlEqualTo(EVENTS_PATH)).willReturn( aResponse().withStatus(200) .withHeader("Content-Type", APPLICATION_XML) From 8616b075066e62d969b8d8c6ca7c989f0df6ab15 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Thu, 19 Oct 2017 22:10:21 +0200 Subject: [PATCH 040/197] Cucumber fix (#2765) * Rest-assured fix * Cucumber fix * HystrixManualTest * Reformat HystrixTimeoutManualTest --- hystrix/pom.xml | 1 - ...est.java => HystrixTimeoutManualTest.java} | 68 +++++++++---------- .../baeldung/OtherDefsIntegrationTest.java | 16 ----- .../java/com/baeldung/ResponseResults.java | 16 ++--- .../com/baeldung/SpringIntegrationTest.java | 32 ++++----- .../com/baeldung/StepDefsIntegrationTest.java | 11 +++ 6 files changed, 66 insertions(+), 78 deletions(-) rename hystrix/src/test/java/com/baeldung/hystrix/{HystrixTimeoutIntegrationTest.java => HystrixTimeoutManualTest.java} (72%) delete mode 100644 spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java diff --git a/hystrix/pom.xml b/hystrix/pom.xml index 7e9a217dba..58e09816ea 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -2,7 +2,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.baeldung hystrix 1.0 hystrix diff --git a/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutIntegrationTest.java b/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutManualTest.java similarity index 72% rename from hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutIntegrationTest.java rename to hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutManualTest.java index bf0c542980..ed89104c05 100644 --- a/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutIntegrationTest.java +++ b/hystrix/src/test/java/com/baeldung/hystrix/HystrixTimeoutManualTest.java @@ -10,53 +10,53 @@ import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class HystrixTimeoutIntegrationTest { +public class HystrixTimeoutManualTest { @Test - public void givenInputBobAndDefaultSettings_whenCommandExecuted_thenReturnHelloBob(){ + public void givenInputBobAndDefaultSettings_whenCommandExecuted_thenReturnHelloBob() { assertThat(new CommandHelloWorld("Bob").execute(), equalTo("Hello Bob!")); } @Test public void givenSvcTimeoutOf100AndDefaultSettings_whenRemoteSvcExecuted_thenReturnSuccess() - throws InterruptedException { + throws InterruptedException { HystrixCommand.Setter config = HystrixCommand - .Setter - .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroup2")); + .Setter + .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroup2")); assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(100)).execute(), - equalTo("Success")); + equalTo("Success")); } @Test(expected = HystrixRuntimeException.class) public void givenSvcTimeoutOf10000AndDefaultSettings__whenRemoteSvcExecuted_thenExpectHRE() throws InterruptedException { HystrixCommand.Setter config = HystrixCommand - .Setter - .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupTest3")); + .Setter + .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupTest3")); new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(10_000)).execute(); } @Test public void givenSvcTimeoutOf5000AndExecTimeoutOf10000_whenRemoteSvcExecuted_thenReturnSuccess() - throws InterruptedException { + throws InterruptedException { HystrixCommand.Setter config = HystrixCommand - .Setter - .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupTest4")); + .Setter + .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupTest4")); HystrixCommandProperties.Setter commandProperties = HystrixCommandProperties.Setter(); commandProperties.withExecutionTimeoutInMilliseconds(10_000); config.andCommandPropertiesDefaults(commandProperties); assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), - equalTo("Success")); + equalTo("Success")); } @Test(expected = HystrixRuntimeException.class) public void givenSvcTimeoutOf15000AndExecTimeoutOf5000__whenExecuted_thenExpectHRE() - throws InterruptedException { + throws InterruptedException { HystrixCommand.Setter config = HystrixCommand - .Setter - .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupTest5")); + .Setter + .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupTest5")); HystrixCommandProperties.Setter commandProperties = HystrixCommandProperties.Setter(); commandProperties.withExecutionTimeoutInMilliseconds(5_000); config.andCommandPropertiesDefaults(commandProperties); @@ -65,45 +65,45 @@ public class HystrixTimeoutIntegrationTest { @Test public void givenSvcTimeoutOf500AndExecTimeoutOf10000AndThreadPool__whenExecuted_thenReturnSuccess() - throws InterruptedException { + throws InterruptedException { HystrixCommand.Setter config = HystrixCommand - .Setter - .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupThreadPool")); + .Setter + .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupThreadPool")); HystrixCommandProperties.Setter commandProperties = HystrixCommandProperties.Setter(); commandProperties.withExecutionTimeoutInMilliseconds(10_000); config.andCommandPropertiesDefaults(commandProperties); config.andThreadPoolPropertiesDefaults(HystrixThreadPoolProperties.Setter() - .withMaxQueueSize(10) - .withCoreSize(3) - .withQueueSizeRejectionThreshold(10)); + .withMaxQueueSize(10) + .withCoreSize(3) + .withQueueSizeRejectionThreshold(10)); assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), - equalTo("Success")); + equalTo("Success")); } @Test public void givenCircuitBreakerSetup__whenRemoteSvcCmdExecuted_thenReturnSuccess() - throws InterruptedException { + throws InterruptedException { HystrixCommand.Setter config = HystrixCommand - .Setter - .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupCircuitBreaker")); + .Setter + .withGroupKey(HystrixCommandGroupKey.Factory.asKey("RemoteServiceGroupCircuitBreaker")); HystrixCommandProperties.Setter properties = HystrixCommandProperties.Setter(); properties.withExecutionTimeoutInMilliseconds(1000); properties.withCircuitBreakerSleepWindowInMilliseconds(4000); properties.withExecutionIsolationStrategy( - HystrixCommandProperties.ExecutionIsolationStrategy.THREAD); + HystrixCommandProperties.ExecutionIsolationStrategy.THREAD); properties.withCircuitBreakerEnabled(true); properties.withCircuitBreakerRequestVolumeThreshold(1); config.andCommandPropertiesDefaults(properties); config.andThreadPoolPropertiesDefaults(HystrixThreadPoolProperties.Setter() - .withMaxQueueSize(1) - .withCoreSize(1) - .withQueueSizeRejectionThreshold(1)); + .withMaxQueueSize(1) + .withCoreSize(1) + .withQueueSizeRejectionThreshold(1)); assertThat(this.invokeRemoteService(config, 10_000), equalTo(null)); assertThat(this.invokeRemoteService(config, 10_000), equalTo(null)); @@ -111,19 +111,19 @@ public class HystrixTimeoutIntegrationTest { Thread.sleep(5000); assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), - equalTo("Success")); + equalTo("Success")); assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), - equalTo("Success")); + equalTo("Success")); assertThat(new RemoteServiceTestCommand(config, new RemoteServiceTestSimulator(500)).execute(), - equalTo("Success")); + equalTo("Success")); } public String invokeRemoteService(HystrixCommand.Setter config, int timeout) - throws InterruptedException { + throws InterruptedException { String response = null; try { response = new RemoteServiceTestCommand(config, - new RemoteServiceTestSimulator(timeout)).execute(); + new RemoteServiceTestSimulator(timeout)).execute(); } catch (HystrixRuntimeException ex) { System.out.println("ex = " + ex); } diff --git a/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java deleted file mode 100644 index 400452c3fa..0000000000 --- a/spring-cucumber/src/test/java/com/baeldung/OtherDefsIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung; - -import cucumber.api.java.en.Given; -import cucumber.api.java.en.When; - -public class OtherDefsIntegrationTest extends SpringIntegrationTest { - @When("^the client calls /baeldung$") - public void the_client_issues_POST_hello() throws Throwable { - executePost("http://localhost:8082/baeldung"); - } - - @Given("^the client calls /hello$") - public void the_client_issues_GET_hello() throws Throwable { - executeGet("http://localhost:8082/hello"); - } -} \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java b/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java index 4c0125e9b4..0f5bcbb824 100644 --- a/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java +++ b/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java @@ -11,23 +11,19 @@ public class ResponseResults { private final ClientHttpResponse theResponse; private final String body; - protected ResponseResults(final ClientHttpResponse response) throws IOException { + ResponseResults(final ClientHttpResponse response) throws IOException { this.theResponse = response; final InputStream bodyInputStream = response.getBody(); - if (null == bodyInputStream) { - this.body = "{}"; - } else { - final StringWriter stringWriter = new StringWriter(); - IOUtils.copy(bodyInputStream, stringWriter); - this.body = stringWriter.toString(); - } + final StringWriter stringWriter = new StringWriter(); + IOUtils.copy(bodyInputStream, stringWriter); + this.body = stringWriter.toString(); } - protected ClientHttpResponse getTheResponse() { + ClientHttpResponse getTheResponse() { return theResponse; } - protected String getBody() { + String getBody() { return body; } } \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java index 159ff5dc21..9fbaeb348d 100644 --- a/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java @@ -1,9 +1,5 @@ package com.baeldung; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationContextLoader; @@ -12,20 +8,23 @@ import org.springframework.http.client.ClientHttpResponse; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.web.client.ResponseErrorHandler; -import org.springframework.web.client.ResponseExtractor; import org.springframework.web.client.RestTemplate; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + //@RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = SpringDemoApplication.class, loader = SpringApplicationContextLoader.class) @WebAppConfiguration @IntegrationTest public class SpringIntegrationTest { - protected static ResponseResults latestResponse = null; + static ResponseResults latestResponse = null; @Autowired protected RestTemplate restTemplate; - protected void executeGet(String url) throws IOException { + void executeGet(String url) throws IOException { final Map headers = new HashMap<>(); headers.put("Accept", "application/json"); final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers); @@ -39,10 +38,9 @@ public class SpringIntegrationTest { return (new ResponseResults(response)); } }); - } - protected void executePost(String url) throws IOException { + void executePost() throws IOException { final Map headers = new HashMap<>(); headers.put("Accept", "application/json"); final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers); @@ -53,14 +51,14 @@ public class SpringIntegrationTest { } restTemplate.setErrorHandler(errorHandler); - latestResponse = restTemplate.execute(url, HttpMethod.POST, requestCallback, response -> { - if (errorHandler.hadError) { - return (errorHandler.getResults()); - } else { - return (new ResponseResults(response)); - } - }); - + latestResponse = restTemplate + .execute("http://localhost:8082/baeldung", HttpMethod.POST, requestCallback, response -> { + if (errorHandler.hadError) { + return (errorHandler.getResults()); + } else { + return (new ResponseResults(response)); + } + }); } private class ResponseResultErrorHandler implements ResponseErrorHandler { diff --git a/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java index 42fb8a44ee..e1b6e370c7 100644 --- a/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java @@ -3,6 +3,7 @@ package com.baeldung; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import cucumber.api.java.en.Given; import org.springframework.http.HttpStatus; import cucumber.api.java.en.And; @@ -11,6 +12,16 @@ import cucumber.api.java.en.When; public class StepDefsIntegrationTest extends SpringIntegrationTest { + @When("^the client calls /baeldung$") + public void the_client_issues_POST_hello() throws Throwable { + executePost(); + } + + @Given("^the client calls /hello$") + public void the_client_issues_GET_hello() throws Throwable { + executeGet("http://localhost:8082/hello"); + } + @When("^the client calls /version$") public void the_client_issues_GET_version() throws Throwable { executeGet("http://localhost:8082/version"); From 3096362fa2e9c4d2d714eb9901b01f399476d9e3 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Thu, 19 Oct 2017 23:23:47 +0200 Subject: [PATCH 041/197] Premain fix (#2769) * Rest-assured fix * Cucumber fix * HystrixManualTest * Reformat HystrixTimeoutManualTest * Premain fix --- .../examples/asm/instrumentation/Premain.java | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java b/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java index 105d7227d5..a3e69b6785 100644 --- a/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java +++ b/asm/src/main/java/com/baeldung/examples/asm/instrumentation/Premain.java @@ -1,19 +1,32 @@ package com.baeldung.examples.asm.instrumentation; import com.baeldung.examples.asm.CustomClassWriter; - +import java.lang.instrument.ClassFileTransformer; +import java.lang.instrument.IllegalClassFormatException; import java.lang.instrument.Instrumentation; +import java.security.ProtectionDomain; +/** + * + * @author baeldung + */ public class Premain { public static void premain(String agentArgs, Instrumentation inst) { - inst.addTransformer((l, name, c, d, b) -> { + inst.addTransformer(new ClassFileTransformer() { - if (name.equals("java/lang/Integer")) { - CustomClassWriter cr = new CustomClassWriter(b); - return cr.addField(); + @Override + public byte[] transform(ClassLoader l, String name, Class c, + ProtectionDomain d, byte[] b) + throws IllegalClassFormatException { + + if (name.equals("java/lang/Integer")) { + CustomClassWriter cr = new CustomClassWriter(b); + return cr.addField(); + } + return b; } - return b; }); } + } From f92aa19c37532132c5951fc62bf03c760ee2bbee Mon Sep 17 00:00:00 2001 From: Sirish Renukumar Date: Fri, 20 Oct 2017 10:41:06 +0530 Subject: [PATCH 042/197] Mocking and verification of private methods using PowerMock (#2756) --- .../introduction/LuckyNumberGenerator.java | 27 ++++++++++ .../LuckyNumberGeneratorTest.java | 51 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java create mode 100644 mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java new file mode 100644 index 0000000000..7cb30b9fef --- /dev/null +++ b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java @@ -0,0 +1,27 @@ +package com.baeldung.powermockito.introduction; + +class LuckyNumberGenerator { + + public int getLuckyNumber(String name) { + + record(name); + + if (name == null) { + return getDefaultLuckyNumber(); + } + + return getLuckyNumber(name.length() + 1); + } + + private void record(String name) { + } + + private int getDefaultLuckyNumber() { + return 100; + } + + private int getLuckyNumber(int length) { + return length < 5 ? 5 : 10000; + } + +} diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java new file mode 100644 index 0000000000..a66df02a29 --- /dev/null +++ b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java @@ -0,0 +1,51 @@ +package com.baeldung.powermockito.introduction; + +import static org.junit.Assert.assertEquals; +import static org.powermock.api.mockito.PowerMockito.doReturn; +import static org.powermock.api.mockito.PowerMockito.spy; +import static org.powermock.api.mockito.PowerMockito.verifyPrivate; +import static org.powermock.api.mockito.PowerMockito.when; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentMatchers; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +@RunWith(PowerMockRunner.class) +@PrepareForTest(fullyQualifiedNames = "com.baeldung.powermockito.introduction.LuckyNumberGenerator") +public class LuckyNumberGeneratorTest { + + @Test + public final void givenPrivateMethodWithReturn_whenUsingPowerMockito_thenCorrect() throws Exception { + LuckyNumberGenerator mock = spy(new LuckyNumberGenerator()); + + when(mock, "getDefaultLuckyNumber").thenReturn(300); + + int result = mock.getLuckyNumber(null); + + assertEquals(300, result); + } + + @Test + public final void givenPrivateMethodWithArgumentAndReturn_whenUsingPowerMockito_thenCorrect() throws Exception { + LuckyNumberGenerator mock = spy(new LuckyNumberGenerator()); + + doReturn(1).when(mock, "getLuckyNumber", ArgumentMatchers.anyInt()); + + int result = mock.getLuckyNumber("Jack"); + + assertEquals(1, result); + } + + @Test + public final void givenPrivateMethodWithNoArgumentAndReturn_whenUsingPowerMockito_thenCorrect() throws Exception { + LuckyNumberGenerator mock = spy(new LuckyNumberGenerator()); + + int result = mock.getLuckyNumber("Tyranosorous"); + + verifyPrivate(mock).invoke("record", ArgumentMatchers.anyString()); + assertEquals(10000, result); + } + +} From 3d7a395b3723d283bc2e336265d1503b1b122693 Mon Sep 17 00:00:00 2001 From: Sergey Petunin Date: Fri, 20 Oct 2017 08:28:05 +0200 Subject: [PATCH 043/197] BAEL-1221: How Spring MVC Really Works (#2757) * BAEL-1221: How Spring MVC Really Works * BAEL-1221: Moved the project to the guest directory --- guest/spring-mvc/pom.xml | 59 +++++++++++++++++++ .../guest/springmvc/Spring5Application.java | 15 +++++ .../guest/springmvc/model/LoginData.java | 27 +++++++++ .../springmvc/web/InternalsController.java | 31 ++++++++++ .../src/main/resources/templates/failure.html | 10 ++++ .../src/main/resources/templates/login.html | 13 ++++ .../src/main/resources/templates/success.html | 10 ++++ 7 files changed, 165 insertions(+) create mode 100644 guest/spring-mvc/pom.xml create mode 100644 guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/Spring5Application.java create mode 100644 guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/model/LoginData.java create mode 100644 guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java create mode 100644 guest/spring-mvc/src/main/resources/templates/failure.html create mode 100644 guest/spring-mvc/src/main/resources/templates/login.html create mode 100644 guest/spring-mvc/src/main/resources/templates/success.html diff --git a/guest/spring-mvc/pom.xml b/guest/spring-mvc/pom.xml new file mode 100644 index 0000000000..9974a76e8a --- /dev/null +++ b/guest/spring-mvc/pom.xml @@ -0,0 +1,59 @@ + + + 4.0.0 + + com.forketyfork.guest + spring-mvc + 0.0.1-SNAPSHOT + jar + + spring-mvc + Spring MVC sample project + + + org.springframework.boot + spring-boot-starter-parent + 2.0.0.M5 + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + UTF-8 + UTF-8 + 1.8 + + + diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/Spring5Application.java b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/Spring5Application.java new file mode 100644 index 0000000000..d9af7c8ac9 --- /dev/null +++ b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/Spring5Application.java @@ -0,0 +1,15 @@ +package com.forketyfork.guest.springmvc; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.boot.SpringApplication; + +@SpringBootApplication +@ComponentScan(basePackages = {"com.forketyfork.guest.springmvc"}) +public class Spring5Application { + + public static void main(String[] args) { + SpringApplication.run(Spring5Application.class, args); + } + +} diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/model/LoginData.java b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/model/LoginData.java new file mode 100644 index 0000000000..a9140da4f9 --- /dev/null +++ b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/model/LoginData.java @@ -0,0 +1,27 @@ +package com.forketyfork.guest.springmvc.model; + +public class LoginData { + + private String login; + + private String password; + + public LoginData() { + } + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java new file mode 100644 index 0000000000..c39da4e3e5 --- /dev/null +++ b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java @@ -0,0 +1,31 @@ +package com.forketyfork.guest.springmvc.web; + +import com.forketyfork.guest.springmvc.model.LoginData; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.servlet.ModelAndView; + +import java.util.Collections; + +@Controller +public class InternalsController { + + private static final String LOGIN = "jack"; + private static final String PASSWORD = "halloween"; + + @GetMapping("/") + public String hello() { + return "login"; + } + + @PostMapping("/login") + public ModelAndView login(LoginData loginData) { + if (LOGIN.equals(loginData.getLogin()) && PASSWORD.equals(loginData.getPassword())) { + return new ModelAndView("success", Collections.singletonMap("login", loginData.getLogin())); + } else { + return new ModelAndView("failure", Collections.singletonMap("login", loginData.getLogin())); + } + } + +} diff --git a/guest/spring-mvc/src/main/resources/templates/failure.html b/guest/spring-mvc/src/main/resources/templates/failure.html new file mode 100644 index 0000000000..f319652ede --- /dev/null +++ b/guest/spring-mvc/src/main/resources/templates/failure.html @@ -0,0 +1,10 @@ + + + + Login Failure + +

    + User with login not found, please try again. +

    + \ No newline at end of file diff --git a/guest/spring-mvc/src/main/resources/templates/login.html b/guest/spring-mvc/src/main/resources/templates/login.html new file mode 100644 index 0000000000..d031ac8825 --- /dev/null +++ b/guest/spring-mvc/src/main/resources/templates/login.html @@ -0,0 +1,13 @@ + + +Login Form + + +
    + + + +
    + + + \ No newline at end of file diff --git a/guest/spring-mvc/src/main/resources/templates/success.html b/guest/spring-mvc/src/main/resources/templates/success.html new file mode 100644 index 0000000000..6966385f2e --- /dev/null +++ b/guest/spring-mvc/src/main/resources/templates/success.html @@ -0,0 +1,10 @@ + + + + Login Success + +

    + Hello, ! +

    + \ No newline at end of file From f5a6fc886ea6dc56f881ddde47fc2c436e956785 Mon Sep 17 00:00:00 2001 From: Sirish Renukumar Date: Fri, 20 Oct 2017 22:38:42 +0530 Subject: [PATCH 044/197] Updated to make the code simpler to understand for PowerMock usage (#2772) --- .../powermockito/introduction/LuckyNumberGenerator.java | 9 +++++---- .../introduction/LuckyNumberGeneratorTest.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java index 7cb30b9fef..cfe406c112 100644 --- a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java +++ b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGenerator.java @@ -4,23 +4,24 @@ class LuckyNumberGenerator { public int getLuckyNumber(String name) { - record(name); + saveIntoDatabase(name); if (name == null) { return getDefaultLuckyNumber(); } - return getLuckyNumber(name.length() + 1); + return getComputedLuckyNumber(name.length()); } - private void record(String name) { + private void saveIntoDatabase(String name) { + // Save the name into the database } private int getDefaultLuckyNumber() { return 100; } - private int getLuckyNumber(int length) { + private int getComputedLuckyNumber(int length) { return length < 5 ? 5 : 10000; } diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java index a66df02a29..2836bcd317 100644 --- a/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java +++ b/mockito/src/test/java/com/baeldung/powermockito/introduction/LuckyNumberGeneratorTest.java @@ -31,7 +31,7 @@ public class LuckyNumberGeneratorTest { public final void givenPrivateMethodWithArgumentAndReturn_whenUsingPowerMockito_thenCorrect() throws Exception { LuckyNumberGenerator mock = spy(new LuckyNumberGenerator()); - doReturn(1).when(mock, "getLuckyNumber", ArgumentMatchers.anyInt()); + doReturn(1).when(mock, "getComputedLuckyNumber", ArgumentMatchers.anyInt()); int result = mock.getLuckyNumber("Jack"); @@ -44,7 +44,7 @@ public class LuckyNumberGeneratorTest { int result = mock.getLuckyNumber("Tyranosorous"); - verifyPrivate(mock).invoke("record", ArgumentMatchers.anyString()); + verifyPrivate(mock).invoke("saveIntoDatabase", ArgumentMatchers.anyString()); assertEquals(10000, result); } From 1d5b17ad6c0c042d3c40e642e4ef8fa95eb8452b Mon Sep 17 00:00:00 2001 From: ramansahasi Date: Sat, 21 Oct 2017 00:19:48 +0530 Subject: [PATCH 045/197] BAEL-1210 Guide to the Static Keyword in Java (#2767) * Adding Source Files * Guide to the Static Keyword in Java - Test files --- .../java/com/baeldung/staticdemo/Car.java | 48 +++++++++++++++++++ .../com/baeldung/staticdemo/Singleton.java | 13 +++++ .../com/baeldung/staticdemo/StaticBlock.java | 28 +++++++++++ .../staticdemo/CarIntegrationTest.java | 14 ++++++ .../staticdemo/SingletonIntegrationTest.java | 15 ++++++ .../StaticBlockIntegrationTest.java | 17 +++++++ 6 files changed, 135 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/staticdemo/Car.java create mode 100644 core-java/src/main/java/com/baeldung/staticdemo/Singleton.java create mode 100644 core-java/src/main/java/com/baeldung/staticdemo/StaticBlock.java create mode 100644 core-java/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java create mode 100644 core-java/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java create mode 100644 core-java/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java diff --git a/core-java/src/main/java/com/baeldung/staticdemo/Car.java b/core-java/src/main/java/com/baeldung/staticdemo/Car.java new file mode 100644 index 0000000000..cdb3806c35 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/staticdemo/Car.java @@ -0,0 +1,48 @@ +package com.baeldung.staticdemo; + +/** + * This class demonstrates the use of static fields and static methods + * the instance variables engine and displacement are distinct for + * each and every object whereas static/class variable numberOfCars + * is unique and is shared across all objects of this class. + * + * @author baeldung + * + */ +public class Car { + private String name; + private String engine; + + public static int numberOfCars; + + public Car(String name, String engine) { + this.name = name; + this.engine = engine; + numberOfCars++; + } + + //getters and setters + public static int getNumberOfCars() { + return numberOfCars; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEngine() { + return engine; + } + + public void setEngine(String engine) { + this.engine = engine; + } + + public static void setNumberOfCars(int numberOfCars) { + Car.numberOfCars = numberOfCars; + } +} diff --git a/core-java/src/main/java/com/baeldung/staticdemo/Singleton.java b/core-java/src/main/java/com/baeldung/staticdemo/Singleton.java new file mode 100644 index 0000000000..de75af9d9d --- /dev/null +++ b/core-java/src/main/java/com/baeldung/staticdemo/Singleton.java @@ -0,0 +1,13 @@ +package com.baeldung.staticdemo; + +public class Singleton { + private Singleton() {} + + private static class SingletonHolder { + public static final Singleton instance = new Singleton(); + } + + public static Singleton getInstance() { + return SingletonHolder.instance; + } +} \ No newline at end of file diff --git a/core-java/src/main/java/com/baeldung/staticdemo/StaticBlock.java b/core-java/src/main/java/com/baeldung/staticdemo/StaticBlock.java new file mode 100644 index 0000000000..fde7afb090 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/staticdemo/StaticBlock.java @@ -0,0 +1,28 @@ +package com.baeldung.staticdemo; + +import java.util.LinkedList; +import java.util.List; + +public class StaticBlock { + private static List ranks = new LinkedList<>(); + + static { + ranks.add("Lieutenant"); + ranks.add("Captain"); + ranks.add("Major"); + } + + static { + ranks.add("Colonel"); + ranks.add("General"); + } + + //getters and setters + public static List getRanks() { + return ranks; + } + + public static void setRanks(List ranks) { + StaticBlock.ranks = ranks; + } +} diff --git a/core-java/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java b/core-java/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java new file mode 100644 index 0000000000..3150627269 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/staticdemo/CarIntegrationTest.java @@ -0,0 +1,14 @@ +package com.baeldung.staticdemo; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class CarIntegrationTest { + @Test + public void whenNumberOfCarObjectsInitialized_thenStaticCounterIncreases() { + new Car("Jaguar", "V8"); + new Car("Bugatti", "W16"); + assertEquals(2, Car.numberOfCars); + } +} diff --git a/core-java/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java b/core-java/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java new file mode 100644 index 0000000000..28d864073a --- /dev/null +++ b/core-java/src/test/java/com/baeldung/staticdemo/SingletonIntegrationTest.java @@ -0,0 +1,15 @@ +package com.baeldung.staticdemo; + +import org.junit.Assert; +import org.junit.Test; + +public class SingletonIntegrationTest { + + @Test + public void givenStaticInnerClass_whenMultipleTimesInstanceCalled_thenOnlyOneTimeInitialized() { + Singleton object1 = Singleton.getInstance(); + Singleton object2 = Singleton.getInstance(); + + Assert.assertSame(object1, object2); + } +} diff --git a/core-java/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java b/core-java/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java new file mode 100644 index 0000000000..f98e3e14db --- /dev/null +++ b/core-java/src/test/java/com/baeldung/staticdemo/StaticBlockIntegrationTest.java @@ -0,0 +1,17 @@ +package com.baeldung.staticdemo; + +import static org.hamcrest.collection.IsIterableContainingInOrder.contains; +import static org.junit.Assert.assertThat; + +import java.util.List; + +import org.junit.Test; + +public class StaticBlockIntegrationTest { + + @Test + public void whenAddedListElementsThroughStaticBlock_thenEnsureCorrectOrder() { + List actualList = StaticBlock.getRanks(); + assertThat(actualList, contains("Lieutenant", "Captain", "Major", "Colonel", "General")); + } +} From b3737dd2274f6d0796b5b8b0a57985aec63d33c7 Mon Sep 17 00:00:00 2001 From: aietcn Date: Sat, 21 Oct 2017 13:53:44 +0800 Subject: [PATCH 046/197] BAEL-1064 extract collectors and update micrometer dependency version (#2773) --- metrics/pom.xml | 2 +- .../micrometer/MicrometerAtlasTest.java | 79 ++++++------------- 2 files changed, 26 insertions(+), 55 deletions(-) diff --git a/metrics/pom.xml b/metrics/pom.xml index 926b6a95c5..25ce452d7a 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -16,7 +16,7 @@ 3.1.2 3.1.0 0.12.17 - 1.0.0-rc.2 + 0.12.0.RELEASE 2.0.0.M5 diff --git a/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java b/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java index b2eb0ee7dc..4c95165139 100644 --- a/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java +++ b/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java @@ -16,6 +16,7 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import static io.micrometer.core.instrument.Meter.Type; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.collection.IsMapContaining.hasEntry; import static org.hamcrest.core.IsCollectionContaining.hasItems; @@ -27,7 +28,7 @@ import static org.junit.Assert.assertTrue; */ public class MicrometerAtlasTest { - AtlasConfig atlasConfig; + private AtlasConfig atlasConfig; @Before public void init() { @@ -208,27 +209,7 @@ public class MicrometerAtlasTest { timer.record(8, TimeUnit.SECONDS); timer.record(13, TimeUnit.SECONDS); - List quantileGauges = registry - .getMeters() - .stream() - .filter(meter -> meter - .getType() - .name() - .equals("Gauge")) - .map(meter -> (Gauge) meter) - .collect(Collectors.toList()); - assert (3 == quantileGauges.size()); - - Map quantileMap = quantileGauges - .stream() - .collect(Collectors.toMap(gauge -> { - Tag tag = gauge - .getId() - .getTags() - .iterator() - .next(); - return tag.getKey() + "=" + tag.getValue(); - }, gauge -> (int) (gauge.value() / 1e9))); + Map quantileMap = extractTagValueMap(registry, Type.Gauge, 1e9); assertThat(quantileMap.keySet(), hasItems("quantile=0.3", "quantile=0.5", "quantile=0.95")); assertThat(quantileMap.get("quantile=0.3"), is(2)); @@ -236,6 +217,25 @@ public class MicrometerAtlasTest { assertThat(quantileMap.get("quantile=0.95"), is(8)); } + private Map extractTagValueMap(MeterRegistry registry, Type meterType, double valueDivisor) { + return registry + .getMeters() + .stream() + .filter(meter -> meter.getType() == meterType) + .collect(Collectors.toMap(meter -> { + Tag tag = meter + .getId() + .getTags() + .iterator() + .next(); + return tag.getKey() + "=" + tag.getValue(); + }, meter -> (int) (meter + .measure() + .iterator() + .next() + .getValue() / valueDivisor))); + } + @Test public void givenDistributionSummary_whenEnrichWithHistograms_thenDataAggregated() { SimpleMeterRegistry registry = new SimpleMeterRegistry(); @@ -243,6 +243,7 @@ public class MicrometerAtlasTest { .builder("summary") .histogram(Histogram.linear(0, 10, 5)) .register(registry); + hist.record(3); hist.record(8); hist.record(20); @@ -250,22 +251,7 @@ public class MicrometerAtlasTest { hist.record(13); hist.record(26); - Map histograms = registry - .getMeters() - .stream() - .filter(meter -> meter.getType() == Meter.Type.Counter) - .collect(Collectors.toMap(counter -> { - Tag tag = counter - .getId() - .getTags() - .iterator() - .next(); - return tag.getKey() + "=" + tag.getValue(); - }, counter -> (int) counter - .measure() - .iterator() - .next() - .getValue())); + Map histograms = extractTagValueMap(registry, Type.Counter, 1.0); assertThat(histograms, allOf(hasEntry("bucket=0.0", 0), hasEntry("bucket=10.0", 2), hasEntry("bucket=20.0", 2), hasEntry("bucket=30.0", 1), hasEntry("bucket=40.0", 1), hasEntry("bucket=Infinity", 0))); } @@ -284,22 +270,7 @@ public class MicrometerAtlasTest { timer.record(341, TimeUnit.MILLISECONDS); timer.record(500, TimeUnit.MILLISECONDS); - Map histograms = registry - .getMeters() - .stream() - .filter(meter -> meter.getType() == Meter.Type.Counter) - .collect(Collectors.toMap(counter -> { - Tag tag = counter - .getId() - .getTags() - .iterator() - .next(); - return tag.getKey() + "=" + tag.getValue(); - }, counter -> (int) counter - .measure() - .iterator() - .next() - .getValue())); + Map histograms = extractTagValueMap(registry, Type.Counter, 1.0); assertThat(histograms, allOf(hasEntry("bucket=0.0", 0), hasEntry("bucket=2.0E8", 1), hasEntry("bucket=4.0E8", 1), hasEntry("bucket=Infinity", 3))); From 4dc4195da1e59f47b73317920b18136012f0ba95 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:19:57 +0600 Subject: [PATCH 047/197] Create README.md (#2774) --- animal-sniffer-mvn-plugin/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 animal-sniffer-mvn-plugin/README.md diff --git a/animal-sniffer-mvn-plugin/README.md b/animal-sniffer-mvn-plugin/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/animal-sniffer-mvn-plugin/README.md @@ -0,0 +1 @@ +## Relevant articles: From a70ce1fd1a3ffcd847f194cbca28ceddddd18e4d Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:20:16 +0600 Subject: [PATCH 048/197] Create README.md (#2783) --- gradle/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 gradle/README.md diff --git a/gradle/README.md b/gradle/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/gradle/README.md @@ -0,0 +1 @@ +## Relevant articles: From 8804719091e22532533a4ee643e6cebabb83d61c Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:21:39 +0600 Subject: [PATCH 049/197] Create README.md (#2775) --- apache-cayenne/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 apache-cayenne/README.md diff --git a/apache-cayenne/README.md b/apache-cayenne/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/apache-cayenne/README.md @@ -0,0 +1 @@ +## Relevant articles: From bf96fe0b2ff822de5662b0800fdfa52b3d0da609 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:21:52 +0600 Subject: [PATCH 050/197] Create README.md (#2782) --- events/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 events/README.md diff --git a/events/README.md b/events/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/events/README.md @@ -0,0 +1 @@ +## Relevant articles: From dc7c7dfffec32950cf5e62d8112b4b24bdcafada Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:22:05 +0600 Subject: [PATCH 051/197] Create README.md (#2781) --- enterprise-patterns/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 enterprise-patterns/README.md diff --git a/enterprise-patterns/README.md b/enterprise-patterns/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/enterprise-patterns/README.md @@ -0,0 +1 @@ +## Relevant articles: From 1f657c161def60523d0d9bd10a879d79065f142c Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:22:31 +0600 Subject: [PATCH 052/197] Create README.md (#2780) --- eclipse/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 eclipse/README.md diff --git a/eclipse/README.md b/eclipse/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/eclipse/README.md @@ -0,0 +1 @@ +## Relevant articles: From 3604b08339942ed821e7dbbffe6a3eca45a29988 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:22:50 +0600 Subject: [PATCH 053/197] Create README.md (#2776) --- asm/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 asm/README.md diff --git a/asm/README.md b/asm/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/asm/README.md @@ -0,0 +1 @@ +## Relevant articles: From d51beefdb85f161a7ce98726e6cd2016ff2d2523 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:26:12 +0600 Subject: [PATCH 054/197] Create README.md (#2784) --- graphql/graphql-java/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 graphql/graphql-java/README.md diff --git a/graphql/graphql-java/README.md b/graphql/graphql-java/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/graphql/graphql-java/README.md @@ -0,0 +1 @@ +## Relevant articles: From 9ebebb5d5dc1764147e6ce46e001aad500c6c20f Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:26:32 +0600 Subject: [PATCH 055/197] Create README.md (#2778) --- cas-secured-app/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 cas-secured-app/README.md diff --git a/cas-secured-app/README.md b/cas-secured-app/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/cas-secured-app/README.md @@ -0,0 +1 @@ +## Relevant articles: From 80dfa932e819c8dc8f5c208bee39346244a2d37b Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:26:49 +0600 Subject: [PATCH 056/197] Create README.md (#2777) --- atomix/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 atomix/README.md diff --git a/atomix/README.md b/atomix/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/atomix/README.md @@ -0,0 +1 @@ +## Relevant articles: From 9e5ecb46c2d932434cd60d2301373881ada95148 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:27:23 +0600 Subject: [PATCH 057/197] Create README.md (#2779) --- deltaspike/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 deltaspike/README.md diff --git a/deltaspike/README.md b/deltaspike/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/deltaspike/README.md @@ -0,0 +1 @@ +## Relevant articles: From cff26c31d5104f9bb195dc9535893a8b41bb9eb9 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 20:27:49 +0600 Subject: [PATCH 058/197] Create README.md (#2785) --- guest/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 guest/README.md diff --git a/guest/README.md b/guest/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/guest/README.md @@ -0,0 +1 @@ +## Relevant articles: From a0692ce406a617d9e9bb9356ea568d3d2e2cb039 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 21:05:03 +0600 Subject: [PATCH 059/197] Create README.md (#2786) --- hibernate5/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 hibernate5/README.md diff --git a/hibernate5/README.md b/hibernate5/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/hibernate5/README.md @@ -0,0 +1 @@ +## Relevant articles: From 7b7cd24b1a4577a8a4df0465b8a241b785e5469e Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 21:05:11 +0600 Subject: [PATCH 060/197] Create README.md (#2788) --- jhipster/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 jhipster/README.md diff --git a/jhipster/README.md b/jhipster/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/jhipster/README.md @@ -0,0 +1 @@ +## Relevant articles: From f321fd5de07421c851fcdac155d18c00df0466ac Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 21:05:21 +0600 Subject: [PATCH 061/197] Create README.md (#2787) --- intelliJ/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 intelliJ/README.md diff --git a/intelliJ/README.md b/intelliJ/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/intelliJ/README.md @@ -0,0 +1 @@ +## Relevant articles: From 96848c2165fba59991e6f9a2b712512facf1053b Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:32:38 +0600 Subject: [PATCH 062/197] Create README.md (#2789) --- jmh/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 jmh/README.md diff --git a/jmh/README.md b/jmh/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/jmh/README.md @@ -0,0 +1 @@ +## Relevant articles: From 5c418bdc856265c58eaf3850c4ca74684eab184d Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:32:46 +0600 Subject: [PATCH 063/197] Create README.md (#2790) --- jooby/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 jooby/README.md diff --git a/jooby/README.md b/jooby/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/jooby/README.md @@ -0,0 +1 @@ +## Relevant articles: From 107e7004f0cb8d773cfd1a4761f527fec06085dd Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:32:55 +0600 Subject: [PATCH 064/197] Create README.md (#2791) --- json-path/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 json-path/README.md diff --git a/json-path/README.md b/json-path/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/json-path/README.md @@ -0,0 +1 @@ +## Relevant articles: From 4551fe08817bca5287beb92369a4aa6d695f6a25 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:33:05 +0600 Subject: [PATCH 065/197] Create README.md (#2792) --- linkrest/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 linkrest/README.md diff --git a/linkrest/README.md b/linkrest/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/linkrest/README.md @@ -0,0 +1 @@ +## Relevant articles: From ae7c5a62d76a3c9e04d31b3aba0446b800b7328d Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:33:14 +0600 Subject: [PATCH 066/197] Create README.md (#2793) --- mocks/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 mocks/README.md diff --git a/mocks/README.md b/mocks/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/mocks/README.md @@ -0,0 +1 @@ +## Relevant articles: From beed6b0faf060ae88d5c78c6e6f9fcef16964070 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:33:22 +0600 Subject: [PATCH 067/197] Create README.md (#2794) --- mockserver/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 mockserver/README.md diff --git a/mockserver/README.md b/mockserver/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/mockserver/README.md @@ -0,0 +1 @@ +## Relevant articles: From d233563c9a6fc144f8e38cac960529b4c5f8c3b7 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:33:32 +0600 Subject: [PATCH 068/197] Create README.md (#2796) --- parent-boot-5/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 parent-boot-5/README.md diff --git a/parent-boot-5/README.md b/parent-boot-5/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/parent-boot-5/README.md @@ -0,0 +1 @@ +## Relevant articles: From 67a2152ffa48b9175d937115dcd98ad2622d50ab Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:33:41 +0600 Subject: [PATCH 069/197] Create README.md (#2797) --- rest-with-spark-java/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 rest-with-spark-java/README.md diff --git a/rest-with-spark-java/README.md b/rest-with-spark-java/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/rest-with-spark-java/README.md @@ -0,0 +1 @@ +## Relevant articles: From 2783ba0c6f6605b238f1cde9bb392e2f4ca212e3 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:33:55 +0600 Subject: [PATCH 070/197] Create README.md (#2799) --- rule-engines/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 rule-engines/README.md diff --git a/rule-engines/README.md b/rule-engines/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/rule-engines/README.md @@ -0,0 +1 @@ +## Relevant articles: From 0c6d6905b5abe2fb4ff5c6d2e6f3d7f3bef55261 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:34:07 +0600 Subject: [PATCH 071/197] Create README.md (#2798) --- rmi/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 rmi/README.md diff --git a/rmi/README.md b/rmi/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/rmi/README.md @@ -0,0 +1 @@ +## Relevant articles: From 3c2456ff78f0a82d5a5270d56d5f9c052d5b826d Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:34:18 +0600 Subject: [PATCH 072/197] Create README.md (#2800) --- saas/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 saas/README.md diff --git a/saas/README.md b/saas/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/saas/README.md @@ -0,0 +1 @@ +## Relevant articles: From 2f02e3fc0712307c97b3c6ad4ad10453e881e507 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:34:29 +0600 Subject: [PATCH 073/197] Create README.md (#2801) --- spring-drools/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 spring-drools/README.md diff --git a/spring-drools/README.md b/spring-drools/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/spring-drools/README.md @@ -0,0 +1 @@ +## Relevant articles: From e4e2a4ce30daf58b2ce95f5f03cb0983bfc1ea85 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:34:37 +0600 Subject: [PATCH 074/197] Create README.md (#2802) --- spring-groovy/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 spring-groovy/README.md diff --git a/spring-groovy/README.md b/spring-groovy/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/spring-groovy/README.md @@ -0,0 +1 @@ +## Relevant articles: From edf49692eda7e9a3df372f8977a976288dfe4472 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:34:46 +0600 Subject: [PATCH 075/197] Create README.md (#2803) --- spring-mustache/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 spring-mustache/README.md diff --git a/spring-mustache/README.md b/spring-mustache/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/spring-mustache/README.md @@ -0,0 +1 @@ +## Relevant articles: From b2661141e1be5e8458bef211e5a3c21e584f707d Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:35:05 +0600 Subject: [PATCH 076/197] Create README.md (#2795) --- parent-boot-4/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 parent-boot-4/README.md diff --git a/parent-boot-4/README.md b/parent-boot-4/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/parent-boot-4/README.md @@ -0,0 +1 @@ +## Relevant articles: From 3ff7507ec51bff9da893a54aed618ba4578fd849 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:35:28 +0600 Subject: [PATCH 077/197] Create README.md (#2804) --- spring-mybatis/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 spring-mybatis/README.md diff --git a/spring-mybatis/README.md b/spring-mybatis/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/spring-mybatis/README.md @@ -0,0 +1 @@ +## Relevant articles: From 5680886939570b10411e918f65a21865fb7da836 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:54:31 +0600 Subject: [PATCH 078/197] Create README.md (#2805) --- spring-rest-simple/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 spring-rest-simple/README.md diff --git a/spring-rest-simple/README.md b/spring-rest-simple/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/spring-rest-simple/README.md @@ -0,0 +1 @@ +## Relevant articles: From 0b0757d0ee2b45b66cae8c5bf6f94341ce561121 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sat, 21 Oct 2017 23:54:40 +0600 Subject: [PATCH 079/197] Create README.md (#2806) --- vaadin/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 vaadin/README.md diff --git a/vaadin/README.md b/vaadin/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/vaadin/README.md @@ -0,0 +1 @@ +## Relevant articles: From d0862d2804478b6c2b958dc4db51f40d08091642 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Sun, 22 Oct 2017 00:05:26 +0600 Subject: [PATCH 080/197] Create README.md (#2807) --- video-tutorials/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 video-tutorials/README.md diff --git a/video-tutorials/README.md b/video-tutorials/README.md new file mode 100644 index 0000000000..ff12555376 --- /dev/null +++ b/video-tutorials/README.md @@ -0,0 +1 @@ +## Relevant articles: From 0b19939bcdf743da913e1374420bc5c03c0568b5 Mon Sep 17 00:00:00 2001 From: felipeazv Date: Sat, 21 Oct 2017 20:20:51 +0200 Subject: [PATCH 081/197] BAEL-803: Backward Chaining with Drools (#2741) * spring beans DI examples * fix-1: shortening examples * List of Rules Engines in Java * BAEL-812: Openl-Tablets example added * BAEL-812: artifacts names changed * BAEL-812: moving rule-engines examples to rule-engines folder * BAEL-812: removing evaluation article files * BAEL-812: folder renamed * BAEL-812: folder renamed * BAEL-812: pom.xml - parent added * BAEL-1027: Introduction to GraphQL - initial commit * BAEL-781: Explore the new Spring Cloud Gateway * BAEL-781: Fix UserService.java * BAEL-781: Fix user-service pom.xml * BAEL-781: remove eureka-server from the example * BAEL-781: modifying example * BAEL-803: Backward Chaining wih Drools * BAEL-803: pom.xml --- drools/backward-chaining/pom.xml | 38 ++++++++++++++++ .../com/baeldung/BackwardChainingBeatles.java | 28 ++++++++++++ .../main/java/com/baeldung/model/Beatle.java | 33 ++++++++++++++ .../src/main/resources/META-INF/kmodule.xml | 6 +++ .../resources/backward_chaining/Beatles.drl | 44 +++++++++++++++++++ 5 files changed, 149 insertions(+) create mode 100644 drools/backward-chaining/pom.xml create mode 100644 drools/backward-chaining/src/main/java/com/baeldung/BackwardChainingBeatles.java create mode 100644 drools/backward-chaining/src/main/java/com/baeldung/model/Beatle.java create mode 100644 drools/backward-chaining/src/main/resources/META-INF/kmodule.xml create mode 100644 drools/backward-chaining/src/main/resources/backward_chaining/Beatles.drl diff --git a/drools/backward-chaining/pom.xml b/drools/backward-chaining/pom.xml new file mode 100644 index 0000000000..bda0cf2abc --- /dev/null +++ b/drools/backward-chaining/pom.xml @@ -0,0 +1,38 @@ + + + + 4.0.0 + + drools-backward-chaining + 1.0 + drools-backward-chaining + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + 6.4.0.Final + + + + + org.kie + kie-api + ${runtime.version} + + + org.drools + drools-core + ${runtime.version} + + + org.drools + drools-decisiontables + ${runtime.version} + + + diff --git a/drools/backward-chaining/src/main/java/com/baeldung/BackwardChainingBeatles.java b/drools/backward-chaining/src/main/java/com/baeldung/BackwardChainingBeatles.java new file mode 100644 index 0000000000..7fc5bd3685 --- /dev/null +++ b/drools/backward-chaining/src/main/java/com/baeldung/BackwardChainingBeatles.java @@ -0,0 +1,28 @@ +package com.baeldung; + +import org.kie.api.KieServices; +import org.kie.api.runtime.KieContainer; +import org.kie.api.runtime.KieSession; + +import com.baeldung.model.Beatle; + +public class BackwardChainingBeatles { + public static void main(String[] args) { + + KieServices ks = KieServices.Factory.get(); + KieContainer kContainer = ks.getKieClasspathContainer(); + KieSession kSession = kContainer.newKieSession("ksession-backward-chaining"); + // drools session base on the xml configuration (kmodule.xml) + + // graph population + kSession.insert(new Beatle("Starr", "drums")); + kSession.insert(new Beatle("McCartney", "bass")); + kSession.insert(new Beatle("Lennon", "guitar")); + kSession.insert(new Beatle("Harrison", "guitar")); + + kSession.insert("Ringo"); // invoke the rule that calls the query implentation of backward chaining + kSession.fireAllRules(); // invoke all the rules + + } + +} \ No newline at end of file diff --git a/drools/backward-chaining/src/main/java/com/baeldung/model/Beatle.java b/drools/backward-chaining/src/main/java/com/baeldung/model/Beatle.java new file mode 100644 index 0000000000..4b219b3a69 --- /dev/null +++ b/drools/backward-chaining/src/main/java/com/baeldung/model/Beatle.java @@ -0,0 +1,33 @@ +package com.baeldung.model; + +import org.kie.api.definition.type.Position; + +public class Beatle { + + @Position(0) + private String lastName; + @Position(1) + private String instrument; + + public Beatle(String lastName, String instrument) { + this.lastName = lastName; + this.instrument = instrument; + } + + public String getInstrument() { + return instrument; + } + + public void setInstrument(String instrument) { + this.instrument = instrument; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + +} \ No newline at end of file diff --git a/drools/backward-chaining/src/main/resources/META-INF/kmodule.xml b/drools/backward-chaining/src/main/resources/META-INF/kmodule.xml new file mode 100644 index 0000000000..6498e26343 --- /dev/null +++ b/drools/backward-chaining/src/main/resources/META-INF/kmodule.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/drools/backward-chaining/src/main/resources/backward_chaining/Beatles.drl b/drools/backward-chaining/src/main/resources/backward_chaining/Beatles.drl new file mode 100644 index 0000000000..8d0d06a79e --- /dev/null +++ b/drools/backward-chaining/src/main/resources/backward_chaining/Beatles.drl @@ -0,0 +1,44 @@ +package com.baeldung + +import com.baeldung.model.Beatle; + + +query whichBeatle(String lastName, String instrument) + Beatle(lastName, instrument;) + or + (Beatle(lastName, null;) + and + whichBeatle(null, instrument;)) //recursive call to the function that allows to search in a derivation tree structure +end + +rule "Ringo" + when + String(this == "Ringo") + whichBeatle("Starr", "drums";) + then + System.out.println("The beatle is Ringo Starr"); +end + +rule "Paul" + when + String(this == "Paul") + whichBeatle("McCartney", "bass";) + then + System.out.println("The beatle is Paul McCartney"); +end + +rule "John" + when + String(this == "John") + whichBeatle("Lennon", "guitar";) + then + System.out.println("The beatle is John Lennon"); +end + +rule "George" + when + String(this == "George") + whichBeatle("Harrison", "guitar";) + then + System.out.println("The beatle is George Harrison"); +end From 71de9142f0310c3da7a47ed0e78a1f5b0b3b064a Mon Sep 17 00:00:00 2001 From: aietcn Date: Sun, 22 Oct 2017 11:31:45 +0800 Subject: [PATCH 082/197] BAEL-1064 opt assertions (#2810) --- .../baeldung/metrics/micrometer/MicrometerAtlasTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java b/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java index 4c95165139..826e06d598 100644 --- a/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java +++ b/metrics/src/test/java/com/baeldung/metrics/micrometer/MicrometerAtlasTest.java @@ -210,11 +210,7 @@ public class MicrometerAtlasTest { timer.record(13, TimeUnit.SECONDS); Map quantileMap = extractTagValueMap(registry, Type.Gauge, 1e9); - - assertThat(quantileMap.keySet(), hasItems("quantile=0.3", "quantile=0.5", "quantile=0.95")); - assertThat(quantileMap.get("quantile=0.3"), is(2)); - assertThat(quantileMap.get("quantile=0.5"), is(3)); - assertThat(quantileMap.get("quantile=0.95"), is(8)); + assertThat(quantileMap, allOf(hasEntry("quantile=0.3", 2), hasEntry("quantile=0.5", 3), hasEntry("quantile=0.95", 8))); } private Map extractTagValueMap(MeterRegistry registry, Type meterType, double valueDivisor) { From a7282d233bf78e694b914cdaa718949bdb919c1e Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 22 Oct 2017 14:17:45 +0200 Subject: [PATCH 083/197] Bubble sort fix (#2809) --- .../java/com/baeldung/algorithms/bubblesort/BubbleSort.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java b/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java index f5080efa40..a561072b2e 100644 --- a/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java @@ -19,11 +19,13 @@ public class BubbleSort { void optimizedBubbleSort(Integer[] arr) { int i = 0, n = arr.length; + boolean swapNeeded = true; while (i < n - 1 && swapNeeded) { swapNeeded = false; - for (int j = i + 1; j < n - i; j++) { + for (int j = 1; j < n - i; j++) { if (arr[j - 1] > arr[j]) { + int temp = arr[j - 1]; arr[j - 1] = arr[j]; arr[j] = temp; From e7252f61aa17853609a2e1d69915d1b4afadd689 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 22 Oct 2017 14:17:57 +0200 Subject: [PATCH 084/197] Update URIvsURLUnitTest.java (#2808) --- .../com/baeldung/javanetworking/uriurl/URIvsURLUnitTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core-java/src/test/java/com/baeldung/javanetworking/uriurl/URIvsURLUnitTest.java b/core-java/src/test/java/com/baeldung/javanetworking/uriurl/URIvsURLUnitTest.java index ed36951f73..8837dc5556 100644 --- a/core-java/src/test/java/com/baeldung/javanetworking/uriurl/URIvsURLUnitTest.java +++ b/core-java/src/test/java/com/baeldung/javanetworking/uriurl/URIvsURLUnitTest.java @@ -71,8 +71,5 @@ public class URIvsURLUnitTest { URL url = new URL("http://courses.baeldung.com"); String contents = IOUtils.toString(url.openStream()); - - assertTrue(contents.contains("")); - } - + } } From 3ed7609758e495d1786da228bb7eedac193854b9 Mon Sep 17 00:00:00 2001 From: Doha2012 Date: Sun, 22 Oct 2017 19:35:08 +0300 Subject: [PATCH 085/197] move security content from spring-security-rest-full (#2731) * move security content from spring-security-rest-full * swagger update --- spring-security-mvc-custom/README.md | 5 +- spring-security-mvc-custom/pom.xml | 37 ++++++++- .../java/org/baeldung/spring/MvcConfig.java | 14 ++++ .../web/controller/BankController.java | 1 - .../web/controller/FooController.java | 59 ++++++++++++++ .../main/java/org/baeldung/web/dto/Foo.java | 80 +++++++++++++++++++ .../web/interceptor/LoggerInterceptor.java | 0 .../interceptor/SessionTimerInterceptor.java | 0 .../web/interceptor/UserInterceptor.java | 0 .../src/main/resources/webSecurityConfig.xml | 4 + .../src/main/webapp/WEB-INF/view/csrfHome.jsp | 0 .../csrf/CsrfAbstractIntegrationTest.java | 6 +- .../csrf/CsrfDisabledIntegrationTest.java | 25 ++++++ .../csrf/CsrfEnabledIntegrationTest.java | 5 +- .../spring/SecurityWithCsrfConfig.java | 9 --- .../spring/SecurityWithoutCsrfConfig.java | 20 +---- .../LoggerInterceptorIntegrationTest.java | 10 +-- ...essionTimerInterceptorIntegrationTest.java | 16 ++-- .../UserInterceptorIntegrationTest.java | 16 ++-- spring-security-rest-full/.springBeans | 4 +- spring-security-rest-full/README.md | 7 -- spring-security-rest-full/pom.xml | 15 ---- .../persistence/service/impl/FooService.java | 3 +- .../java/org/baeldung/spring/WebConfig.java | 12 --- .../web/controller/RootController.java | 13 --- .../RestResponseEntityExceptionHandler.java | 8 -- .../src/main/resources/webSecurityConfig.xml | 40 ---------- .../src/test/java/org/baeldung/TestSuite.java | 2 - .../baeldung/security/SecurityTestSuite.java | 16 ---- .../csrf/CsrfDisabledIntegrationTest.java | 44 ---------- spring-security-rest/README.md | 3 + spring-security-rest/pom.xml | 2 +- .../baeldung/spring/SecurityJavaConfig.java | 12 ++- .../org/baeldung/spring/SwaggerConfig.java | 10 ++- .../web/controller/RootController.java | 30 +++++++ .../web/error/CustomAccessDeniedHandler.java | 0 .../RestResponseEntityExceptionHandler.java | 74 +++++++++++++++++ .../MyResourceNotFoundException.java | 21 +++++ .../src/main/resources/webSecurityConfig.xml | 11 +++ .../java/org/baeldung/web/FooLiveTest.java | 13 +-- .../org/baeldung/web/SwaggerLiveTest.java | 2 +- 41 files changed, 419 insertions(+), 230 deletions(-) rename {spring-security-rest-full => spring-security-mvc-custom}/src/main/java/org/baeldung/web/controller/BankController.java (97%) create mode 100644 spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/FooController.java create mode 100644 spring-security-mvc-custom/src/main/java/org/baeldung/web/dto/Foo.java rename {spring-security-rest-full => spring-security-mvc-custom}/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java (100%) rename {spring-security-rest-full => spring-security-mvc-custom}/src/main/java/org/baeldung/web/interceptor/SessionTimerInterceptor.java (100%) rename {spring-security-rest-full => spring-security-mvc-custom}/src/main/java/org/baeldung/web/interceptor/UserInterceptor.java (100%) rename {spring-security-rest-full => spring-security-mvc-custom}/src/main/webapp/WEB-INF/view/csrfHome.jsp (100%) rename {spring-security-rest-full => spring-security-mvc-custom}/src/test/java/org/baeldung/security/csrf/CsrfAbstractIntegrationTest.java (93%) create mode 100644 spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfDisabledIntegrationTest.java rename {spring-security-rest-full => spring-security-mvc-custom}/src/test/java/org/baeldung/security/csrf/CsrfEnabledIntegrationTest.java (90%) rename {spring-security-rest-full => spring-security-mvc-custom}/src/test/java/org/baeldung/security/spring/SecurityWithCsrfConfig.java (82%) rename {spring-security-rest-full/src/main => spring-security-mvc-custom/src/test}/java/org/baeldung/security/spring/SecurityWithoutCsrfConfig.java (72%) rename {spring-security-rest-full => spring-security-mvc-custom}/src/test/java/org/baeldung/web/interceptor/LoggerInterceptorIntegrationTest.java (83%) rename {spring-security-rest-full => spring-security-mvc-custom}/src/test/java/org/baeldung/web/interceptor/SessionTimerInterceptorIntegrationTest.java (78%) rename {spring-security-rest-full => spring-security-mvc-custom}/src/test/java/org/baeldung/web/interceptor/UserInterceptorIntegrationTest.java (84%) delete mode 100644 spring-security-rest-full/src/main/resources/webSecurityConfig.xml delete mode 100644 spring-security-rest-full/src/test/java/org/baeldung/security/SecurityTestSuite.java delete mode 100644 spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfDisabledIntegrationTest.java create mode 100644 spring-security-rest/src/main/java/org/baeldung/web/controller/RootController.java rename {spring-security-rest-full => spring-security-rest}/src/main/java/org/baeldung/web/error/CustomAccessDeniedHandler.java (100%) create mode 100644 spring-security-rest/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java create mode 100644 spring-security-rest/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java diff --git a/spring-security-mvc-custom/README.md b/spring-security-mvc-custom/README.md index 14bac6c454..2c0be4768e 100644 --- a/spring-security-mvc-custom/README.md +++ b/spring-security-mvc-custom/README.md @@ -8,7 +8,10 @@ The "REST With Spring" Classes: http://github.learnspringsecurity.com ### Relevant Articles: - [Spring Security Remember Me](http://www.baeldung.com/spring-security-remember-me) - [Redirect to different pages after Login with Spring Security](http://www.baeldung.com/spring_redirect_after_login) - +- [Changing Spring Model Parameters with Handler Interceptor](http://www.baeldung.com/spring-model-parameters-with-handler-interceptor) +- [Introduction to Spring MVC HandlerInterceptor](http://www.baeldung.com/spring-mvc-handlerinterceptor) +- [Using a Custom Spring MVC’s Handler Interceptor to Manage Sessions](http://www.baeldung.com/spring-mvc-custom-handler-interceptor) +- [A Guide to CSRF Protection in Spring Security](http://www.baeldung.com/spring-security-csrf) ### Build the Project ``` diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml index 4a7e9419cc..805792b795 100644 --- a/spring-security-mvc-custom/pom.xml +++ b/spring-security-mvc-custom/pom.xml @@ -113,6 +113,40 @@ + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + + com.google.guava + guava + ${guava.version} + + + + + + org.springframework + spring-test + ${org.springframework.version} + test + + + + org.springframework.security + spring-security-test + ${org.springframework.security.version} + test + @@ -174,7 +208,8 @@ 19.0 3.5 - + 2.9.1 + 4.5.2 4.4.5 diff --git a/spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java index 2229516633..3b97afc22d 100644 --- a/spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java +++ b/spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java @@ -1,9 +1,14 @@ package org.baeldung.spring; +import org.baeldung.web.interceptor.LoggerInterceptor; +import org.baeldung.web.interceptor.SessionTimerInterceptor; +import org.baeldung.web.interceptor.UserInterceptor; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.view.InternalResourceViewResolver; @@ -11,6 +16,7 @@ import org.springframework.web.servlet.view.JstlView; @EnableWebMvc @Configuration +@ComponentScan("org.baeldung.web.controller") public class MvcConfig extends WebMvcConfigurerAdapter { public MvcConfig() { @@ -28,6 +34,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter { registry.addViewController("/login.html"); registry.addViewController("/homepage.html"); registry.addViewController("/console.html"); + registry.addViewController("/csrfHome.html"); } @Bean @@ -40,4 +47,11 @@ public class MvcConfig extends WebMvcConfigurerAdapter { return bean; } + + @Override + public void addInterceptors(final InterceptorRegistry registry) { + registry.addInterceptor(new LoggerInterceptor()); + registry.addInterceptor(new UserInterceptor()); + registry.addInterceptor(new SessionTimerInterceptor()); + } } \ No newline at end of file diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/BankController.java b/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/BankController.java similarity index 97% rename from spring-security-rest-full/src/main/java/org/baeldung/web/controller/BankController.java rename to spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/BankController.java index e87d5f3dd4..1a4322c611 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/BankController.java +++ b/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/BankController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.ResponseStatus; // to test csrf @Controller -@RequestMapping(value = "/auth/") public class BankController { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/FooController.java b/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/FooController.java new file mode 100644 index 0000000000..5a3c85d220 --- /dev/null +++ b/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/FooController.java @@ -0,0 +1,59 @@ +package org.baeldung.web.controller; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; + +import java.util.Arrays; +import java.util.List; + +import javax.servlet.http.HttpServletResponse; + +import org.baeldung.web.dto.Foo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.util.UriComponentsBuilder; + +@Controller +@RequestMapping(value = "/auth/foos") +public class FooController { + + @Autowired + private ApplicationEventPublisher eventPublisher; + + public FooController() { + super(); + } + + // API + + // read - single + + @RequestMapping(value = "/{id}", method = RequestMethod.GET) + @ResponseBody + public Foo findById(@PathVariable("id") final Long id, final UriComponentsBuilder uriBuilder, final HttpServletResponse response) { + return new Foo(randomAlphabetic(6)); + } + + // read - multiple + + @RequestMapping(method = RequestMethod.GET) + @ResponseBody + public List findAll() { + return Arrays.asList(new Foo(randomAlphabetic(6))); + } + + // write - just for test + @RequestMapping(method = RequestMethod.POST) + @ResponseStatus(HttpStatus.CREATED) + @ResponseBody + public Foo create(@RequestBody final Foo foo) { + return foo; + } +} \ No newline at end of file diff --git a/spring-security-mvc-custom/src/main/java/org/baeldung/web/dto/Foo.java b/spring-security-mvc-custom/src/main/java/org/baeldung/web/dto/Foo.java new file mode 100644 index 0000000000..02283e7df9 --- /dev/null +++ b/spring-security-mvc-custom/src/main/java/org/baeldung/web/dto/Foo.java @@ -0,0 +1,80 @@ +package org.baeldung.web.dto; + +import java.io.Serializable; + +public class Foo implements Serializable { + + private long id; + + private String name; + + public Foo() { + super(); + } + + public Foo(final String name) { + super(); + + this.name = name; + } + + // API + + public long getId() { + return id; + } + + public void setId(final long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(final String name) { + this.name = name; + } + + // + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final Foo other = (Foo) obj; + if (name == null) { + if (other.name != null) { + return false; + } + } else if (!name.equals(other.name)) { + return false; + } + return true; + } + + @Override + public String toString() { + final StringBuilder builder = new StringBuilder(); + builder.append("Foo [name=") + .append(name) + .append("]"); + return builder.toString(); + } + +} \ No newline at end of file diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java b/spring-security-mvc-custom/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java rename to spring-security-mvc-custom/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/SessionTimerInterceptor.java b/spring-security-mvc-custom/src/main/java/org/baeldung/web/interceptor/SessionTimerInterceptor.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/SessionTimerInterceptor.java rename to spring-security-mvc-custom/src/main/java/org/baeldung/web/interceptor/SessionTimerInterceptor.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/UserInterceptor.java b/spring-security-mvc-custom/src/main/java/org/baeldung/web/interceptor/UserInterceptor.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/UserInterceptor.java rename to spring-security-mvc-custom/src/main/java/org/baeldung/web/interceptor/UserInterceptor.java diff --git a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml index f31f36655c..f2ecaba5c8 100644 --- a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml @@ -33,4 +33,8 @@ + + \ No newline at end of file diff --git a/spring-security-rest-full/src/main/webapp/WEB-INF/view/csrfHome.jsp b/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/csrfHome.jsp similarity index 100% rename from spring-security-rest-full/src/main/webapp/WEB-INF/view/csrfHome.jsp rename to spring-security-mvc-custom/src/main/webapp/WEB-INF/view/csrfHome.jsp diff --git a/spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfAbstractIntegrationTest.java b/spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfAbstractIntegrationTest.java similarity index 93% rename from spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfAbstractIntegrationTest.java rename to spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfAbstractIntegrationTest.java index 6e70f979c8..44424bf7f9 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfAbstractIntegrationTest.java +++ b/spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfAbstractIntegrationTest.java @@ -5,7 +5,7 @@ import static org.springframework.security.test.web.servlet.request.SecurityMock import javax.servlet.Filter; -import org.baeldung.persistence.model.Foo; +import org.baeldung.web.dto.Foo; import org.junit.Before; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -14,15 +14,15 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.RequestPostProcessor; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.WebApplicationContext; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; + + @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@Transactional public abstract class CsrfAbstractIntegrationTest { @Autowired diff --git a/spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfDisabledIntegrationTest.java b/spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfDisabledIntegrationTest.java new file mode 100644 index 0000000000..1d16e08514 --- /dev/null +++ b/spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfDisabledIntegrationTest.java @@ -0,0 +1,25 @@ +package org.baeldung.security.csrf; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.baeldung.security.spring.SecurityWithoutCsrfConfig; +import org.baeldung.spring.MvcConfig; +import org.junit.Test; +import org.springframework.http.MediaType; +import org.springframework.test.context.ContextConfiguration; + +@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, MvcConfig.class }) +public class CsrfDisabledIntegrationTest extends CsrfAbstractIntegrationTest { + + @Test + public void givenNotAuth_whenAddFoo_thenUnauthorized() throws Exception { + mvc.perform(post("/auth/foos").contentType(MediaType.APPLICATION_JSON).content(createFoo())).andExpect(status().isUnauthorized()); + } + + @Test + public void givenAuth_whenAddFoo_thenCreated() throws Exception { + mvc.perform(post("/auth/foos").contentType(MediaType.APPLICATION_JSON).content(createFoo()).with(testUser())).andExpect(status().isCreated()); + } + +} diff --git a/spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfEnabledIntegrationTest.java b/spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfEnabledIntegrationTest.java similarity index 90% rename from spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfEnabledIntegrationTest.java rename to spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfEnabledIntegrationTest.java index 939b745de8..9d882973bd 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfEnabledIntegrationTest.java +++ b/spring-security-mvc-custom/src/test/java/org/baeldung/security/csrf/CsrfEnabledIntegrationTest.java @@ -5,13 +5,12 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import org.baeldung.security.spring.SecurityWithCsrfConfig; -import org.baeldung.spring.PersistenceConfig; -import org.baeldung.spring.WebConfig; +import org.baeldung.spring.MvcConfig; import org.junit.Test; import org.springframework.http.MediaType; import org.springframework.test.context.ContextConfiguration; -@ContextConfiguration(classes = { SecurityWithCsrfConfig.class, PersistenceConfig.class, WebConfig.class }) +@ContextConfiguration(classes = { SecurityWithCsrfConfig.class, MvcConfig.class }) public class CsrfEnabledIntegrationTest extends CsrfAbstractIntegrationTest { @Test diff --git a/spring-security-rest-full/src/test/java/org/baeldung/security/spring/SecurityWithCsrfConfig.java b/spring-security-mvc-custom/src/test/java/org/baeldung/security/spring/SecurityWithCsrfConfig.java similarity index 82% rename from spring-security-rest-full/src/test/java/org/baeldung/security/spring/SecurityWithCsrfConfig.java rename to spring-security-mvc-custom/src/test/java/org/baeldung/security/spring/SecurityWithCsrfConfig.java index 97ae1f1dd2..9600977e37 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/security/spring/SecurityWithCsrfConfig.java +++ b/spring-security-mvc-custom/src/test/java/org/baeldung/security/spring/SecurityWithCsrfConfig.java @@ -1,8 +1,5 @@ package org.baeldung.security.spring; -import org.baeldung.web.error.CustomAccessDeniedHandler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; @@ -12,14 +9,10 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @Configuration -@EnableAutoConfiguration @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) public class SecurityWithCsrfConfig extends WebSecurityConfigurerAdapter { - @Autowired - private CustomAccessDeniedHandler accessDeniedHandler; - public SecurityWithCsrfConfig() { super(); } @@ -46,8 +39,6 @@ public class SecurityWithCsrfConfig extends WebSecurityConfigurerAdapter { .and() .httpBasic() .and() - .exceptionHandling().accessDeniedHandler(accessDeniedHandler) - .and() .headers().cacheControl().disable() ; // @formatter:on diff --git a/spring-security-rest-full/src/main/java/org/baeldung/security/spring/SecurityWithoutCsrfConfig.java b/spring-security-mvc-custom/src/test/java/org/baeldung/security/spring/SecurityWithoutCsrfConfig.java similarity index 72% rename from spring-security-rest-full/src/main/java/org/baeldung/security/spring/SecurityWithoutCsrfConfig.java rename to spring-security-mvc-custom/src/test/java/org/baeldung/security/spring/SecurityWithoutCsrfConfig.java index f1a78d1472..f7dbd5b42c 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/security/spring/SecurityWithoutCsrfConfig.java +++ b/spring-security-mvc-custom/src/test/java/org/baeldung/security/spring/SecurityWithoutCsrfConfig.java @@ -1,8 +1,5 @@ package org.baeldung.security.spring; -import org.baeldung.web.error.CustomAccessDeniedHandler; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; @@ -12,16 +9,10 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @Configuration -@EnableAutoConfiguration -// @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) -// @ImportResource({ "classpath:webSecurityConfig.xml" }) public class SecurityWithoutCsrfConfig extends WebSecurityConfigurerAdapter { - @Autowired - private CustomAccessDeniedHandler accessDeniedHandler; - public SecurityWithoutCsrfConfig() { super(); } @@ -42,18 +33,15 @@ public class SecurityWithoutCsrfConfig extends WebSecurityConfigurerAdapter { protected void configure(final HttpSecurity http) throws Exception { // @formatter:off http - .csrf().disable() .authorizeRequests() - .antMatchers("/auth/admin/*").hasRole("ADMIN") - .antMatchers("/auth/*").hasAnyRole("ADMIN","USER") - .antMatchers("/*").permitAll() + .antMatchers("/auth/admin/*").hasAnyRole("ROLE_ADMIN") + .anyRequest().authenticated() .and() .httpBasic() .and() - // .exceptionHandling().accessDeniedPage("/my-error-page") - .exceptionHandling().accessDeniedHandler(accessDeniedHandler) - .and() .headers().cacheControl().disable() + .and() + .csrf().disable() ; // @formatter:on } diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/LoggerInterceptorIntegrationTest.java b/spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/LoggerInterceptorIntegrationTest.java similarity index 83% rename from spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/LoggerInterceptorIntegrationTest.java rename to spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/LoggerInterceptorIntegrationTest.java index 44dc860e62..c33c9a04e8 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/LoggerInterceptorIntegrationTest.java +++ b/spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/LoggerInterceptorIntegrationTest.java @@ -4,8 +4,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import org.baeldung.security.spring.SecurityWithoutCsrfConfig; -import org.baeldung.spring.PersistenceConfig; -import org.baeldung.spring.WebConfig; +import org.baeldung.spring.MvcConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -16,13 +15,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.WebApplicationContext; @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@Transactional -@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, PersistenceConfig.class, WebConfig.class }) +@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, MvcConfig.class }) public class LoggerInterceptorIntegrationTest { @Autowired @@ -46,7 +43,8 @@ public class LoggerInterceptorIntegrationTest { */ @Test public void testInterceptors() throws Exception { - mockMvc.perform(get("/graph.html")).andExpect(status().isOk()); + mockMvc.perform(get("/login.html")) + .andExpect(status().isOk()); } } diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/SessionTimerInterceptorIntegrationTest.java b/spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/SessionTimerInterceptorIntegrationTest.java similarity index 78% rename from spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/SessionTimerInterceptorIntegrationTest.java rename to spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/SessionTimerInterceptorIntegrationTest.java index d62fab0670..bdc1be2c44 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/SessionTimerInterceptorIntegrationTest.java +++ b/spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/SessionTimerInterceptorIntegrationTest.java @@ -6,8 +6,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import javax.servlet.http.HttpSession; import org.baeldung.security.spring.SecurityWithoutCsrfConfig; -import org.baeldung.spring.PersistenceConfig; -import org.baeldung.spring.WebConfig; +import org.baeldung.spring.MvcConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -20,13 +19,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.WebApplicationContext; @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@Transactional -@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, PersistenceConfig.class, WebConfig.class }) +@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, MvcConfig.class }) @WithMockUser(username = "admin", roles = { "USER", "ADMIN" }) public class SessionTimerInterceptorIntegrationTest { @@ -47,9 +44,14 @@ public class SessionTimerInterceptorIntegrationTest { */ @Test public void testInterceptors() throws Exception { - HttpSession session = mockMvc.perform(get("/auth/admin")).andExpect(status().is2xxSuccessful()).andReturn().getRequest().getSession(); + HttpSession session = mockMvc.perform(get("/auth/foos")) + .andExpect(status().is2xxSuccessful()) + .andReturn() + .getRequest() + .getSession(); Thread.sleep(51000); - mockMvc.perform(get("/auth/admin").session((MockHttpSession) session)).andExpect(status().is2xxSuccessful()); + mockMvc.perform(get("/auth/foos").session((MockHttpSession) session)) + .andExpect(status().is2xxSuccessful()); } } diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/UserInterceptorIntegrationTest.java b/spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/UserInterceptorIntegrationTest.java similarity index 84% rename from spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/UserInterceptorIntegrationTest.java rename to spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/UserInterceptorIntegrationTest.java index f995f86145..a85fd999a6 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/UserInterceptorIntegrationTest.java +++ b/spring-security-mvc-custom/src/test/java/org/baeldung/web/interceptor/UserInterceptorIntegrationTest.java @@ -1,8 +1,10 @@ package org.baeldung.web.interceptor; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import org.baeldung.security.spring.SecurityWithoutCsrfConfig; -import org.baeldung.spring.PersistenceConfig; -import org.baeldung.spring.WebConfig; +import org.baeldung.spring.MvcConfig; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -14,16 +16,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.WebApplicationContext; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@Transactional -@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, PersistenceConfig.class, WebConfig.class }) +@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, MvcConfig.class }) @WithMockUser(username = "admin", roles = { "USER", "ADMIN" }) public class UserInterceptorIntegrationTest { @@ -46,7 +43,8 @@ public class UserInterceptorIntegrationTest { */ @Test public void testInterceptors() throws Exception { - mockMvc.perform(get("/auth/admin")).andExpect(status().is2xxSuccessful()); + mockMvc.perform(get("/auth/foos")) + .andExpect(status().is2xxSuccessful()); } } diff --git a/spring-security-rest-full/.springBeans b/spring-security-rest-full/.springBeans index f100c6afbe..b01040d91b 100644 --- a/spring-security-rest-full/.springBeans +++ b/spring-security-rest-full/.springBeans @@ -1,18 +1,16 @@ 1 - + - java:org.baeldung.security.spring.SecurityWithoutCsrfConfig src/main/webapp/WEB-INF/api-servlet.xml java:org.baeldung.spring.Application - java:org.baeldung.security.spring.SecurityWithCsrfConfig diff --git a/spring-security-rest-full/README.md b/spring-security-rest-full/README.md index d5bd8be52b..2737bd5465 100644 --- a/spring-security-rest-full/README.md +++ b/spring-security-rest-full/README.md @@ -8,12 +8,10 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring The "Learn Spring Security" Classes: http://github.learnspringsecurity.com ### Relevant Articles: -- [Spring Security Expressions - hasRole Example](http://www.baeldung.com/spring-security-expressions-basic) - [REST Pagination in Spring](http://www.baeldung.com/2012/01/18/rest-pagination-in-spring/) - [HATEOAS for a Spring REST Service](http://www.baeldung.com/2011/11/13/rest-service-discoverability-with-spring-part-5/) - [REST API Discoverability and HATEOAS](http://www.baeldung.com/2011/11/06/restful-web-service-discoverability-part-4/) - [ETags for REST with Spring](http://www.baeldung.com/2013/01/11/etags-for-rest-with-spring/) -- [Error Handling for REST with Spring 3](http://www.baeldung.com/2013/01/31/exception-handling-for-rest-with-spring-3-2/) - [Integration Testing with the Maven Cargo plugin](http://www.baeldung.com/2011/10/16/how-to-set-up-integration-testing-with-the-maven-cargo-plugin/) - [Introduction to Spring Data JPA](http://www.baeldung.com/2011/12/22/the-persistence-layer-with-spring-data-jpa/) - [Project Configuration with Spring](http://www.baeldung.com/2012/03/12/project-configuration-with-spring/) @@ -24,11 +22,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com - [Metrics for your Spring REST API](http://www.baeldung.com/spring-rest-api-metrics) - [REST Query Language with RSQL](http://www.baeldung.com/rest-api-search-language-rsql-fiql) - [Spring RestTemplate Tutorial](http://www.baeldung.com/rest-template) -- [A Guide to CSRF Protection in Spring Security](http://www.baeldung.com/spring-security-csrf) -- [Intro to Spring Security Expressions](http://www.baeldung.com/spring-security-expressions) -- [Changing Spring Model Parameters with Handler Interceptor](http://www.baeldung.com/spring-model-parameters-with-handler-interceptor) -- [Introduction to Spring MVC HandlerInterceptor](http://www.baeldung.com/spring-mvc-handlerinterceptor) -- [Using a Custom Spring MVC’s Handler Interceptor to Manage Sessions](http://www.baeldung.com/spring-mvc-custom-handler-interceptor) - [Bootstrap a Web Application with Spring 4](http://www.baeldung.com/bootstraping-a-web-application-with-spring-and-java-based-configuration) - [REST Query Language – Implementing OR Operation](http://www.baeldung.com/rest-api-query-search-or-operation) diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 2b559ddefc..12a611431e 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -38,17 +38,6 @@ provided - - - - org.springframework.security - spring-security-web - - - org.springframework.security - spring-security-config - - @@ -220,10 +209,6 @@ test - - org.springframework.security - spring-security-test - diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java index 49f9ec7e97..376082b2d5 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java @@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.PagingAndSortingRepository; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,6 +35,7 @@ public class FooService extends AbstractService implements IFooService { // custom methods + @Override public Foo retrieveByName(final String name) { return dao.retrieveByName(name); } @@ -44,7 +44,6 @@ public class FooService extends AbstractService implements IFooService { @Override @Transactional(readOnly = true) - @PreAuthorize("hasRole('ROLE_ADMIN')") public List findAll() { return Lists.newArrayList(getDao().findAll()); } diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java b/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java index efdb2bc8d4..86cb93175a 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java @@ -1,14 +1,10 @@ package org.baeldung.spring; -import org.baeldung.web.interceptor.LoggerInterceptor; -import org.baeldung.web.interceptor.SessionTimerInterceptor; -import org.baeldung.web.interceptor.UserInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.view.InternalResourceViewResolver; @@ -35,15 +31,7 @@ public class WebConfig extends WebMvcConfigurerAdapter { public void addViewControllers(final ViewControllerRegistry registry) { super.addViewControllers(registry); registry.addViewController("/graph.html"); - registry.addViewController("/csrfHome.html"); registry.addViewController("/homepage.html"); } - @Override - public void addInterceptors(final InterceptorRegistry registry) { - registry.addInterceptor(new LoggerInterceptor()); - registry.addInterceptor(new UserInterceptor()); - registry.addInterceptor(new SessionTimerInterceptor()); - } - } \ No newline at end of file diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/RootController.java b/spring-security-rest-full/src/main/java/org/baeldung/web/controller/RootController.java index 8b63275b66..e23da6420d 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/RootController.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/web/controller/RootController.java @@ -11,7 +11,6 @@ import org.baeldung.web.metric.IMetricService; import org.baeldung.web.util.LinkUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -53,7 +52,6 @@ public class RootController { return metricService.getFullMetric(); } - @PreAuthorize("hasRole('ROLE_ADMIN')") @RequestMapping(value = "/status-metric", method = RequestMethod.GET) @ResponseBody public Map getStatusMetric() { @@ -70,16 +68,5 @@ public class RootController { return result; } - @RequestMapping(value = "/admin/x", method = RequestMethod.GET) - @ResponseBody - public String sampleAdminPage() { - return "Hello"; - } - - @RequestMapping(value = "/my-error-page", method = RequestMethod.GET) - @ResponseBody - public String sampleErrorPage() { - return "Error Occurred"; - } } diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java b/spring-security-rest-full/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java index e9d34aa9cf..b593116c4a 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java @@ -11,13 +11,11 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageNotReadableException; -import org.springframework.security.access.AccessDeniedException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -//import org.springframework.security.access.AccessDeniedException; @ControllerAdvice public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionHandler { @@ -55,12 +53,6 @@ public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionH return handleExceptionInternal(ex, bodyOfResponse, headers, HttpStatus.BAD_REQUEST, request); } - // 403 - @ExceptionHandler({ AccessDeniedException.class }) - public ResponseEntity handleAccessDeniedException(final Exception ex, final WebRequest request) { - System.out.println("request" + request.getUserPrincipal()); - return new ResponseEntity("Access denied message here", new HttpHeaders(), HttpStatus.FORBIDDEN); - } // 404 diff --git a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml deleted file mode 100644 index be6b4d0c27..0000000000 --- a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-security-rest-full/src/test/java/org/baeldung/TestSuite.java b/spring-security-rest-full/src/test/java/org/baeldung/TestSuite.java index 52e3607b12..cd5fa4661f 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/TestSuite.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/TestSuite.java @@ -1,7 +1,6 @@ package org.baeldung; import org.baeldung.persistence.PersistenceTestSuite; -import org.baeldung.security.SecurityTestSuite; import org.baeldung.web.LiveTestSuite; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -10,7 +9,6 @@ import org.junit.runners.Suite; @Suite.SuiteClasses({ // @formatter:off PersistenceTestSuite.class - ,SecurityTestSuite.class ,LiveTestSuite.class }) // public class TestSuite { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/security/SecurityTestSuite.java b/spring-security-rest-full/src/test/java/org/baeldung/security/SecurityTestSuite.java deleted file mode 100644 index 8b754a03ff..0000000000 --- a/spring-security-rest-full/src/test/java/org/baeldung/security/SecurityTestSuite.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung.security; - -import org.baeldung.security.csrf.CsrfDisabledIntegrationTest; -import org.baeldung.security.csrf.CsrfEnabledIntegrationTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - // @formatter:off - CsrfEnabledIntegrationTest.class - ,CsrfDisabledIntegrationTest.class -}) // -public class SecurityTestSuite { - -} diff --git a/spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfDisabledIntegrationTest.java b/spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfDisabledIntegrationTest.java deleted file mode 100644 index e06461fc2c..0000000000 --- a/spring-security-rest-full/src/test/java/org/baeldung/security/csrf/CsrfDisabledIntegrationTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.baeldung.security.csrf; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import org.baeldung.security.spring.SecurityWithoutCsrfConfig; -import org.baeldung.spring.PersistenceConfig; -import org.baeldung.spring.WebConfig; -import org.junit.Test; -import org.springframework.http.MediaType; -import org.springframework.test.context.ContextConfiguration; - -@ContextConfiguration(classes = { SecurityWithoutCsrfConfig.class, PersistenceConfig.class, WebConfig.class }) -public class CsrfDisabledIntegrationTest extends CsrfAbstractIntegrationTest { - - @Test - public void givenNotAuth_whenAddFoo_thenUnauthorized() throws Exception { - mvc.perform(post("/auth/foos").contentType(MediaType.APPLICATION_JSON).content(createFoo())).andExpect(status().isUnauthorized()); - } - - @Test - public void givenAuth_whenAddFoo_thenCreated() throws Exception { - mvc.perform(post("/auth/foos").contentType(MediaType.APPLICATION_JSON).content(createFoo()).with(testUser())).andExpect(status().isCreated()); - } - - @Test - public void accessMainPageWithoutAuthorization() throws Exception { - mvc.perform(get("/graph.html").contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk()); - } - - @Test - public void accessOtherPages() throws Exception { - mvc.perform(get("/auth/transfer").contentType(MediaType.APPLICATION_JSON).param("accountNo", "1").param("amount", "100")).andExpect(status().isUnauthorized()); // without authorization - mvc.perform(get("/auth/transfer").contentType(MediaType.APPLICATION_JSON).param("accountNo", "1").param("amount", "100").with(testUser())).andExpect(status().isOk()); // with authorization - } - - @Test - public void accessAdminPage() throws Exception { - mvc.perform(get("/auth/admin/x").contentType(MediaType.APPLICATION_JSON)).andExpect(status().isUnauthorized()); // without authorization - mvc.perform(get("/auth/admin/x").contentType(MediaType.APPLICATION_JSON).with(testAdmin())).andExpect(status().isOk()); // with authorization - } - -} diff --git a/spring-security-rest/README.md b/spring-security-rest/README.md index 92b759a66a..5898ba248e 100644 --- a/spring-security-rest/README.md +++ b/spring-security-rest/README.md @@ -14,3 +14,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com - [An Intro to Spring HATEOAS](http://www.baeldung.com/spring-hateoas-tutorial) - [Spring Security Context Propagation with @Async](http://www.baeldung.com/spring-security-async-principal-propagation) - [Servlet 3 Async Support with Spring MVC and Spring Security](http://www.baeldung.com/spring-mvc-async-security) +- [Intro to Spring Security Expressions](http://www.baeldung.com/spring-security-expressions) +- [Spring Security Expressions - hasRole Example](http://www.baeldung.com/spring-security-expressions-basic) +- [Error Handling for REST with Spring 3](http://www.baeldung.com/2013/01/31/exception-handling-for-rest-with-spring-3-2/) diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml index 13db431ae3..e4bb071a6a 100644 --- a/spring-security-rest/pom.xml +++ b/spring-security-rest/pom.xml @@ -28,7 +28,7 @@ spring-security-config ${org.springframework.security.version} - + diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java b/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java index 2dbc9b8f08..c3e738297a 100644 --- a/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java +++ b/spring-security-rest/src/main/java/org/baeldung/spring/SecurityJavaConfig.java @@ -1,10 +1,13 @@ package org.baeldung.spring; import org.baeldung.security.MySavedRequestAwareAuthenticationSuccessHandler; +import org.baeldung.web.error.CustomAccessDeniedHandler; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @@ -13,9 +16,13 @@ import org.springframework.security.web.authentication.SimpleUrlAuthenticationFa @Configuration @EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) @ComponentScan("org.baeldung.security") public class SecurityJavaConfig extends WebSecurityConfigurerAdapter { + @Autowired + private CustomAccessDeniedHandler accessDeniedHandler; + // @Autowired // private RestAuthenticationEntryPoint restAuthenticationEntryPoint; @@ -40,14 +47,15 @@ public class SecurityJavaConfig extends WebSecurityConfigurerAdapter { .csrf().disable() .authorizeRequests() .and() - .exceptionHandling() -// .authenticationEntryPoint(restAuthenticationEntryPoint) + .exceptionHandling().accessDeniedHandler(accessDeniedHandler) + // .authenticationEntryPoint(restAuthenticationEntryPoint) .and() .authorizeRequests() .antMatchers("/api/csrfAttacker*").permitAll() .antMatchers("/api/customer/**").permitAll() .antMatchers("/api/foos/**").authenticated() .antMatchers("/api/async/**").permitAll() + .antMatchers("/api/admin/**").hasRole("ADMIN") .and() .httpBasic() // .and() diff --git a/spring-security-rest/src/main/java/org/baeldung/spring/SwaggerConfig.java b/spring-security-rest/src/main/java/org/baeldung/spring/SwaggerConfig.java index 00ccb36666..bcf6657eee 100644 --- a/spring-security-rest/src/main/java/org/baeldung/spring/SwaggerConfig.java +++ b/spring-security-rest/src/main/java/org/baeldung/spring/SwaggerConfig.java @@ -1,19 +1,23 @@ package org.baeldung.spring; +import static com.google.common.collect.Lists.newArrayList; + +import java.util.Collections; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.bind.annotation.RequestMethod; + import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.ResponseMessageBuilder; import springfox.documentation.schema.ModelRef; import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; -import static com.google.common.collect.Lists.newArrayList; - @Configuration @EnableSwagger2 public class SwaggerConfig { @@ -25,7 +29,7 @@ public class SwaggerConfig { } private ApiInfo apiInfo() { - ApiInfo apiInfo = new ApiInfo("My REST API", "Some custom description of API.", "API TOS", "Terms of service", "myeaddress@company.com", "License of API", "API license URL"); + ApiInfo apiInfo = new ApiInfo("My REST API", "Some custom description of API.", "API TOS", "Terms of service", new Contact("John Doe", "www.example.com", "myeaddress@company.com"), "License of API", "API license URL", Collections.emptyList()); return apiInfo; } } diff --git a/spring-security-rest/src/main/java/org/baeldung/web/controller/RootController.java b/spring-security-rest/src/main/java/org/baeldung/web/controller/RootController.java new file mode 100644 index 0000000000..4253ed7a59 --- /dev/null +++ b/spring-security-rest/src/main/java/org/baeldung/web/controller/RootController.java @@ -0,0 +1,30 @@ +package org.baeldung.web.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +@Controller +public class RootController { + + public RootController() { + super(); + } + + // API + + @RequestMapping(value = "/admin/x", method = RequestMethod.GET) + @ResponseBody + public String sampleAdminPage() { + return "Hello"; + } + + + @RequestMapping(value = "/my-error-page", method = RequestMethod.GET) + @ResponseBody + public String sampleErrorPage() { + return "Error Occurred"; + } + +} diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/error/CustomAccessDeniedHandler.java b/spring-security-rest/src/main/java/org/baeldung/web/error/CustomAccessDeniedHandler.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/error/CustomAccessDeniedHandler.java rename to spring-security-rest/src/main/java/org/baeldung/web/error/CustomAccessDeniedHandler.java diff --git a/spring-security-rest/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java b/spring-security-rest/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java new file mode 100644 index 0000000000..9ff4f040fe --- /dev/null +++ b/spring-security-rest/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java @@ -0,0 +1,74 @@ +package org.baeldung.web.error; + +import org.springframework.dao.DataAccessException; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.dao.InvalidDataAccessApiUsageException; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +//import org.springframework.security.access.AccessDeniedException; + +@ControllerAdvice +public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionHandler { + + public RestResponseEntityExceptionHandler() { + super(); + } + + // API + + // 400 + + @ExceptionHandler({ DataIntegrityViolationException.class }) + public ResponseEntity handleBadRequest(final DataIntegrityViolationException ex, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.BAD_REQUEST, request); + } + + @Override + protected ResponseEntity handleHttpMessageNotReadable(final HttpMessageNotReadableException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + // ex.getCause() instanceof JsonMappingException, JsonParseException // for additional information later on + return handleExceptionInternal(ex, bodyOfResponse, headers, HttpStatus.BAD_REQUEST, request); + } + + @Override + protected ResponseEntity handleMethodArgumentNotValid(final MethodArgumentNotValidException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, headers, HttpStatus.BAD_REQUEST, request); + } + + // 403 + @ExceptionHandler({ AccessDeniedException.class }) + public ResponseEntity handleAccessDeniedException(final Exception ex, final WebRequest request) { + System.out.println("request" + request.getUserPrincipal()); + return new ResponseEntity("Access denied message here", new HttpHeaders(), HttpStatus.FORBIDDEN); + } + + // 409 + + @ExceptionHandler({ InvalidDataAccessApiUsageException.class, DataAccessException.class }) + protected ResponseEntity handleConflict(final RuntimeException ex, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.CONFLICT, request); + } + + // 412 + + // 500 + + @ExceptionHandler({ NullPointerException.class, IllegalArgumentException.class, IllegalStateException.class }) + /*500*/public ResponseEntity handleInternal(final RuntimeException ex, final WebRequest request) { + logger.error("500 Status Code", ex); + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.INTERNAL_SERVER_ERROR, request); + } + +} diff --git a/spring-security-rest/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java b/spring-security-rest/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java new file mode 100644 index 0000000000..14b61f9832 --- /dev/null +++ b/spring-security-rest/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java @@ -0,0 +1,21 @@ +package org.baeldung.web.exception; + +public final class MyResourceNotFoundException extends RuntimeException { + + public MyResourceNotFoundException() { + super(); + } + + public MyResourceNotFoundException(final String message, final Throwable cause) { + super(message, cause); + } + + public MyResourceNotFoundException(final String message) { + super(message); + } + + public MyResourceNotFoundException(final Throwable cause) { + super(cause); + } + +} diff --git a/spring-security-rest/src/main/resources/webSecurityConfig.xml b/spring-security-rest/src/main/resources/webSecurityConfig.xml index a260460d76..4bb208a195 100644 --- a/spring-security-rest/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest/src/main/resources/webSecurityConfig.xml @@ -10,6 +10,8 @@ http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> + + @@ -17,6 +19,11 @@ + + + + + @@ -30,8 +37,12 @@ + + + + \ No newline at end of file diff --git a/spring-security-rest/src/test/java/org/baeldung/web/FooLiveTest.java b/spring-security-rest/src/test/java/org/baeldung/web/FooLiveTest.java index 0ef50f745a..0a53da674a 100644 --- a/spring-security-rest/src/test/java/org/baeldung/web/FooLiveTest.java +++ b/spring-security-rest/src/test/java/org/baeldung/web/FooLiveTest.java @@ -17,17 +17,20 @@ import com.jayway.restassured.specification.RequestSpecification; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { TestConfig.class }, loader = AnnotationConfigContextLoader.class) public class FooLiveTest { - private static final String URL_PREFIX = "http://localhost:8082/spring-security-rest"; + private static final String URL_PREFIX = "http://localhost:8080/spring-security-rest"; // private FormAuthConfig formConfig = new FormAuthConfig(URL_PREFIX + "/login", "temporary", "temporary"); private String cookie; private RequestSpecification givenAuth() { // return RestAssured.given().auth().form("user", "userPass", formConfig); - if (cookie == null) { - cookie = RestAssured.given().contentType("application/x-www-form-urlencoded").formParam("password", "userPass").formParam("username", "user").post(URL_PREFIX + "/login").getCookie("JSESSIONID"); - } - return RestAssured.given().cookie("JSESSIONID", cookie); + // if (cookie == null) { + // cookie = RestAssured.given().contentType("application/x-www-form-urlencoded").formParam("password", "userPass").formParam("username", "user").post(URL_PREFIX + "/login").getCookie("JSESSIONID"); + // } + // return RestAssured.given().cookie("JSESSIONID", cookie); + return RestAssured.given() + .auth() + .basic("user", "userPass"); } @Test diff --git a/spring-security-rest/src/test/java/org/baeldung/web/SwaggerLiveTest.java b/spring-security-rest/src/test/java/org/baeldung/web/SwaggerLiveTest.java index cf1516f8e1..792b3e28ce 100644 --- a/spring-security-rest/src/test/java/org/baeldung/web/SwaggerLiveTest.java +++ b/spring-security-rest/src/test/java/org/baeldung/web/SwaggerLiveTest.java @@ -8,7 +8,7 @@ import com.jayway.restassured.RestAssured; import com.jayway.restassured.response.Response; public class SwaggerLiveTest { - private static final String URL_PREFIX = "http://localhost:8082/spring-security-rest/api"; + private static final String URL_PREFIX = "http://localhost:8080/spring-security-rest/api"; @Test public void whenVerifySpringFoxIsWorking_thenOK() { From d6d6a9edda7889126cbf5a8f3f199d7b49e23c70 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 22 Oct 2017 19:13:49 +0200 Subject: [PATCH 086/197] Delete MCTSTest.java (#2814) --- .../src/test/java/algorithms/MCTSTest.java | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 algorithms/src/test/java/algorithms/MCTSTest.java diff --git a/algorithms/src/test/java/algorithms/MCTSTest.java b/algorithms/src/test/java/algorithms/MCTSTest.java deleted file mode 100644 index f969c26311..0000000000 --- a/algorithms/src/test/java/algorithms/MCTSTest.java +++ /dev/null @@ -1,92 +0,0 @@ -package algorithms; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.List; - -import org.junit.Before; -import org.junit.Test; - -import com.baeldung.algorithms.mcts.montecarlo.MonteCarloTreeSearch; -import com.baeldung.algorithms.mcts.montecarlo.State; -import com.baeldung.algorithms.mcts.montecarlo.UCT; -import com.baeldung.algorithms.mcts.tictactoe.Board; -import com.baeldung.algorithms.mcts.tictactoe.Position; -import com.baeldung.algorithms.mcts.tree.Tree; - -public class MCTSTest { - Tree gameTree; - MonteCarloTreeSearch mcts; - - @Before - public void initGameTree() { - gameTree = new Tree(); - mcts = new MonteCarloTreeSearch(); - } - - @Test - public void givenStats_whenGetUCTForNode_thenUCTMatchesWithManualData() { - double uctValue = 15.79; - assertEquals(UCT.uctValue(600, 300, 20), uctValue, 0.01); - } - - @Test - public void giveninitBoardState_whenGetAllPossibleStates_thenNonEmptyList() { - State initState = gameTree.getRoot().getState(); - List possibleStates = initState.getAllPossibleStates(); - assertTrue(possibleStates.size() > 0); - } - - @Test - public void givenEmptyBoard_whenPerformMove_thenLessAvailablePossitions() { - Board board = new Board(); - int initAvailablePositions = board.getEmptyPositions().size(); - board.performMove(Board.P1, new Position(1, 1)); - int availablePositions = board.getEmptyPositions().size(); - assertTrue(initAvailablePositions > availablePositions); - } - - @Test - public void givenEmptyBoard_whenSimulateInterAIPlay_thenGameDraw() { - Board board = new Board(); - - int player = Board.P1; - int totalMoves = Board.DEFAULT_BOARD_SIZE * Board.DEFAULT_BOARD_SIZE; - for (int i = 0; i < totalMoves; i++) { - board = mcts.findNextMove(board, player); - if (board.checkStatus() != -1) { - break; - } - player = 3 - player; - } - int winStatus = board.checkStatus(); - assertEquals(winStatus, Board.DRAW); - } - - @Test - public void givenEmptyBoard_whenLevel1VsLevel3_thenLevel3WinsOrDraw() { - Board board = new Board(); - MonteCarloTreeSearch mcts1 = new MonteCarloTreeSearch(); - mcts1.setLevel(1); - MonteCarloTreeSearch mcts3 = new MonteCarloTreeSearch(); - mcts3.setLevel(3); - - int player = Board.P1; - int totalMoves = Board.DEFAULT_BOARD_SIZE * Board.DEFAULT_BOARD_SIZE; - for (int i = 0; i < totalMoves; i++) { - if (player == Board.P1) - board = mcts3.findNextMove(board, player); - else - board = mcts1.findNextMove(board, player); - - if (board.checkStatus() != -1) { - break; - } - player = 3 - player; - } - int winStatus = board.checkStatus(); - assertTrue(winStatus == Board.DRAW || winStatus == Board.P1); - } - -} From 3f6dcebdf982e51f34942a50658998b29fda45bc Mon Sep 17 00:00:00 2001 From: chrisoberle Date: Sun, 22 Oct 2017 13:23:26 -0400 Subject: [PATCH 087/197] BAEL-1187 - Mapping Nested Values with Jackson (#2750) * BAEL-1187 - Mapping Nested Values with Jackson * minor naming and formatting changes to align with standards * update formatting and jackson version --- jackson/pom.xml | 2 +- ...serializeWithNestedPropertiesUnitTest.java | 70 +++++++++++++++++++ .../deserialization/nested/Product.java | 55 +++++++++++++++ .../nested/ProductDeserializer.java | 40 +++++++++++ 4 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java create mode 100644 jackson/src/test/java/com/baeldung/jackson/deserialization/nested/Product.java create mode 100644 jackson/src/test/java/com/baeldung/jackson/deserialization/nested/ProductDeserializer.java diff --git a/jackson/pom.xml b/jackson/pom.xml index f970b6a68c..001fde5021 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -129,7 +129,7 @@ - 2.9.0 + 2.9.2 19.0 diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java new file mode 100644 index 0000000000..6e762caa64 --- /dev/null +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java @@ -0,0 +1,70 @@ +package com.baeldung.jackson.deserialization.nested; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.Test; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; + +public class DeserializeWithNestedPropertiesUnitTest { + + private String SOURCE_JSON = "{\"id\":\"957c43f2-fa2e-42f9-bf75-6e3d5bb6960a\",\"name\":\"The Best Product\",\"brand\":{\"id\":\"9bcd817d-0141-42e6-8f04-e5aaab0980b6\",\"name\":\"ACME Products\",\"owner\":{\"id\":\"b21a80b1-0c09-4be3-9ebd-ea3653511c13\",\"name\":\"Ultimate Corp, Inc.\"}}}"; + + @Test + public void whenUsingJacksonAnnotations_thenOk() throws IOException { + Product product = new ObjectMapper().readerFor(Product.class) + .readValue(SOURCE_JSON); + + assertEquals(product.getName(), "The Best Product"); + assertEquals(product.getBrandName(), "ACME Products"); + assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); + } + + @Test + public void whenUsingJacksonJsonNode_thenOk() throws IOException { + JsonNode productNode = new ObjectMapper().readTree(SOURCE_JSON); + + Product product = new Product(); + product.setId(productNode.get("id") + .textValue()); + product.setName(productNode.get("name") + .textValue()); + product.setBrandName(productNode.get("brand") + .get("name") + .textValue()); + product.setOwnerName(productNode.get("brand") + .get("owner") + .get("name") + .textValue()); + + assertEquals(product.getName(), "The Best Product"); + assertEquals(product.getBrandName(), "ACME Products"); + assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); + } + + @Test + public void whenUsingJacksonDeserializerManuallyRegistered_thenOk() throws IOException { + ObjectMapper mapper = new ObjectMapper(); + SimpleModule module = new SimpleModule(); + module.addDeserializer(Product.class, new ProductDeserializer()); + mapper.registerModule(module); + + Product product = mapper.readValue(SOURCE_JSON, Product.class); + assertEquals(product.getName(), "The Best Product"); + assertEquals(product.getBrandName(), "ACME Products"); + assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); + } + + @Test + public void whenUsingJacksonDeserializerAutoRegistered_thenOk() throws IOException { + ObjectMapper mapper = new ObjectMapper(); + Product product = mapper.readValue(SOURCE_JSON, Product.class); + assertEquals(product.getName(), "The Best Product"); + assertEquals(product.getBrandName(), "ACME Products"); + assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); + } +} diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/Product.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/Product.java new file mode 100644 index 0000000000..0020afea0f --- /dev/null +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/Product.java @@ -0,0 +1,55 @@ +package com.baeldung.jackson.deserialization.nested; + +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +@JsonDeserialize(using = ProductDeserializer.class) +public class Product { + + private String id; + private String name; + private String brandName; + private String ownerName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBrandName() { + return brandName; + } + + public void setBrandName(String brandName) { + this.brandName = brandName; + } + + public String getOwnerName() { + return ownerName; + } + + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; + } + + @SuppressWarnings("unchecked") + @JsonProperty("brand") + private void unpackNested(Map brand) { + this.brandName = (String) brand.get("name"); + Map owner = (Map) brand.get("owner"); + this.ownerName = owner.get("name"); + } +} \ No newline at end of file diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/ProductDeserializer.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/ProductDeserializer.java new file mode 100644 index 0000000000..daabae6cda --- /dev/null +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/ProductDeserializer.java @@ -0,0 +1,40 @@ +package com.baeldung.jackson.deserialization.nested; + +import java.io.IOException; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; + +@SuppressWarnings("serial") +public class ProductDeserializer extends StdDeserializer { + + public ProductDeserializer() { + this(null); + } + + public ProductDeserializer(Class vc) { + super(vc); + } + + @Override + public Product deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { + JsonNode productNode = jp.getCodec() + .readTree(jp); + Product product = new Product(); + product.setId(productNode.get("id") + .textValue()); + product.setName(productNode.get("name") + .textValue()); + product.setBrandName(productNode.get("brand") + .get("name") + .textValue()); + product.setOwnerName(productNode.get("brand") + .get("owner") + .get("name") + .textValue()); + return product; + } +} From 128815fc77a14d0a533cc221649e40af81936005 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 00:29:32 +0600 Subject: [PATCH 088/197] Update README.md (#2815) --- animal-sniffer-mvn-plugin/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/animal-sniffer-mvn-plugin/README.md b/animal-sniffer-mvn-plugin/README.md index ff12555376..4c7c381da4 100644 --- a/animal-sniffer-mvn-plugin/README.md +++ b/animal-sniffer-mvn-plugin/README.md @@ -1 +1,3 @@ ## Relevant articles: + +[Introduction to Animal Sniffer Maven Plugin](http://www.baeldung.com/maven-animal-sniffer) From 9b98f77729090ab5e8f8a523554c8db64dcf0d97 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 00:30:10 +0600 Subject: [PATCH 089/197] Update README.md (#2816) --- apache-cayenne/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apache-cayenne/README.md b/apache-cayenne/README.md index ff12555376..610d1233b7 100644 --- a/apache-cayenne/README.md +++ b/apache-cayenne/README.md @@ -1 +1,4 @@ ## Relevant articles: + +- [Advanced Querying in Apache Cayenne](http://www.baeldung.com/apache-cayenne-query) +- [Introduction to Apache Cayenne ORM](http://www.baeldung.com/apache-cayenne-orm) From 7cc3195ca5f31cb13ae11a45e1358be686a645c4 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 00:31:11 +0600 Subject: [PATCH 090/197] Update README.md (#2817) --- algorithms/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/algorithms/README.md b/algorithms/README.md index 91d8b55dd6..b0c5ee9d77 100644 --- a/algorithms/README.md +++ b/algorithms/README.md @@ -11,3 +11,6 @@ - [String Search Algorithms for Large Texts](http://www.baeldung.com/java-full-text-search-algorithms) - [Test a Linked List for Cyclicity](http://www.baeldung.com/java-linked-list-cyclicity) - [Binary Search Algorithm in Java](http://www.baeldung.com/java-binary-search) +- [Bubble Sort in Java](http://www.baeldung.com/java-bubble-sort) +- [Introduction to JGraphT](http://www.baeldung.com/jgrapht) +- [Introduction to Minimax Algorithm](http://www.baeldung.com/java-minimax-algorithm) From 05578049b2c6bd57a0fae668bb40276b652e6bb8 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 00:32:39 +0600 Subject: [PATCH 091/197] Update README.md (#2821) --- aws/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aws/README.md b/aws/README.md index 10db004765..c52992f48a 100644 --- a/aws/README.md +++ b/aws/README.md @@ -1,3 +1,5 @@ ### Relevant articles - [AWS Lambda Using DynamoDB With Java](http://www.baeldung.com/aws-lambda-dynamodb-java) +- [AWS S3 with Java](http://www.baeldung.com/aws-s3-java) +- [AWS Lambda With Java](http://www.baeldung.com/java-aws-lambda) From 5acb3e1c4cee4b5e2cfa42ba3d856c4264ada712 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 00:32:50 +0600 Subject: [PATCH 092/197] Update README.md (#2819) --- atomix/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/atomix/README.md b/atomix/README.md index ff12555376..fb22eec8dc 100644 --- a/atomix/README.md +++ b/atomix/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Introduction to Atomix](http://www.baeldung.com/atomix) From 26f0a2eb1c412512efc9da72abfce63e10a5bf54 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 00:45:28 +0600 Subject: [PATCH 093/197] Update README.md (#2818) --- apache-cxf/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apache-cxf/README.md b/apache-cxf/README.md index d8f1912070..1e66ce5da8 100644 --- a/apache-cxf/README.md +++ b/apache-cxf/README.md @@ -1,2 +1,5 @@ ## Relevant Articles: - [Introduction to Apache CXF Aegis Data Binding](http://www.baeldung.com/aegis-data-binding-in-apache-cxf) +- [Apache CXF Support for RESTful Web Services](http://www.baeldung.com/apache-cxf-rest-api) +- [A Guide to Apache CXF with Spring](http://www.baeldung.com/apache-cxf-with-spring) +- [Introduction to Apache CXF](http://www.baeldung.com/introduction-to-apache-cxf) From 2fd7cbc930dc0256dd1192190b7c5cf658e4bdee Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 00:46:03 +0600 Subject: [PATCH 094/197] Update README.md (#2822) --- camel-api/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/camel-api/README.md b/camel-api/README.md index fe8dadcfe1..0e85db4a7f 100644 --- a/camel-api/README.md +++ b/camel-api/README.md @@ -13,3 +13,7 @@ and a BODY Payload like {"id": 1,"name": "World"} and we will get a return code of 201 and the response: Hello, World - if the transform() method from Application class is uncommented and the process() method is commented or return code of 201 and the response: {"id": 10,"name": "Hello, World"} - if the transform() method from Application class is commented and the process() method is uncommented + +## Relevant articles: + +- [Apache Camel with Spring Boot](http://www.baeldung.com/apache-camel-spring-boot) From 14e4ee69cd5b42ad8c454d8984e82d5daaa2ce89 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 01:55:26 +0600 Subject: [PATCH 095/197] Update README.md (#2820) --- aws/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/README.md b/aws/README.md index c52992f48a..b6d0b79d91 100644 --- a/aws/README.md +++ b/aws/README.md @@ -3,3 +3,4 @@ - [AWS Lambda Using DynamoDB With Java](http://www.baeldung.com/aws-lambda-dynamodb-java) - [AWS S3 with Java](http://www.baeldung.com/aws-s3-java) - [AWS Lambda With Java](http://www.baeldung.com/java-aws-lambda) + From 8d4c1164539103283237e56d6ad0c9042c6491c3 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 01:56:36 +0600 Subject: [PATCH 096/197] Update README.MD (#2825) --- drools/README.MD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drools/README.MD b/drools/README.MD index 4ece7608fc..e3f00f5047 100644 --- a/drools/README.MD +++ b/drools/README.MD @@ -1,3 +1,4 @@ ### Relevant Articles: -[Introduction to Drools](http://www.baeldung.com/drools) -[Drools Using Rules from Excel Files](http://www.baeldung.com/drools-excel) +- [Introduction to Drools](http://www.baeldung.com/drools) +- [Drools Using Rules from Excel Files](http://www.baeldung.com/drools-excel) +- [Drools Using Rules from Excel Files](http://www.baeldung.com/drools-excel) From f7be435a55d3b199c2a33d752547ff29502303b1 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 01:56:53 +0600 Subject: [PATCH 097/197] Update README.md (#2826) --- feign/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feign/README.md b/feign/README.md index 4d6964a73a..da04c40cdc 100644 --- a/feign/README.md +++ b/feign/README.md @@ -5,4 +5,6 @@ This is the implementation of a [spring-hypermedia-api][1] client using Feign. [1]: https://github.com/eugenp/spring-hypermedia-api ### Relevant Articles: + - [Intro to Feign](http://www.baeldung.com/intro-to-feign) +- [Introduction to SLF4J](http://www.baeldung.com/slf4j-with-log4j2-logback) From 76ec677bb7dc532b5085c077c39f0563e87e0ebb Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 01:58:23 +0600 Subject: [PATCH 098/197] Update README.md (#2827) --- graphql/graphql-java/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphql/graphql-java/README.md b/graphql/graphql-java/README.md index ff12555376..0033524209 100644 --- a/graphql/graphql-java/README.md +++ b/graphql/graphql-java/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Introduction to GraphQL](http://www.baeldung.com/graphql) From 8be395778cf04d3a7b6614cc5ce7ec6518db09fc Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 02:02:13 +0600 Subject: [PATCH 099/197] Update README.md (#2828) --- guava21/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/guava21/README.md b/guava21/README.md index 2a54416e41..68c1ac4a8e 100644 --- a/guava21/README.md +++ b/guava21/README.md @@ -1,3 +1,4 @@ ### Relevant articles: - [New Stream, Comparator and Collector Functionality in Guava 21](http://www.baeldung.com/guava-21-new) - [New in Guava 21 common.util.concurrent](http://www.baeldung.com/guava-21-util-concurrent) +- [Zipping Collections in Java](http://www.baeldung.com/java-collections-zip) From ebd4d85b7c47ce3bbb56fbcf39e6804c5ee3ee62 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:57:27 +0600 Subject: [PATCH 100/197] Update README.md (#2847) --- vaadin/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vaadin/README.md b/vaadin/README.md index ff12555376..0dfeea8996 100644 --- a/vaadin/README.md +++ b/vaadin/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Introduction to Vaadin](http://www.baeldung.com/vaadin) From ac0bdcdef044a591b94fd8cf501f4698a4d7a3b0 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:57:51 +0600 Subject: [PATCH 101/197] Update README.md (#2846) --- spring-rest-simple/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spring-rest-simple/README.md b/spring-rest-simple/README.md index ff12555376..916676feb5 100644 --- a/spring-rest-simple/README.md +++ b/spring-rest-simple/README.md @@ -1 +1,7 @@ ## Relevant articles: + +- [Guide to UriComponentsBuilder in Spring](http://www.baeldung.com/spring-uricomponentsbuilder) +- [Returning Custom Status Codes from Spring Controllers](http://www.baeldung.com/spring-mvc-controller-custom-http-status-code) +- [The Guide to RestTemplate](http://www.baeldung.com/rest-template) +- [Spring RequestMapping](http://www.baeldung.com/spring-requestmapping) +- [ETags for REST with Spring](http://www.baeldung.com/etags-for-rest-with-spring) From 783785411bff54bef73b48643a613078bc40e193 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:58:08 +0600 Subject: [PATCH 102/197] Update README.md (#2845) --- spring-drools/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-drools/README.md b/spring-drools/README.md index ff12555376..00b35a4624 100644 --- a/spring-drools/README.md +++ b/spring-drools/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Drools Spring Integration](http://www.baeldung.com/drools-spring-integration) From cf74741f58928cb8d1e3ca08e3b62a4a8f8b555d Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:58:19 +0600 Subject: [PATCH 103/197] Update README.md (#2844) --- saas/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/saas/README.md b/saas/README.md index ff12555376..4e0eeea974 100644 --- a/saas/README.md +++ b/saas/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [JIRA REST API Integration](http://www.baeldung.com/jira-rest-api) From b2d157008d77e9183211d0a5d82353cc5acaa1b1 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:58:34 +0600 Subject: [PATCH 104/197] Update README.md (#2843) --- rule-engines/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rule-engines/README.md b/rule-engines/README.md index ff12555376..6d3c0e93b4 100644 --- a/rule-engines/README.md +++ b/rule-engines/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [List of Rules Engines in Java](http://www.baeldung.com/java-rule-engines) From 3f3e9d03ebee0153df505284ecd3df2025415eed Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:58:48 +0600 Subject: [PATCH 105/197] Update README.md (#2842) --- mockserver/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mockserver/README.md b/mockserver/README.md index ff12555376..a8bc5cfc98 100644 --- a/mockserver/README.md +++ b/mockserver/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Introduction to MockServer](http://www.baeldung.com/mockserver) From 98d5166f6d5bd17876421b75037114c4806b4a54 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:59:03 +0600 Subject: [PATCH 106/197] Update README.md (#2841) --- mocks/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mocks/README.md b/mocks/README.md index ff12555376..15370b812b 100644 --- a/mocks/README.md +++ b/mocks/README.md @@ -1 +1,7 @@ ## Relevant articles: + +- [Introduction to MockServer](http://www.baeldung.com/mockserver) +- [JMockit Advanced Usage](http://www.baeldung.com/jmockit-advanced-usage) +- [A Guide to JMockit Expectations](http://www.baeldung.com/jmockit-expectations) +- [JMockit 101](http://www.baeldung.com/jmockit-101) +- [Mockito vs EasyMock vs JMockit](http://www.baeldung.com/mockito-vs-easymock-vs-jmockit) From 676fcde703086a9df7531d2f3fecad465c6ea564 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:59:16 +0600 Subject: [PATCH 107/197] Update README.md (#2840) --- linkrest/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linkrest/README.md b/linkrest/README.md index ff12555376..33cf930b18 100644 --- a/linkrest/README.md +++ b/linkrest/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Guide to LinkRest](http://www.baeldung.com/linkrest) From aa8f5bebd8d052d6908c07bbda25bab78eb14c20 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:59:32 +0600 Subject: [PATCH 108/197] Update README.md (#2839) --- libraries-data/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries-data/README.md b/libraries-data/README.md index ca70c61146..ceb0a1d5f7 100644 --- a/libraries-data/README.md +++ b/libraries-data/README.md @@ -1,2 +1,4 @@ ### Relevant articles - [Introduction to Reladomo](http://www.baeldung.com/reladomo) +- [Introduction to ORMLite](http://www.baeldung.com/ormlite) +- [Introduction To Kryo](http://www.baeldung.com/kryo) From 5a85bb73c88e5395d7463aada218e2c717d441c4 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 11:59:45 +0600 Subject: [PATCH 109/197] Update README.md (#2837) --- jooby/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jooby/README.md b/jooby/README.md index ff12555376..032e595354 100644 --- a/jooby/README.md +++ b/jooby/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Introduction to Jooby Project](http://www.baeldung.com/jooby) From 69d9b0480938e1bd56031b0c5d5eb1d9edb83762 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 12:04:24 +0600 Subject: [PATCH 110/197] Update README.md (#2836) --- jmh/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jmh/README.md b/jmh/README.md index ff12555376..2a2c6a173a 100644 --- a/jmh/README.md +++ b/jmh/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Microbenchmarking with Java](http://www.baeldung.com/java-microbenchmark-harness) From 5389cdbc0dd721e5d16e86079034207b0108e799 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 12:04:35 +0600 Subject: [PATCH 111/197] Update README.md (#2835) --- jjwt/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jjwt/README.md b/jjwt/README.md index 47b51038a8..54a5226056 100644 --- a/jjwt/README.md +++ b/jjwt/README.md @@ -42,4 +42,8 @@ Available commands (assumes httpie - https://github.com/jkbrzt/httpie): Parse passed in JWT enforcing the 'iss' registered claim and the 'hasMotorcycle' custom claim ``` -The Baeldung post that compliments this repo can be found [here](http://www.baeldung.com/) \ No newline at end of file +The Baeldung post that compliments this repo can be found [here](http://www.baeldung.com/) + +## Relevant articles: + +- [Supercharge Java Authentication with JSON Web Tokens (JWTs)](http://www.baeldung.com/java-json-web-tokens-jjwt) From fe4cf744f9c08b64e5a3bcf53413234ea4892c8a Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 12:08:07 +0600 Subject: [PATCH 112/197] Update README.md (#2838) --- json-path/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/json-path/README.md b/json-path/README.md index ff12555376..3563dcf880 100644 --- a/json-path/README.md +++ b/json-path/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Introduction to JsonPath](http://www.baeldung.com/guide-to-jayway-jsonpath) From e2442c0b1daf08740ddf349ef20015354ebb37fe Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 12:08:18 +0600 Subject: [PATCH 113/197] Update README.md (#2834) --- jhipster/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jhipster/README.md b/jhipster/README.md index ff12555376..f3655f8ec1 100644 --- a/jhipster/README.md +++ b/jhipster/README.md @@ -1 +1,4 @@ ## Relevant articles: + +- [JHipster with a Microservice Architecture](http://www.baeldung.com/jhipster-microservices) +- [Intro to JHipster](http://www.baeldung.com/jhipster) From b33b0deb12e7bf40fbfa29eca4c2234e2424c326 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 12:08:28 +0600 Subject: [PATCH 114/197] Update README.md (#2833) --- javaxval/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/javaxval/README.md b/javaxval/README.md index b5001789f1..c6a6eb7345 100644 --- a/javaxval/README.md +++ b/javaxval/README.md @@ -7,3 +7,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring ### Relevant Articles: - [Java Bean Validation Basics](http://www.baeldung.com/javax-validation) +- [Validating Container Elements with Bean Validation 2.0](http://www.baeldung.com/bean-validation-container-elements) From bca4005655a17ea39cb73fd4ce712866d852f5e6 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 12:08:40 +0600 Subject: [PATCH 115/197] Update README.md (#2832) --- jackson/README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jackson/README.md b/jackson/README.md index 51919f6769..a710a1689e 100644 --- a/jackson/README.md +++ b/jackson/README.md @@ -28,3 +28,10 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [A Guide to Optional with Jackson](http://www.baeldung.com/jackson-optional) - [Map Serialization and Deserialization with Jackson](http://www.baeldung.com/jackson-map) - [Jackson Streaming API](http://www.baeldung.com/jackson-streaming-api) +- [Jackson – JsonMappingException (No serializer found for class)](http://www.baeldung.com/jackson-jsonmappingexception) +- [How To Serialize Enums as JSON Objects with Jackson](http://www.baeldung.com/jackson-serialize-enums) +- [Jackson – Marshall String to JsonNode](http://www.baeldung.com/jackson-json-to-jsonnode) +- [Ignore Null Fields with Jackson](http://www.baeldung.com/jackson-ignore-null-fields) +- [Jackson – Unmarshall to Collection/Array](http://www.baeldung.com/jackson-collection-array) +- [Jackson – Change Name of Field](http://www.baeldung.com/jackson-name-of-property) +- [Serialize Only Fields that meet a Custom Criteria with Jackson](http://www.baeldung.com/jackson-serialize-field-custom-criteria) From 0cbf29690e249e1e6aea2a0f727788048550ea9b Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Mon, 23 Oct 2017 08:08:58 +0200 Subject: [PATCH 116/197] Update README.md (#2831) --- libraries/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/README.md b/libraries/README.md index 243baf2c73..c6bbb5634c 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -8,9 +8,9 @@ - [Embedded Jetty Server in Java](http://www.baeldung.com/jetty-embedded) - [Introduction to Apache Flink with Java](http://www.baeldung.com/apache-flink) - [Introduction to JSONassert](http://www.baeldung.com/jsonassert) -- [Intro to JaVer](http://www.baeldung.com/javers) +- [Intro to JaVers](http://www.baeldung.com/javers) - [Introduction to Apache Commons Math](http://www.baeldung.com/apache-commons-math) -- [Intro to JaVer](http://www.baeldung.com/serenity-bdd) +- [Intro to Serenity BDD](http://www.baeldung.com/serenity-bdd) - [Introduction to Netty](http://www.baeldung.com/netty) - [Merging Streams in Java](http://www.baeldung.com/java-merge-streams) - [Serenity BDD and Screenplay](http://www.baeldung.com/serenity-screenplay) @@ -53,6 +53,7 @@ - [Using Pairs in Java](http://www.baeldung.com/java-pairs) - [Apache Commons Collections Bag](http://www.baeldung.com/apache-commons-bag) - [Introduction to Caffeine](http://www.baeldung.com/java-caching-caffeine) ++-[Introduction to Chronicle Queue](http://www.baeldung.com/java-chronicle-queue) The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own. From b173516479aa600caac3c04278197753b81921a2 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 12:09:06 +0600 Subject: [PATCH 117/197] Update README.md (#2830) --- httpclient/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/httpclient/README.md b/httpclient/README.md index 2a98c2feac..93e0f3c9e1 100644 --- a/httpclient/README.md +++ b/httpclient/README.md @@ -20,3 +20,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [HttpAsyncClient Tutorial](http://www.baeldung.com/httpasyncclient-tutorial) - [HttpClient 4 Tutorial](http://www.baeldung.com/httpclient-guide) - [Advanced HttpClient Configuration](http://www.baeldung.com/httpclient-advanced-config) +- [HttpClient 4 – Do Not Follow Redirects](http://www.baeldung.com/httpclient-stop-follow-redirect) +- [HttpClient 4 – Setting a Custom User-Agent](http://www.baeldung.com/httpclient-user-agent-header) From 4ebeb99911eeec2f02b5ad40a3f243a1e7c20bf4 Mon Sep 17 00:00:00 2001 From: Rokon Uddin Ahmed Date: Mon, 23 Oct 2017 12:09:16 +0600 Subject: [PATCH 118/197] Update README.md (#2829) --- handling-spring-static-resources/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/handling-spring-static-resources/README.md b/handling-spring-static-resources/README.md index d8f64bc427..c12e0272d4 100644 --- a/handling-spring-static-resources/README.md +++ b/handling-spring-static-resources/README.md @@ -1,3 +1,4 @@ ### Relevant Articles: - [Cachable Static Assets with Spring MVC](http://www.baeldung.com/cachable-static-assets-with-spring-mvc) - [Minification of JS and CSS Assets with Maven](http://www.baeldung.com/maven-minification-of-js-and-css-assets) +- [Serve Static Resources with Spring](http://www.baeldung.com/spring-mvc-static-resources) From 3085db7b3047f446a3039e9461c6bf13f0658beb Mon Sep 17 00:00:00 2001 From: Nikhil Khatwani Date: Mon, 23 Oct 2017 11:46:20 +0530 Subject: [PATCH 119/197] Bael 1166 intro apache spark (#2812) * Changes for BAEL-1166 * Changes for BAEL_1166 * Changes for BAEL 1166 * Changes for BAEL 1166 --- apache-spark/pom.xml | 44 +++++++++++++++ .../src/main/java/com/baeldung/WordCount.java | 53 +++++++++++++++++++ .../src/main/resources/spark_example.txt | 3 ++ 3 files changed, 100 insertions(+) create mode 100644 apache-spark/pom.xml create mode 100644 apache-spark/src/main/java/com/baeldung/WordCount.java create mode 100644 apache-spark/src/main/resources/spark_example.txt diff --git a/apache-spark/pom.xml b/apache-spark/pom.xml new file mode 100644 index 0000000000..1f95150ee7 --- /dev/null +++ b/apache-spark/pom.xml @@ -0,0 +1,44 @@ + + 4.0.0 + + com.baeldung + apache-spark + 1.0-SNAPSHOT + jar + + apache-spark + http://maven.apache.org + + + UTF-8 + + + + + + org.apache.spark + spark-core_2.10 + 2.2.0 + + + junit + junit + 3.8.1 + test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + + diff --git a/apache-spark/src/main/java/com/baeldung/WordCount.java b/apache-spark/src/main/java/com/baeldung/WordCount.java new file mode 100644 index 0000000000..ec1dedcb69 --- /dev/null +++ b/apache-spark/src/main/java/com/baeldung/WordCount.java @@ -0,0 +1,53 @@ +package com.baeldung; + +import java.util.Arrays; +import java.util.List; +import java.util.regex.Pattern; + +import org.apache.spark.SparkConf; +import org.apache.spark.api.java.JavaPairRDD; +import org.apache.spark.api.java.JavaRDD; +import org.apache.spark.api.java.JavaSparkContext; +import org.apache.spark.api.java.function.*; +import org.apache.spark.api.java.function.Function2; +import org.apache.spark.api.java.function.PairFunction; + +import scala.Tuple2; + +public class WordCount { + + private static final Pattern SPACE = Pattern.compile(" "); + + public static void main(String[] args) throws Exception { + if (args.length < 1) { + System.err.println("Usage: JavaWordCount "); + System.exit(1); + } + SparkConf sparkConf = new SparkConf().setAppName("JavaWordCount").setMaster("local"); + JavaSparkContext ctx = new JavaSparkContext(sparkConf); + JavaRDD lines = ctx.textFile(args[0], 1); + + JavaRDD words = lines.flatMap(s -> Arrays.asList(SPACE.split(s)).iterator()); + JavaPairRDD ones = words.mapToPair( + new PairFunction() { + @Override + public Tuple2 call(String s) { + return new Tuple2<>(s, 1); + } + }); + + JavaPairRDD counts = ones.reduceByKey( + new Function2() { + @Override + public Integer call(Integer i1, Integer i2) { + return i1 + i2; + } + }); + + List> output = counts.collect(); + for (Tuple2 tuple : output) { + System.out.println(tuple._1() + ": " + tuple._2()); + } + ctx.stop(); +} +} diff --git a/apache-spark/src/main/resources/spark_example.txt b/apache-spark/src/main/resources/spark_example.txt new file mode 100644 index 0000000000..10fd71dc31 --- /dev/null +++ b/apache-spark/src/main/resources/spark_example.txt @@ -0,0 +1,3 @@ +Hello from Baeldung +Keep Learning Spark +Bye from Baeldung \ No newline at end of file From 7c7a6d4407c728e1790896e54f5d9ed1483d30ff Mon Sep 17 00:00:00 2001 From: lor6 Date: Tue, 24 Oct 2017 00:16:19 +0300 Subject: [PATCH 120/197] BAEL-1274 custom method in multiple repositories ex (#2766) * custom method in multiple repositories ex * change var name * refactor packages * change to assertj, change method name --- spring-jpa/pom.xml | 6 ++ .../baeldung/config/StudentJPAH2Config.java | 69 +++++++++++++++++++ .../org/baeldung/config/StudentJpaConfig.java | 4 +- .../persistence/dao/ExtendedRepository.java | 12 ++++ .../dao/ExtendedRepositoryImpl.java | 36 ++++++++++ .../dao/ExtendedStudentRepository.java | 6 ++ .../persistence/dao/StudentRepository.java | 5 +- .../persistence/model/Student.java | 2 +- .../persistence-student-h2.properties | 12 ++++ ...endedStudentRepositoryIntegrationTest.java | 39 +++++++++++ .../repository/InMemoryDBIntegrationTest.java | 4 +- 11 files changed, 187 insertions(+), 8 deletions(-) create mode 100644 spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java create mode 100644 spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java create mode 100644 spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java create mode 100644 spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java rename spring-jpa/src/main/java/org/baeldung/{ => inmemory}/persistence/dao/StudentRepository.java (57%) rename spring-jpa/src/main/java/org/baeldung/{ => inmemory}/persistence/model/Student.java (91%) create mode 100644 spring-jpa/src/main/resources/persistence-student-h2.properties create mode 100644 spring-jpa/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index 6a67d44b48..960dcbc588 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -113,6 +113,11 @@ guava ${guava.version} + + org.assertj + assertj-core + ${assertj.version} + @@ -180,6 +185,7 @@ 21.0 3.5 + 3.8.0 4.4.5 4.5.2 diff --git a/spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java b/spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java new file mode 100644 index 0000000000..439c6cb602 --- /dev/null +++ b/spring-jpa/src/main/java/org/baeldung/config/StudentJPAH2Config.java @@ -0,0 +1,69 @@ +package org.baeldung.config; + +import java.util.Properties; + +import javax.persistence.EntityManagerFactory; +import javax.sql.DataSource; + +import org.baeldung.extended.persistence.dao.ExtendedRepositoryImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@Configuration +@EnableJpaRepositories(basePackages = "org.baeldung.extended.persistence.dao", repositoryBaseClass = ExtendedRepositoryImpl.class) +@PropertySource("persistence-student-h2.properties") +@EnableTransactionManagement +public class StudentJPAH2Config { + + @Autowired + private Environment env; + + @Bean + public DataSource dataSource() { + final DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName")); + dataSource.setUrl(env.getProperty("jdbc.url")); + dataSource.setUsername(env.getProperty("jdbc.user")); + dataSource.setPassword(env.getProperty("jdbc.pass")); + + return dataSource; + } + + @Bean + public LocalContainerEntityManagerFactoryBean entityManagerFactory() { + final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(dataSource()); + em.setPackagesToScan(new String[] { "org.baeldung.inmemory.persistence.model" }); + em.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); + em.setJpaProperties(additionalProperties()); + return em; + } + + @Bean + JpaTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) { + JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(entityManagerFactory); + return transactionManager; + } + + final Properties additionalProperties() { + final Properties hibernateProperties = new Properties(); + + hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto")); + hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect")); + hibernateProperties.setProperty("hibernate.show_sql", env.getProperty("hibernate.show_sql")); + hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache")); + hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache")); + + return hibernateProperties; + } +} diff --git a/spring-jpa/src/main/java/org/baeldung/config/StudentJpaConfig.java b/spring-jpa/src/main/java/org/baeldung/config/StudentJpaConfig.java index a40f180a62..8021691716 100644 --- a/spring-jpa/src/main/java/org/baeldung/config/StudentJpaConfig.java +++ b/spring-jpa/src/main/java/org/baeldung/config/StudentJpaConfig.java @@ -18,7 +18,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration -@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao") +@EnableJpaRepositories(basePackages = "org.baeldung.inmemory.persistence.dao") @PropertySource("persistence-student.properties") @EnableTransactionManagement public class StudentJpaConfig { @@ -41,7 +41,7 @@ public class StudentJpaConfig { public LocalContainerEntityManagerFactoryBean entityManagerFactory() { final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(dataSource()); - em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" }); + em.setPackagesToScan(new String[] { "org.baeldung.inmemory.persistence.model" }); em.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); em.setJpaProperties(additionalProperties()); return em; diff --git a/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java b/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java new file mode 100644 index 0000000000..9c9c12029a --- /dev/null +++ b/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepository.java @@ -0,0 +1,12 @@ +package org.baeldung.extended.persistence.dao; + +import java.io.Serializable; +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.repository.NoRepositoryBean; + +@NoRepositoryBean +public interface ExtendedRepository extends JpaRepository { + public List findByAttributeContainsText(String attributeName, String text); +} diff --git a/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java b/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java new file mode 100644 index 0000000000..0dd32757d7 --- /dev/null +++ b/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedRepositoryImpl.java @@ -0,0 +1,36 @@ +package org.baeldung.extended.persistence.dao; + +import java.io.Serializable; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.TypedQuery; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Root; +import javax.transaction.Transactional; + +import org.springframework.data.jpa.repository.support.JpaEntityInformation; +import org.springframework.data.jpa.repository.support.SimpleJpaRepository; + +public class ExtendedRepositoryImpl extends SimpleJpaRepository implements ExtendedRepository { + + private EntityManager entityManager; + + public ExtendedRepositoryImpl(JpaEntityInformation entityInformation, EntityManager entityManager) { + super(entityInformation, entityManager); + this.entityManager = entityManager; + } + + @Transactional + public List findByAttributeContainsText(String attributeName, String text) { + CriteriaBuilder builder = entityManager.getCriteriaBuilder(); + CriteriaQuery query = builder.createQuery(getDomainClass()); + Root root = query.from(getDomainClass()); + query.select(root) + .where(builder.like(root. get(attributeName), "%" + text + "%")); + TypedQuery q = entityManager.createQuery(query); + return q.getResultList(); + } + +} diff --git a/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java b/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java new file mode 100644 index 0000000000..7e2efc72bc --- /dev/null +++ b/spring-jpa/src/main/java/org/baeldung/extended/persistence/dao/ExtendedStudentRepository.java @@ -0,0 +1,6 @@ +package org.baeldung.extended.persistence.dao; + +import org.baeldung.inmemory.persistence.model.Student; + +public interface ExtendedStudentRepository extends ExtendedRepository { +} diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/dao/StudentRepository.java b/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/dao/StudentRepository.java similarity index 57% rename from spring-jpa/src/main/java/org/baeldung/persistence/dao/StudentRepository.java rename to spring-jpa/src/main/java/org/baeldung/inmemory/persistence/dao/StudentRepository.java index af484b442c..bfcf6f5cdc 100644 --- a/spring-jpa/src/main/java/org/baeldung/persistence/dao/StudentRepository.java +++ b/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/dao/StudentRepository.java @@ -1,8 +1,7 @@ -package org.baeldung.persistence.dao; +package org.baeldung.inmemory.persistence.dao; +import org.baeldung.inmemory.persistence.model.Student; import org.springframework.data.jpa.repository.JpaRepository; -import org.baeldung.persistence.model.Student; - public interface StudentRepository extends JpaRepository { } diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/model/Student.java b/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/model/Student.java similarity index 91% rename from spring-jpa/src/main/java/org/baeldung/persistence/model/Student.java rename to spring-jpa/src/main/java/org/baeldung/inmemory/persistence/model/Student.java index 437eeac5bb..b50fe9122e 100644 --- a/spring-jpa/src/main/java/org/baeldung/persistence/model/Student.java +++ b/spring-jpa/src/main/java/org/baeldung/inmemory/persistence/model/Student.java @@ -1,4 +1,4 @@ -package org.baeldung.persistence.model; +package org.baeldung.inmemory.persistence.model; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/spring-jpa/src/main/resources/persistence-student-h2.properties b/spring-jpa/src/main/resources/persistence-student-h2.properties new file mode 100644 index 0000000000..e1d6bfa45a --- /dev/null +++ b/spring-jpa/src/main/resources/persistence-student-h2.properties @@ -0,0 +1,12 @@ +# jdbc.X +jdbc.driverClassName=org.h2.Driver +jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 +jdbc.user=sa +# jdbc.pass= + +# hibernate.X +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=true +hibernate.hbm2ddl.auto=create-drop +hibernate.cache.use_second_level_cache=false +hibernate.cache.use_query_cache=false \ No newline at end of file diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java new file mode 100644 index 0000000000..0970daa0ee --- /dev/null +++ b/spring-jpa/src/test/java/org/baeldung/persistence/repository/ExtendedStudentRepositoryIntegrationTest.java @@ -0,0 +1,39 @@ +package org.baeldung.persistence.repository; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.List; + +import javax.annotation.Resource; + +import org.baeldung.config.StudentJPAH2Config; +import org.baeldung.extended.persistence.dao.ExtendedStudentRepository; +import org.baeldung.inmemory.persistence.model.Student; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { StudentJPAH2Config.class}) +public class ExtendedStudentRepositoryIntegrationTest { + @Resource + private ExtendedStudentRepository extendedStudentRepository; + + @Before + public void setup(){ + Student student = new Student(1, "john"); + extendedStudentRepository.save(student); + Student student2 = new Student(2, "johnson"); + extendedStudentRepository.save(student2); + Student student3 = new Student(3, "tom"); + extendedStudentRepository.save(student3); + } + + @Test + public void givenStudents_whenFindByName_thenGetOk(){ + List students = extendedStudentRepository.findByAttributeContainsText("name", "john"); + assertThat(students.size()).isEqualTo(2); + } +} diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java index 1fcc4be45d..8380ab5434 100644 --- a/spring-jpa/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java +++ b/spring-jpa/src/test/java/org/baeldung/persistence/repository/InMemoryDBIntegrationTest.java @@ -1,8 +1,8 @@ package org.baeldung.persistence.repository; import org.baeldung.config.StudentJpaConfig; -import org.baeldung.persistence.dao.StudentRepository; -import org.baeldung.persistence.model.Student; +import org.baeldung.inmemory.persistence.dao.StudentRepository; +import org.baeldung.inmemory.persistence.model.Student; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; From 1c896ec494ec84a1565ee3c748657ec258cb215a Mon Sep 17 00:00:00 2001 From: KevinGilmore Date: Mon, 23 Oct 2017 18:44:18 -0500 Subject: [PATCH 121/197] Update README (#2852) * BAEL-973: updated README * BAEL-1069: Updated README * BAEL-817: add README file * BAEL-1084: README update * BAEL-960: Update README * BAEL-1155: updated README * BAEL-1041: updated README * BAEL-973: Updated README --- asm/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/asm/README.md b/asm/README.md index ff12555376..50d9c34324 100644 --- a/asm/README.md +++ b/asm/README.md @@ -1 +1,3 @@ -## Relevant articles: +### Relevant Articles: + +- [A Guide to Java Bytecode Manipulation with ASM](http://www.baeldung.com/java-asm) From f4c346935295cd6365c11112f919ce8c1eef43e8 Mon Sep 17 00:00:00 2001 From: chrisoberle Date: Mon, 23 Oct 2017 19:55:12 -0400 Subject: [PATCH 122/197] update test method names per BAEL-1187 (#2851) * BAEL-1187 - Mapping Nested Values with Jackson * minor naming and formatting changes to align with standards * update formatting and jackson version * update test method names --- .../nested/DeserializeWithNestedPropertiesUnitTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java index 6e762caa64..037bc7e880 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java @@ -15,7 +15,7 @@ public class DeserializeWithNestedPropertiesUnitTest { private String SOURCE_JSON = "{\"id\":\"957c43f2-fa2e-42f9-bf75-6e3d5bb6960a\",\"name\":\"The Best Product\",\"brand\":{\"id\":\"9bcd817d-0141-42e6-8f04-e5aaab0980b6\",\"name\":\"ACME Products\",\"owner\":{\"id\":\"b21a80b1-0c09-4be3-9ebd-ea3653511c13\",\"name\":\"Ultimate Corp, Inc.\"}}}"; @Test - public void whenUsingJacksonAnnotations_thenOk() throws IOException { + public void whenUsingAnnotations_thenOk() throws IOException { Product product = new ObjectMapper().readerFor(Product.class) .readValue(SOURCE_JSON); @@ -25,7 +25,7 @@ public class DeserializeWithNestedPropertiesUnitTest { } @Test - public void whenUsingJacksonJsonNode_thenOk() throws IOException { + public void whenUsingJsonNode_thenOk() throws IOException { JsonNode productNode = new ObjectMapper().readTree(SOURCE_JSON); Product product = new Product(); @@ -47,7 +47,7 @@ public class DeserializeWithNestedPropertiesUnitTest { } @Test - public void whenUsingJacksonDeserializerManuallyRegistered_thenOk() throws IOException { + public void whenUsingDeserializerManuallyRegistered_thenOk() throws IOException { ObjectMapper mapper = new ObjectMapper(); SimpleModule module = new SimpleModule(); module.addDeserializer(Product.class, new ProductDeserializer()); @@ -60,7 +60,7 @@ public class DeserializeWithNestedPropertiesUnitTest { } @Test - public void whenUsingJacksonDeserializerAutoRegistered_thenOk() throws IOException { + public void whenUsingDeserializerAutoRegistered_thenOk() throws IOException { ObjectMapper mapper = new ObjectMapper(); Product product = mapper.readValue(SOURCE_JSON, Product.class); assertEquals(product.getName(), "The Best Product"); From 5d39af398fbf50777948741ca1a12951d492d381 Mon Sep 17 00:00:00 2001 From: deep20jain Date: Tue, 24 Oct 2017 09:06:28 +0530 Subject: [PATCH 123/197] BAEL 1143 - Edit Distance - deep20jain@gmail.com (#2718) * Calculate edit distance * Fixing formatting * Making variable local to method --- .../editdistance/EditDistanceBase.java | 22 +++++++++++++ .../EditDistanceDynamicProgramming.java | 25 +++++++++++++++ .../editdistance/EditDistanceRecursive.java | 20 ++++++++++++ .../EditDistanceDataProvider.java | 21 +++++++++++++ .../editdistance/EditDistanceTest.java | 31 +++++++++++++++++++ 5 files changed, 119 insertions(+) create mode 100644 algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java create mode 100644 algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java create mode 100644 algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java create mode 100644 algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java create mode 100644 algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java diff --git a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java new file mode 100644 index 0000000000..e884c576c1 --- /dev/null +++ b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java @@ -0,0 +1,22 @@ +package com.baeldung.algorithms.editdistance; + +public class EditDistanceBase { + + public static int costOfSubstitution(char a, char b) { + if (a == b) { + return 0; + } + return 1; + } + + public static int min(int... numbers) { + int min = Integer.MAX_VALUE; + + for (int x : numbers) { + if (x < min) + min = x; + } + + return min; + } +} diff --git a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java new file mode 100644 index 0000000000..163714002b --- /dev/null +++ b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java @@ -0,0 +1,25 @@ +package com.baeldung.algorithms.editdistance; + +public class EditDistanceDynamicProgramming extends EditDistanceBase { + + public static int calculate(String x, String y) { + int[][] dp = new int[x.length() + 1][y.length() + 1]; + + for (int i = 0; i <= x.length(); i++) { + for (int j = 0; j <= y.length(); j++) { + if (i == 0) + dp[i][j] = j; + + else if (j == 0) + dp[i][j] = i; + + else { + dp[i][j] = min(dp[i - 1][j - 1] + costOfSubstitution(x.charAt(i - 1), y.charAt(j - 1)), dp[i - 1][j] + 1, dp[i][j - 1] + 1); + } + } + } + + return dp[x.length()][y.length()]; + } + +} diff --git a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java new file mode 100644 index 0000000000..68e470147e --- /dev/null +++ b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java @@ -0,0 +1,20 @@ +package com.baeldung.algorithms.editdistance; + +public class EditDistanceRecursive extends EditDistanceBase { + + public static int calculate(String x, String y) { + + if (x.isEmpty()) + return y.length(); + + if (y.isEmpty()) + return x.length(); + + int substitution = calculate(x.substring(1), y.substring(1)) + costOfSubstitution(x.charAt(0), y.charAt(0)); + int insertion = calculate(x, y.substring(1)) + 1; + int deletion = calculate(x.substring(1), y) + 1; + + return min(substitution, insertion, deletion); + } + +} diff --git a/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java b/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java new file mode 100644 index 0000000000..89bd871616 --- /dev/null +++ b/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceDataProvider.java @@ -0,0 +1,21 @@ +package com.baeldung.algorithms.editdistance; + +import org.junit.runners.Parameterized.Parameters; + +import java.util.Arrays; +import java.util.Collection; + +public class EditDistanceDataProvider { + + @Parameters + public static Collection getLists() { + return Arrays.asList(new Object[][] { + { "", "", 0 }, + { "ago", "", 3 }, + { "", "do", 2 }, + { "abc", "adc", 1 }, + { "peek", "pesek", 1 }, + { "sunday", "saturday", 3 } + }); + } +} diff --git a/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java b/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java new file mode 100644 index 0000000000..1594f73a73 --- /dev/null +++ b/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java @@ -0,0 +1,31 @@ +package com.baeldung.algorithms.editdistance; + +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +@RunWith(Parameterized.class) +public class EditDistanceTest extends EditDistanceDataProvider { + + String x; + String y; + int result; + + public EditDistanceTest(String a, String b, int res) { + super(); + x = a; + y = b; + result = res; + } + + @Test + public void testEditDistance_RecursiveImplementation() { + Assert.assertEquals(result, EditDistanceRecursive.calculate(x, y)); + } + + @Test + public void testEditDistance_givenDynamicProgrammingImplementation() { + Assert.assertEquals(result, EditDistanceDynamicProgramming.calculate(x, y)); + } +} From a5e2357033cd5f14f31a226139dd2becd2628219 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Tue, 24 Oct 2017 18:47:40 +0200 Subject: [PATCH 124/197] BAEL-1250 Initializing Arrays in Java (#2811) * Evaluation article: Different Types of Bean Injection in Spring * added tests & changed configuration to Java-based config * removed xml config files * rename unit tests * BAEL-972 - Apache Commons Text * remove code from evaluation article * remove code from evaluation article * BAEL-972 - Apache Commons Text - added another example * BAEL-972 - Apache Commons Text - just indentation * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java - fix problems * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * fix formatting * BAEL-1033 minor refactor * BAEL-1035 Introduction to Eclipse Collections * format * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * cleanup * cleanup * BAEL-1109 Introduction to JCache * BAEL-1109 Introduction to JCache * remove unneeded property in pom.xml * fix formatting * close cache instances properly * remove latest commit * BAEL-1057 Introduction to rxjava-jdbc * refactor rxjava-jdbc * Refactor rxjava-jdbc * Refactoring rxjava-jdbc * BAEL-1171 java.lang.String API * refactor rxjava-jdbc * refactor String * String API - move multiple classes into a single class * move class into test package * BAEL-1171 String.lang.String API * BAEL-1171 java.lang.String API * BAEL-1250 Initializing Arrays in Java * BAEL-1250 Initializing Arrays in Java --- .../com/baeldung/array/ArrayInitializer.java | 74 +++++++++++++++++++ .../baeldung/array/ArrayInitializerTest.java | 68 +++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 core-java/src/main/java/com/baeldung/array/ArrayInitializer.java create mode 100644 core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java diff --git a/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java b/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java new file mode 100644 index 0000000000..fd00c74e7f --- /dev/null +++ b/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java @@ -0,0 +1,74 @@ +package com.baeldung.array; + +import java.util.Arrays; + +public class ArrayInitializer { + + public static int[] initializeArrayInLoop() { + int array[] = new int[5]; + for (int i = 0; i < array.length; i++) + array[i] = i + 2; + return array; + } + + public static int[][] initializeMultiDimensionalArrayInLoop() { + int array[][] = new int[2][5]; + for (int i = 0; i < 2; i++) + for (int j = 0; j < 5; j++) + array[i][j] = j + 1; + return array; + } + + public static String[] initializeArrayAtTimeOfDeclarationMethod1() { + String array[] = new String[] { "Toyota", "Mercedes", "BMW", "Volkswagen", "Skoda" }; + return array; + } + + public static int[] initializeArrayAtTimeOfDeclarationMethod2() { + int[] array = new int[] { 1, 2, 3, 4, 5 }; + return array; + } + + public static int[] initializeArrayAtTimeOfDeclarationMethod3() { + int array[] = { 1, 2, 3, 4, 5 }; + return array; + } + + public static long[] initializeArrayUsingArraysFill() { + long array[] = new long[5]; + Arrays.fill(array, 30); + return array; + } + + public static int[] initializeArrayRangeUsingArraysFill() { + int array[] = new int[5]; + Arrays.fill(array, 0, 3, -50); + return array; + } + + public static int[] initializeArrayUsingArraysCopy() { + int array[] = { 1, 2, 3, 4, 5 }; + int[] copy = Arrays.copyOf(array, 5); + return copy; + } + + public static int[] initializeLargerArrayUsingArraysCopy() { + int array[] = { 1, 2, 3, 4, 5 }; + int[] copy = Arrays.copyOf(array, 6); + return copy; + } + + public static int[] initializeArrayUsingArraysSetAll() { + int[] array = new int[20]; + + for (int i = 0; i < 20; i++) { + Arrays.setAll(array, p -> { + if (p > 9) + return 0; + else + return p; + }); + } + return array; + } +} diff --git a/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java b/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java new file mode 100644 index 0000000000..d3afad7b00 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java @@ -0,0 +1,68 @@ +package com.baeldung.array; + +import static com.baeldung.array.ArrayInitializer.initializeArrayAtTimeOfDeclarationMethod1; +import static com.baeldung.array.ArrayInitializer.initializeArrayAtTimeOfDeclarationMethod2; +import static com.baeldung.array.ArrayInitializer.initializeArrayAtTimeOfDeclarationMethod3; +import static com.baeldung.array.ArrayInitializer.initializeArrayInLoop; +import static com.baeldung.array.ArrayInitializer.initializeArrayRangeUsingArraysFill; +import static com.baeldung.array.ArrayInitializer.initializeArrayUsingArraysCopy; +import static com.baeldung.array.ArrayInitializer.initializeArrayUsingArraysFill; +import static com.baeldung.array.ArrayInitializer.initializeArrayUsingArraysSetAll; +import static com.baeldung.array.ArrayInitializer.initializeLargerArrayUsingArraysCopy; +import static com.baeldung.array.ArrayInitializer.initializeMultiDimensionalArrayInLoop; +import static org.junit.Assert.assertArrayEquals; + +import org.junit.Test; + +public class ArrayInitializerTest { + + @Test + public void whenInitializeArrayInLoop_thenCorrect() { + assertArrayEquals(new int[] { 2, 3, 4, 5, 6 }, initializeArrayInLoop()); + } + + @Test + public void whenInitializeMultiDimensionalArrayInLoop_thenCorrect() { + assertArrayEquals(new int[][] { { 1, 2, 3, 4, 5 }, { 1, 2, 3, 4, 5 } }, initializeMultiDimensionalArrayInLoop()); + } + + @Test + public void whenInitializeArrayAtTimeOfDeclarationMethod1_thenCorrect() { + assertArrayEquals(new String[] { "Toyota", "Mercedes", "BMW", "Volkswagen", "Skoda" }, initializeArrayAtTimeOfDeclarationMethod1()); + } + + @Test + public void whenInitializeArrayAtTimeOfDeclarationMethod2_thenCorrect() { + assertArrayEquals(new int[] { 1, 2, 3, 4, 5 }, initializeArrayAtTimeOfDeclarationMethod2()); + } + + @Test + public void whenInitializeArrayAtTimeOfDeclarationMethod3_thenCorrect() { + assertArrayEquals(new int[] { 1, 2, 3, 4, 5 }, initializeArrayAtTimeOfDeclarationMethod3()); + } + + @Test + public void whenInitializeArrayUsingArraysFill_thenCorrect() { + assertArrayEquals(new long[] { 30, 30, 30, 30, 30 }, initializeArrayUsingArraysFill()); + } + + @Test + public void whenInitializeArrayRangeUsingArraysFill_thenCorrect() { + assertArrayEquals(new int[] { -50, -50, -50, 0, 0 }, initializeArrayRangeUsingArraysFill()); + } + + @Test + public void whenInitializeArrayRangeUsingArraysCopy_thenCorrect() { + assertArrayEquals(new int[] { 1, 2, 3, 4, 5 }, initializeArrayUsingArraysCopy()); + } + + @Test + public void whenInitializeLargerArrayRangeUsingArraysCopy_thenCorrect() { + assertArrayEquals(new int[] { 1, 2, 3, 4, 5, 0 }, initializeLargerArrayUsingArraysCopy()); + } + + @Test + public void whenInitializeLargerArrayRangeUsingArraysSetAll_thenCorrect() { + assertArrayEquals(new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, initializeArrayUsingArraysSetAll()); + } +} From 1757625dba68416e150cf74e3b707f40d23d97f2 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 25 Oct 2017 12:08:34 +0200 Subject: [PATCH 125/197] Refactor Arrays (#2857) --- .../com/baeldung/array/ArrayInitializer.java | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java b/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java index fd00c74e7f..cd6d524ad2 100644 --- a/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java +++ b/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java @@ -4,71 +4,68 @@ import java.util.Arrays; public class ArrayInitializer { - public static int[] initializeArrayInLoop() { + static int[] initializeArrayInLoop() { int array[] = new int[5]; - for (int i = 0; i < array.length; i++) + for (int i = 0; i < array.length; i++) { array[i] = i + 2; + } return array; } - public static int[][] initializeMultiDimensionalArrayInLoop() { + static int[][] initializeMultiDimensionalArrayInLoop() { int array[][] = new int[2][5]; - for (int i = 0; i < 2; i++) - for (int j = 0; j < 5; j++) + for (int i = 0; i < 2; i++) { + for (int j = 0; j < 5; j++) { array[i][j] = j + 1; + } + } + return array; } - public static String[] initializeArrayAtTimeOfDeclarationMethod1() { - String array[] = new String[] { "Toyota", "Mercedes", "BMW", "Volkswagen", "Skoda" }; + static String[] initializeArrayAtTimeOfDeclarationMethod1() { + String array[] = new String[]{"Toyota", "Mercedes", "BMW", "Volkswagen", "Skoda"}; return array; } - public static int[] initializeArrayAtTimeOfDeclarationMethod2() { - int[] array = new int[] { 1, 2, 3, 4, 5 }; + static int[] initializeArrayAtTimeOfDeclarationMethod2() { + int[] array = new int[]{1, 2, 3, 4, 5}; return array; } - public static int[] initializeArrayAtTimeOfDeclarationMethod3() { - int array[] = { 1, 2, 3, 4, 5 }; + static int[] initializeArrayAtTimeOfDeclarationMethod3() { + int array[] = {1, 2, 3, 4, 5}; return array; } - public static long[] initializeArrayUsingArraysFill() { + static long[] initializeArrayUsingArraysFill() { long array[] = new long[5]; Arrays.fill(array, 30); return array; } - public static int[] initializeArrayRangeUsingArraysFill() { + static int[] initializeArrayRangeUsingArraysFill() { int array[] = new int[5]; Arrays.fill(array, 0, 3, -50); return array; } - public static int[] initializeArrayUsingArraysCopy() { - int array[] = { 1, 2, 3, 4, 5 }; + static int[] initializeArrayUsingArraysCopy() { + int array[] = {1, 2, 3, 4, 5}; int[] copy = Arrays.copyOf(array, 5); return copy; } - public static int[] initializeLargerArrayUsingArraysCopy() { - int array[] = { 1, 2, 3, 4, 5 }; + static int[] initializeLargerArrayUsingArraysCopy() { + int array[] = {1, 2, 3, 4, 5}; int[] copy = Arrays.copyOf(array, 6); return copy; } - public static int[] initializeArrayUsingArraysSetAll() { + static int[] initializeArrayUsingArraysSetAll() { int[] array = new int[20]; - for (int i = 0; i < 20; i++) { - Arrays.setAll(array, p -> { - if (p > 9) - return 0; - else - return p; - }); - } + Arrays.setAll(array, p -> p > 9 ? 0 : p); return array; } } From 864c2e21901e8dd433320a663fd05a312d0a5982 Mon Sep 17 00:00:00 2001 From: Buddhini Samarakkody Date: Wed, 25 Oct 2017 18:07:36 +0530 Subject: [PATCH 126/197] Code changes added for BAEL-656 (#2698) * BAEL-656 - Add new DAO interface and Impl classes * BAEL-656 - Add new model class * BAEL-656 - Add new Service class * BAEL-656 - Add configuration files * BAEL-656 - maven upgrade for tomcat-dbcp version * BAEL-656 - Add JUnit Test classes * BAEL-656 - upgrade tomcat-dbcp version * BAEL-656 - for update of tomcat-dbcp version * Delete exceptionDemoPersistanceConfig.xml * BAEL-656 - Add renamed file * Update NoHibernateSessBoundUsingAnnoSessionBeanMainIntegrationTest.java * Update NoHibernateSessBoundUsingLocalSessionBeanMainIntegrationTest.java --- spring-hibernate3/pom.xml | 4 +- .../baeldung/persistence/dao/EventDao.java | 18 ++++++ .../baeldung/persistence/dao/IEventDao.java | 9 +++ .../org/baeldung/persistence/model/Event.java | 45 ++++++++++++++ .../persistence/service/EventService.java | 27 +++++++++ .../baeldung/spring/PersistenceConfig.java | 4 +- .../src/main/resources/exceptionDemo.cfg.xml | 9 +++ .../exceptionDemoPersistenceConfig.xml | 58 +++++++++++++++++++ .../src/main/resources/persistenceConfig.xml | 4 +- ...ingAnnoSessionBeanMainIntegrationTest.java | 42 ++++++++++++++ ...ngLocalSessionBeanMainIntegrationTest.java | 39 +++++++++++++ 11 files changed, 253 insertions(+), 6 deletions(-) create mode 100644 spring-hibernate3/src/main/java/org/baeldung/persistence/dao/EventDao.java create mode 100644 spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IEventDao.java create mode 100644 spring-hibernate3/src/main/java/org/baeldung/persistence/model/Event.java create mode 100644 spring-hibernate3/src/main/java/org/baeldung/persistence/service/EventService.java create mode 100644 spring-hibernate3/src/main/resources/exceptionDemo.cfg.xml create mode 100644 spring-hibernate3/src/main/resources/exceptionDemoPersistenceConfig.xml create mode 100644 spring-hibernate3/src/test/java/org/baeldung/persistence/service/NoHibernateSessBoundUsingAnnoSessionBeanMainIntegrationTest.java create mode 100644 spring-hibernate3/src/test/java/org/baeldung/persistence/service/NoHibernateSessBoundUsingLocalSessionBeanMainIntegrationTest.java diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index d7607cac0a..c36b1c0522 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -141,7 +141,7 @@ 3.6.10.Final 5.1.40 - 7.0.73 + 8.5.8 1.4.193 @@ -162,4 +162,4 @@ - \ No newline at end of file + diff --git a/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/EventDao.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/EventDao.java new file mode 100644 index 0000000000..74da643f35 --- /dev/null +++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/EventDao.java @@ -0,0 +1,18 @@ +package org.baeldung.persistence.dao; + + +import org.baeldung.persistence.model.Event; +import org.springframework.stereotype.Repository; + +@Repository +public class EventDao extends AbstractHibernateDao implements IEventDao { + + public EventDao() { + super(); + + setClazz(Event.class); + } + + // API + +} diff --git a/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IEventDao.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IEventDao.java new file mode 100644 index 0000000000..f7be705905 --- /dev/null +++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IEventDao.java @@ -0,0 +1,9 @@ +package org.baeldung.persistence.dao; + +import org.baeldung.persistence.model.Event; + + + +public interface IEventDao extends IOperations { + // +} diff --git a/spring-hibernate3/src/main/java/org/baeldung/persistence/model/Event.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/model/Event.java new file mode 100644 index 0000000000..1d659ed75c --- /dev/null +++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/model/Event.java @@ -0,0 +1,45 @@ +package org.baeldung.persistence.model; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "EVENTS") +public class Event implements Serializable { + + @Id + @GeneratedValue + private Long id; + + private String description; + + public Event() { + } + + + public Event(String description) { + this.description = description; + } + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + } \ No newline at end of file diff --git a/spring-hibernate3/src/main/java/org/baeldung/persistence/service/EventService.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/service/EventService.java new file mode 100644 index 0000000000..6171751cc5 --- /dev/null +++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/service/EventService.java @@ -0,0 +1,27 @@ +package org.baeldung.persistence.service; + + +import org.baeldung.persistence.dao.IEventDao; +import org.baeldung.persistence.model.Event; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional +public class EventService { + + @Autowired + private IEventDao dao; + + public EventService() { + super(); + } + + // API + + public void create(final Event entity) { + dao.create(entity); + } + +} diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java index fea76dfc70..03b9bfac33 100644 --- a/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java +++ b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java @@ -4,7 +4,7 @@ import java.util.Properties; import javax.sql.DataSource; -import org.apache.tomcat.dbcp.dbcp.BasicDataSource; +import org.apache.tomcat.dbcp.dbcp2.BasicDataSource; import org.hibernate.SessionFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -75,4 +75,4 @@ public class PersistenceConfig { return hibernateProperties; } -} \ No newline at end of file +} diff --git a/spring-hibernate3/src/main/resources/exceptionDemo.cfg.xml b/spring-hibernate3/src/main/resources/exceptionDemo.cfg.xml new file mode 100644 index 0000000000..8a710cc559 --- /dev/null +++ b/spring-hibernate3/src/main/resources/exceptionDemo.cfg.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/spring-hibernate3/src/main/resources/exceptionDemoPersistenceConfig.xml b/spring-hibernate3/src/main/resources/exceptionDemoPersistenceConfig.xml new file mode 100644 index 0000000000..09314c67b1 --- /dev/null +++ b/spring-hibernate3/src/main/resources/exceptionDemoPersistenceConfig.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + classpath:exceptionDemo.cfg.xml + + + + ${hibernate.dialect} + true + create + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-hibernate3/src/main/resources/persistenceConfig.xml b/spring-hibernate3/src/main/resources/persistenceConfig.xml index 347e85ee51..e7ef9ad765 100644 --- a/spring-hibernate3/src/main/resources/persistenceConfig.xml +++ b/spring-hibernate3/src/main/resources/persistenceConfig.xml @@ -18,7 +18,7 @@ - + @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/spring-hibernate3/src/test/java/org/baeldung/persistence/service/NoHibernateSessBoundUsingAnnoSessionBeanMainIntegrationTest.java b/spring-hibernate3/src/test/java/org/baeldung/persistence/service/NoHibernateSessBoundUsingAnnoSessionBeanMainIntegrationTest.java new file mode 100644 index 0000000000..2b29dcb7a9 --- /dev/null +++ b/spring-hibernate3/src/test/java/org/baeldung/persistence/service/NoHibernateSessBoundUsingAnnoSessionBeanMainIntegrationTest.java @@ -0,0 +1,42 @@ +package org.baeldung.persistence.service; + +import org.baeldung.persistence.model.Event; +import org.baeldung.spring.PersistenceXmlConfig; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.orm.hibernate3.HibernateSystemException; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { PersistenceXmlConfig.class }, loader = AnnotationConfigContextLoader.class) +public class NoHibernateSessBoundUsingAnnoSessionBeanMainIntegrationTest { + + @Autowired + EventService service; + + @Rule + public ExpectedException expectedEx = ExpectedException.none(); + + @Test + public final void whenEntityIsCreated_thenNoExceptions() { + service.create(new Event("from Annotation Session Bean Factory")); + } + + @Test + @Ignore + public final void whenNoTransBoundToSession_thenException() { + expectedEx.expect(HibernateSystemException.class); + expectedEx.expectMessage("No Hibernate Session bound to thread, " + + "and configuration does not allow creation of " + + "non-transactional one here"); + service.create(new Event("from Annotation Session Bean Factory")); + } + +} diff --git a/spring-hibernate3/src/test/java/org/baeldung/persistence/service/NoHibernateSessBoundUsingLocalSessionBeanMainIntegrationTest.java b/spring-hibernate3/src/test/java/org/baeldung/persistence/service/NoHibernateSessBoundUsingLocalSessionBeanMainIntegrationTest.java new file mode 100644 index 0000000000..1bc6c07b18 --- /dev/null +++ b/spring-hibernate3/src/test/java/org/baeldung/persistence/service/NoHibernateSessBoundUsingLocalSessionBeanMainIntegrationTest.java @@ -0,0 +1,39 @@ +package org.baeldung.persistence.service; + +import org.baeldung.persistence.model.Event; +import org.hibernate.HibernateException; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.orm.hibernate3.HibernateSystemException; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = { "classpath:exceptionDemoPersistenceConfig.xml" }) +public class NoHibernateSessBoundUsingLocalSessionBeanMainIntegrationTest { + + @Autowired + EventService service; + + @Rule + public ExpectedException expectedEx = ExpectedException.none(); + + @Test + public final void whenEntityIsCreated_thenNoExceptions() { + service.create(new Event("from local session bean factory")); + } + + @Test + @Ignore + public final void whenNoTransBoundToSession_thenException() { + expectedEx.expect(HibernateException.class); + expectedEx.expectMessage("No Hibernate Session bound to thread, " + + "and configuration does not allow creation " + + "of non-transactional one here"); + service.create(new Event("from local session bean factory")); + } +} From 1c9477390d9c05fb6b651883f8c117d04261c66c Mon Sep 17 00:00:00 2001 From: Doha2012 Date: Wed, 25 Oct 2017 19:39:04 +0300 Subject: [PATCH 127/197] move query language to new module (#2864) * move security content from spring-security-rest-full * swagger update * move query language to new module * rename spring-security-rest-full to spring-rest-full --- pom.xml | 3 +- .../.gitignore | 0 .../README.md | 10 +- spring-rest-full/pom.xml | 378 ++++++++++++++++++ .../org/baeldung/persistence/IOperations.java | 0 .../org/baeldung/persistence/dao/IFooDao.java | 5 +- .../org/baeldung/persistence/model/Foo.java | 0 .../org/baeldung/persistence/model/User.java | 0 .../persistence/service/IFooService.java | 0 .../service/common/AbstractService.java | 0 .../persistence/service/impl/FooService.java | 0 .../java/org/baeldung/spring/Application.java | 2 +- .../baeldung/spring/PersistenceConfig.java | 0 .../java/org/baeldung/spring/WebConfig.java | 0 .../web/controller/FooController.java | 0 .../web/controller/HomeController.java | 0 .../web/controller/RootController.java | 0 .../RestResponseEntityExceptionHandler.java | 0 .../MyResourceNotFoundException.java | 0 .../event/PaginatedResultsRetrievedEvent.java | 0 .../hateoas/event/ResourceCreatedEvent.java | 0 .../event/SingleResourceRetrievedEvent.java | 0 ...sultsRetrievedDiscoverabilityListener.java | 0 ...esourceCreatedDiscoverabilityListener.java | 0 ...ourceRetrievedDiscoverabilityListener.java | 0 .../web/metric/ActuatorMetricService.java | 0 .../metric/CustomActuatorMetricService.java | 0 .../web/metric/IActuatorMetricService.java | 0 .../metric/ICustomActuatorMetricService.java | 0 .../baeldung/web/metric/IMetricService.java | 0 .../org/baeldung/web/metric/MetricFilter.java | 0 .../baeldung/web/metric/MetricService.java | 0 .../java/org/baeldung/web/util/LinkUtil.java | 0 .../baeldung/web/util/RestPreconditions.java | 0 .../src/main/resources/application.properties | 3 + .../src/main/resources/logback.xml | 0 .../main/resources/persistence-h2.properties | 0 .../resources/persistence-mysql.properties | 0 .../resources/springDataPersistenceConfig.xml | 0 .../src/main/webapp/WEB-INF/api-servlet.xml | 0 .../src/main/webapp/WEB-INF/view/graph.jsp | 0 .../src/main/webapp/WEB-INF/view/homepage.jsp | 0 .../src/main/webapp/WEB-INF/web.xml | 12 +- .../src/test/java/org/baeldung/Consts.java | 0 .../src/test/java/org/baeldung/TestSuite.java | 0 .../common/web/AbstractBasicLiveTest.java | 46 ++- .../web/AbstractDiscoverabilityLiveTest.java | 20 +- .../baeldung/common/web/AbstractLiveTest.java | 17 +- .../persistence/PersistenceTestSuite.java | 16 + ...ractServicePersistenceIntegrationTest.java | 0 .../FooServicePersistenceIntegrationTest.java | 0 .../java/org/baeldung/spring/ConfigTest.java | 0 .../java/org/baeldung/test/IMarshaller.java | 0 .../org/baeldung/test/JacksonMarshaller.java | 0 .../baeldung/test/TestMarshallerFactory.java | 0 .../org/baeldung/test/XStreamMarshaller.java | 0 .../test/java/org/baeldung/util/IDUtil.java | 0 .../web/FooDiscoverabilityLiveTest.java | 0 .../java/org/baeldung/web/FooLiveTest.java | 0 .../org/baeldung/web/FooPageableLiveTest.java | 32 +- .../java/org/baeldung/web/LiveTestSuite.java | 5 +- .../baeldung/web/util/HTTPLinkHeaderUtil.java | 0 .../src/test/resources/.gitignore | 0 spring-rest-query-language/.gitignore | 13 + spring-rest-query-language/README.md | 35 ++ .../pom.xml | 6 +- .../dao/GenericSpecificationsBuilder.java | 0 .../baeldung/persistence/dao/IUserDAO.java | 0 .../persistence/dao/MyUserPredicate.java | 0 .../dao/MyUserPredicatesBuilder.java | 0 .../persistence/dao/MyUserRepository.java | 0 .../org/baeldung/persistence/dao/UserDAO.java | 0 .../persistence/dao/UserRepository.java | 0 .../persistence/dao/UserSpecification.java | 0 .../dao/UserSpecificationsBuilder.java | 0 .../dao/rsql/CustomRsqlVisitor.java | 0 .../dao/rsql/GenericRsqlSpecBuilder.java | 0 .../dao/rsql/GenericRsqlSpecification.java | 0 .../dao/rsql/RsqlSearchOperation.java | 0 .../baeldung/persistence/model/MyUser.java | 0 .../org/baeldung/persistence/model/User.java | 94 +++++ .../org/baeldung/persistence/model/User_.java | 0 .../java/org/baeldung/spring/Application.java | 40 ++ .../baeldung/spring/PersistenceConfig.java | 85 ++++ .../java/org/baeldung/spring/WebConfig.java | 36 ++ .../web/controller/HomeController.java | 14 + .../web/controller/UserController.java | 0 .../RestResponseEntityExceptionHandler.java | 84 ++++ .../MyResourceNotFoundException.java | 21 + .../org/baeldung/web/util/CriteriaParser.java | 0 .../org/baeldung/web/util/SearchCriteria.java | 0 .../baeldung/web/util/SearchOperation.java | 0 .../baeldung/web/util/SpecSearchCriteria.java | 0 .../src/main/resources/application.properties | 2 + .../src/main/resources/data.sql | 0 .../src/main/resources/logback.xml | 19 + .../main/resources/persistence-h2.properties | 22 + .../resources/persistence-mysql.properties | 10 + .../resources/springDataPersistenceConfig.xml | 12 + .../src/main/webapp/WEB-INF/api-servlet.xml | 6 + .../src/main/webapp/WEB-INF/view/homepage.jsp | 7 + .../src/main/webapp/WEB-INF/web.xml | 42 ++ .../JPACriteriaQueryIntegrationTest.java | 0 .../query/JPAQuerydslIntegrationTest.java | 0 .../JPASpecificationIntegrationTest.java | 0 .../query/JPASpecificationLiveTest.java | 39 +- .../query/RsqlIntegrationTest.java | 0 .../java/org/baeldung/web/MyUserLiveTest.java | 9 +- .../src/test/resources/.gitignore | 13 + spring-security-rest-full/.springBeans | 17 - .../src/main/resources/application.properties | 3 - .../persistence/PersistenceTestSuite.java | 22 - 112 files changed, 1050 insertions(+), 150 deletions(-) rename {spring-security-rest-full => spring-rest-full}/.gitignore (100%) rename {spring-security-rest-full => spring-rest-full}/README.md (65%) create mode 100644 spring-rest-full/pom.xml rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/persistence/IOperations.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/persistence/dao/IFooDao.java (69%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/persistence/model/Foo.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/persistence/model/User.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/persistence/service/IFooService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/persistence/service/common/AbstractService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/persistence/service/impl/FooService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/spring/Application.java (98%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/spring/PersistenceConfig.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/spring/WebConfig.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/controller/FooController.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/controller/HomeController.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/controller/RootController.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/hateoas/event/ResourceCreatedEvent.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/metric/IMetricService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/metric/MetricFilter.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/metric/MetricService.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/util/LinkUtil.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/java/org/baeldung/web/util/RestPreconditions.java (100%) create mode 100644 spring-rest-full/src/main/resources/application.properties rename {spring-security-rest-full => spring-rest-full}/src/main/resources/logback.xml (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/resources/persistence-h2.properties (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/resources/persistence-mysql.properties (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/resources/springDataPersistenceConfig.xml (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/webapp/WEB-INF/api-servlet.xml (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/webapp/WEB-INF/view/graph.jsp (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/webapp/WEB-INF/view/homepage.jsp (100%) rename {spring-security-rest-full => spring-rest-full}/src/main/webapp/WEB-INF/web.xml (81%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/Consts.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/TestSuite.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java (73%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java (76%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/common/web/AbstractLiveTest.java (79%) create mode 100644 spring-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/spring/ConfigTest.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/test/IMarshaller.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/test/JacksonMarshaller.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/test/TestMarshallerFactory.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/test/XStreamMarshaller.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/util/IDUtil.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/web/FooDiscoverabilityLiveTest.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/web/FooLiveTest.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/web/FooPageableLiveTest.java (88%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/web/LiveTestSuite.java (60%) rename {spring-security-rest-full => spring-rest-full}/src/test/java/org/baeldung/web/util/HTTPLinkHeaderUtil.java (100%) rename {spring-security-rest-full => spring-rest-full}/src/test/resources/.gitignore (100%) create mode 100644 spring-rest-query-language/.gitignore create mode 100644 spring-rest-query-language/README.md rename {spring-security-rest-full => spring-rest-query-language}/pom.xml (98%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/GenericSpecificationsBuilder.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/IUserDAO.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/UserDAO.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/UserRepository.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/UserSpecification.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/UserSpecificationsBuilder.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/rsql/CustomRsqlVisitor.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecBuilder.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/model/MyUser.java (100%) create mode 100644 spring-rest-query-language/src/main/java/org/baeldung/persistence/model/User.java rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/persistence/model/User_.java (100%) create mode 100644 spring-rest-query-language/src/main/java/org/baeldung/spring/Application.java create mode 100644 spring-rest-query-language/src/main/java/org/baeldung/spring/PersistenceConfig.java create mode 100644 spring-rest-query-language/src/main/java/org/baeldung/spring/WebConfig.java create mode 100644 spring-rest-query-language/src/main/java/org/baeldung/web/controller/HomeController.java rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/web/controller/UserController.java (100%) create mode 100644 spring-rest-query-language/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java create mode 100644 spring-rest-query-language/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/web/util/CriteriaParser.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/web/util/SearchCriteria.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/web/util/SearchOperation.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/main/java/org/baeldung/web/util/SpecSearchCriteria.java (100%) create mode 100644 spring-rest-query-language/src/main/resources/application.properties rename {spring-security-rest-full => spring-rest-query-language}/src/main/resources/data.sql (100%) create mode 100644 spring-rest-query-language/src/main/resources/logback.xml create mode 100644 spring-rest-query-language/src/main/resources/persistence-h2.properties create mode 100644 spring-rest-query-language/src/main/resources/persistence-mysql.properties create mode 100644 spring-rest-query-language/src/main/resources/springDataPersistenceConfig.xml create mode 100644 spring-rest-query-language/src/main/webapp/WEB-INF/api-servlet.xml create mode 100644 spring-rest-query-language/src/main/webapp/WEB-INF/view/homepage.jsp create mode 100644 spring-rest-query-language/src/main/webapp/WEB-INF/web.xml rename {spring-security-rest-full => spring-rest-query-language}/src/test/java/org/baeldung/persistence/query/JPACriteriaQueryIntegrationTest.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/test/java/org/baeldung/persistence/query/JPAQuerydslIntegrationTest.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/test/java/org/baeldung/persistence/query/JPASpecificationIntegrationTest.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java (78%) rename {spring-security-rest-full => spring-rest-query-language}/src/test/java/org/baeldung/persistence/query/RsqlIntegrationTest.java (100%) rename {spring-security-rest-full => spring-rest-query-language}/src/test/java/org/baeldung/web/MyUserLiveTest.java (94%) create mode 100644 spring-rest-query-language/src/test/resources/.gitignore delete mode 100644 spring-security-rest-full/.springBeans delete mode 100644 spring-security-rest-full/src/main/resources/application.properties delete mode 100644 spring-security-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java diff --git a/pom.xml b/pom.xml index 3d28707b5f..4f10c31ae3 100644 --- a/pom.xml +++ b/pom.xml @@ -192,6 +192,8 @@ spring-quartz spring-rest-angular spring-rest-docs + spring-rest-full + spring-rest-query-language spring-rest spring-rest-simple spring-security-cache-control @@ -213,7 +215,6 @@ spring-security-mvc-socket spring-security-rest-basic-auth spring-security-rest-custom - spring-security-rest-full spring-security-rest spring-security-sso spring-security-x509 diff --git a/spring-security-rest-full/.gitignore b/spring-rest-full/.gitignore similarity index 100% rename from spring-security-rest-full/.gitignore rename to spring-rest-full/.gitignore diff --git a/spring-security-rest-full/README.md b/spring-rest-full/README.md similarity index 65% rename from spring-security-rest-full/README.md rename to spring-rest-full/README.md index 2737bd5465..a1fea806ef 100644 --- a/spring-security-rest-full/README.md +++ b/spring-rest-full/README.md @@ -1,6 +1,6 @@ ========= -## REST Example Project with Spring Security +## REST Example Project with Spring ### Courses The "REST With Spring" Classes: http://bit.ly/restwithspring @@ -15,15 +15,9 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com - [Integration Testing with the Maven Cargo plugin](http://www.baeldung.com/2011/10/16/how-to-set-up-integration-testing-with-the-maven-cargo-plugin/) - [Introduction to Spring Data JPA](http://www.baeldung.com/2011/12/22/the-persistence-layer-with-spring-data-jpa/) - [Project Configuration with Spring](http://www.baeldung.com/2012/03/12/project-configuration-with-spring/) -- [REST Query Language with Spring and JPA Criteria](http://www.baeldung.com/rest-search-language-spring-jpa-criteria) -- [REST Query Language with Spring Data JPA Specifications](http://www.baeldung.com/rest-api-search-language-spring-data-specifications) -- [REST Query Language with Spring Data JPA and QueryDSL](http://www.baeldung.com/rest-api-search-language-spring-data-querydsl) -- [REST Query Language – Advanced Search Operations](http://www.baeldung.com/rest-api-query-search-language-more-operations) - [Metrics for your Spring REST API](http://www.baeldung.com/spring-rest-api-metrics) -- [REST Query Language with RSQL](http://www.baeldung.com/rest-api-search-language-rsql-fiql) - [Spring RestTemplate Tutorial](http://www.baeldung.com/rest-template) - [Bootstrap a Web Application with Spring 4](http://www.baeldung.com/bootstraping-a-web-application-with-spring-and-java-based-configuration) -- [REST Query Language – Implementing OR Operation](http://www.baeldung.com/rest-api-query-search-or-operation) @@ -46,5 +40,5 @@ mysql -u root -p ### Use the REST Service ``` -curl http://localhost:8080/spring-security-rest-full/foos +curl http://localhost:8080/spring-rest-full/foos ``` diff --git a/spring-rest-full/pom.xml b/spring-rest-full/pom.xml new file mode 100644 index 0000000000..c596e79b31 --- /dev/null +++ b/spring-rest-full/pom.xml @@ -0,0 +1,378 @@ + + 4.0.0 + com.baeldung + spring-rest-full + 0.1-SNAPSHOT + + spring-rest-full + war + + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.aspectj + aspectjweaver + + + + org.apache.tomcat.embed + tomcat-embed-jasper + provided + + + + + + org.springframework + spring-core + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + + + org.springframework + spring-jdbc + + + org.springframework + spring-beans + + + org.springframework + spring-aop + + + org.springframework + spring-tx + + + org.springframework + spring-expression + + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + + org.springframework.data + spring-data-commons + + + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + + + + org.apache.httpcomponents + httpclient + + + commons-logging + commons-logging + + + + + org.apache.httpcomponents + httpcore + + + + + + org.springframework + spring-orm + + + org.springframework.data + spring-data-jpa + + + org.hibernate + hibernate-entitymanager + + + xml-apis + xml-apis + + + org.javassist + javassist + + + mysql + mysql-connector-java + runtime + + + + com.h2database + h2 + + + + + + javax.servlet + javax.servlet-api + provided + + + + javax.servlet + jstl + runtime + + + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.thoughtworks.xstream + xstream + ${xstream.version} + + + + + + com.google.guava + guava + ${guava.version} + + + + + + org.springframework + spring-test + test + + + + + + + + + + org.hamcrest + hamcrest-library + test + + + + org.mockito + mockito-core + test + + + + + + spring-rest-full + + + src/main/resources + true + + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + + + + + + com.mysema.maven + apt-maven-plugin + ${apt-maven-plugin.version} + + + + process + + + target/generated-sources/java + com.querydsl.apt.jpa.JPAAnnotationProcessor + + + + + + + + + + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*IntegrationTest.java + + + **/*LiveTest.java + + + + + + + json + + + + + org.codehaus.cargo + cargo-maven2-plugin + + false + + + + start-server + pre-integration-test + + start + + + + stop-server + post-integration-test + + stop + + + + + + + + + + + + + 1.4.9 + + + 19.0 + 3.5 + + + 1.6.1 + 1.1.3 + + + \ No newline at end of file diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/IOperations.java b/spring-rest-full/src/main/java/org/baeldung/persistence/IOperations.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/IOperations.java rename to spring-rest-full/src/main/java/org/baeldung/persistence/IOperations.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/spring-rest-full/src/main/java/org/baeldung/persistence/dao/IFooDao.java similarity index 69% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/IFooDao.java rename to spring-rest-full/src/main/java/org/baeldung/persistence/dao/IFooDao.java index 824d6ea546..230abd0d5f 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/IFooDao.java +++ b/spring-rest-full/src/main/java/org/baeldung/persistence/dao/IFooDao.java @@ -2,13 +2,10 @@ package org.baeldung.persistence.dao; import org.baeldung.persistence.model.Foo; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; - -public interface IFooDao extends JpaRepository, JpaSpecificationExecutor { +public interface IFooDao extends JpaRepository { @Query("SELECT f FROM Foo f WHERE LOWER(f.name) = LOWER(:name)") Foo retrieveByName(@Param("name") String name); - } diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/model/Foo.java b/spring-rest-full/src/main/java/org/baeldung/persistence/model/Foo.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/model/Foo.java rename to spring-rest-full/src/main/java/org/baeldung/persistence/model/Foo.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/model/User.java b/spring-rest-full/src/main/java/org/baeldung/persistence/model/User.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/model/User.java rename to spring-rest-full/src/main/java/org/baeldung/persistence/model/User.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java b/spring-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java rename to spring-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java b/spring-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java rename to spring-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java rename to spring-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java b/spring-rest-full/src/main/java/org/baeldung/spring/Application.java similarity index 98% rename from spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java rename to spring-rest-full/src/main/java/org/baeldung/spring/Application.java index a43b21c2b7..9a3f473b8b 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java +++ b/spring-rest-full/src/main/java/org/baeldung/spring/Application.java @@ -16,7 +16,7 @@ import org.springframework.web.filter.ShallowEtagHeaderFilter; /** * Main Application Class - uses Spring Boot. Just run this as a normal Java - * class to run up a Jetty Server (on http://localhost:8082/spring-security-rest-full) + * class to run up a Jetty Server (on http://localhost:8082/spring-rest-full) * */ @EnableScheduling diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java rename to spring-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java b/spring-rest-full/src/main/java/org/baeldung/spring/WebConfig.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java rename to spring-rest-full/src/main/java/org/baeldung/spring/WebConfig.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/FooController.java b/spring-rest-full/src/main/java/org/baeldung/web/controller/FooController.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/controller/FooController.java rename to spring-rest-full/src/main/java/org/baeldung/web/controller/FooController.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/HomeController.java b/spring-rest-full/src/main/java/org/baeldung/web/controller/HomeController.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/controller/HomeController.java rename to spring-rest-full/src/main/java/org/baeldung/web/controller/HomeController.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/RootController.java b/spring-rest-full/src/main/java/org/baeldung/web/controller/RootController.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/controller/RootController.java rename to spring-rest-full/src/main/java/org/baeldung/web/controller/RootController.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java b/spring-rest-full/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java rename to spring-rest-full/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java b/spring-rest-full/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java rename to spring-rest-full/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java b/spring-rest-full/src/main/java/org/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java rename to spring-rest-full/src/main/java/org/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/event/ResourceCreatedEvent.java b/spring-rest-full/src/main/java/org/baeldung/web/hateoas/event/ResourceCreatedEvent.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/event/ResourceCreatedEvent.java rename to spring-rest-full/src/main/java/org/baeldung/web/hateoas/event/ResourceCreatedEvent.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java b/spring-rest-full/src/main/java/org/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java rename to spring-rest-full/src/main/java/org/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java b/spring-rest-full/src/main/java/org/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java rename to spring-rest-full/src/main/java/org/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java b/spring-rest-full/src/main/java/org/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java rename to spring-rest-full/src/main/java/org/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java b/spring-rest-full/src/main/java/org/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java rename to spring-rest-full/src/main/java/org/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java rename to spring-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java rename to spring-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java rename to spring-rest-full/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java rename to spring-rest-full/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/metric/IMetricService.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/IMetricService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/metric/IMetricService.java rename to spring-rest-full/src/main/java/org/baeldung/web/metric/IMetricService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/metric/MetricFilter.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/MetricFilter.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/metric/MetricFilter.java rename to spring-rest-full/src/main/java/org/baeldung/web/metric/MetricFilter.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/metric/MetricService.java b/spring-rest-full/src/main/java/org/baeldung/web/metric/MetricService.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/metric/MetricService.java rename to spring-rest-full/src/main/java/org/baeldung/web/metric/MetricService.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/util/LinkUtil.java b/spring-rest-full/src/main/java/org/baeldung/web/util/LinkUtil.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/util/LinkUtil.java rename to spring-rest-full/src/main/java/org/baeldung/web/util/LinkUtil.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/util/RestPreconditions.java b/spring-rest-full/src/main/java/org/baeldung/web/util/RestPreconditions.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/util/RestPreconditions.java rename to spring-rest-full/src/main/java/org/baeldung/web/util/RestPreconditions.java diff --git a/spring-rest-full/src/main/resources/application.properties b/spring-rest-full/src/main/resources/application.properties new file mode 100644 index 0000000000..6c7461f12c --- /dev/null +++ b/spring-rest-full/src/main/resources/application.properties @@ -0,0 +1,3 @@ +server.port=8082 +server.context-path=/spring-rest-full +endpoints.metrics.enabled=true \ No newline at end of file diff --git a/spring-security-rest-full/src/main/resources/logback.xml b/spring-rest-full/src/main/resources/logback.xml similarity index 100% rename from spring-security-rest-full/src/main/resources/logback.xml rename to spring-rest-full/src/main/resources/logback.xml diff --git a/spring-security-rest-full/src/main/resources/persistence-h2.properties b/spring-rest-full/src/main/resources/persistence-h2.properties similarity index 100% rename from spring-security-rest-full/src/main/resources/persistence-h2.properties rename to spring-rest-full/src/main/resources/persistence-h2.properties diff --git a/spring-security-rest-full/src/main/resources/persistence-mysql.properties b/spring-rest-full/src/main/resources/persistence-mysql.properties similarity index 100% rename from spring-security-rest-full/src/main/resources/persistence-mysql.properties rename to spring-rest-full/src/main/resources/persistence-mysql.properties diff --git a/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml b/spring-rest-full/src/main/resources/springDataPersistenceConfig.xml similarity index 100% rename from spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml rename to spring-rest-full/src/main/resources/springDataPersistenceConfig.xml diff --git a/spring-security-rest-full/src/main/webapp/WEB-INF/api-servlet.xml b/spring-rest-full/src/main/webapp/WEB-INF/api-servlet.xml similarity index 100% rename from spring-security-rest-full/src/main/webapp/WEB-INF/api-servlet.xml rename to spring-rest-full/src/main/webapp/WEB-INF/api-servlet.xml diff --git a/spring-security-rest-full/src/main/webapp/WEB-INF/view/graph.jsp b/spring-rest-full/src/main/webapp/WEB-INF/view/graph.jsp similarity index 100% rename from spring-security-rest-full/src/main/webapp/WEB-INF/view/graph.jsp rename to spring-rest-full/src/main/webapp/WEB-INF/view/graph.jsp diff --git a/spring-security-rest-full/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-rest-full/src/main/webapp/WEB-INF/view/homepage.jsp similarity index 100% rename from spring-security-rest-full/src/main/webapp/WEB-INF/view/homepage.jsp rename to spring-rest-full/src/main/webapp/WEB-INF/view/homepage.jsp diff --git a/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml b/spring-rest-full/src/main/webapp/WEB-INF/web.xml similarity index 81% rename from spring-security-rest-full/src/main/webapp/WEB-INF/web.xml rename to spring-rest-full/src/main/webapp/WEB-INF/web.xml index 49e4d1afa1..85bc72469e 100644 --- a/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml +++ b/spring-rest-full/src/main/webapp/WEB-INF/web.xml @@ -5,7 +5,7 @@ http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0" > - Spring Security REST Application + Spring REST Application @@ -43,16 +43,6 @@ / - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - - metricFilter diff --git a/spring-security-rest-full/src/test/java/org/baeldung/Consts.java b/spring-rest-full/src/test/java/org/baeldung/Consts.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/Consts.java rename to spring-rest-full/src/test/java/org/baeldung/Consts.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/TestSuite.java b/spring-rest-full/src/test/java/org/baeldung/TestSuite.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/TestSuite.java rename to spring-rest-full/src/test/java/org/baeldung/TestSuite.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java b/spring-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java similarity index 73% rename from spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java rename to spring-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java index 2cc0aa7b28..4e0007d036 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java +++ b/spring-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java @@ -10,6 +10,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import io.restassured.RestAssured; +import io.restassured.response.Response; import java.io.Serializable; import java.util.List; @@ -18,7 +20,6 @@ import org.junit.Ignore; import org.junit.Test; import com.google.common.net.HttpHeaders; -import io.restassured.response.Response; public abstract class AbstractBasicLiveTest extends AbstractLiveTest { @@ -34,7 +35,9 @@ public abstract class AbstractBasicLiveTest extends Abst final String uriOfResource = createAsUri(); // When - final Response findOneResponse = givenAuth().header("Accept", "application/json").get(uriOfResource); + final Response findOneResponse = RestAssured.given() + .header("Accept", "application/json") + .get(uriOfResource); // Then assertNotNull(findOneResponse.getHeader(HttpHeaders.ETAG)); @@ -44,11 +47,16 @@ public abstract class AbstractBasicLiveTest extends Abst public void givenResourceWasRetrieved_whenRetrievingAgainWithEtag_thenNotModifiedReturned() { // Given final String uriOfResource = createAsUri(); - final Response findOneResponse = givenAuth().header("Accept", "application/json").get(uriOfResource); + final Response findOneResponse = RestAssured.given() + .header("Accept", "application/json") + .get(uriOfResource); final String etagValue = findOneResponse.getHeader(HttpHeaders.ETAG); // When - final Response secondFindOneResponse = givenAuth().header("Accept", "application/json").headers("If-None-Match", etagValue).get(uriOfResource); + final Response secondFindOneResponse = RestAssured.given() + .header("Accept", "application/json") + .headers("If-None-Match", etagValue) + .get(uriOfResource); // Then assertTrue(secondFindOneResponse.getStatusCode() == 304); @@ -59,14 +67,19 @@ public abstract class AbstractBasicLiveTest extends Abst public void givenResourceWasRetrievedThenModified_whenRetrievingAgainWithEtag_thenResourceIsReturned() { // Given final String uriOfResource = createAsUri(); - final Response findOneResponse = givenAuth().header("Accept", "application/json").get(uriOfResource); + final Response findOneResponse = RestAssured.given() + .header("Accept", "application/json") + .get(uriOfResource); final String etagValue = findOneResponse.getHeader(HttpHeaders.ETAG); // existingResource.setName(randomAlphabetic(6)); // getApi().update(existingResource.setName("randomString")); // When - final Response secondFindOneResponse = givenAuth().header("Accept", "application/json").headers("If-None-Match", etagValue).get(uriOfResource); + final Response secondFindOneResponse = RestAssured.given() + .header("Accept", "application/json") + .headers("If-None-Match", etagValue) + .get(uriOfResource); // Then assertTrue(secondFindOneResponse.getStatusCode() == 200); @@ -79,7 +92,10 @@ public abstract class AbstractBasicLiveTest extends Abst final String uriOfResource = createAsUri(); // When - final Response findOneResponse = givenAuth().header("Accept", "application/json").headers("If-Match", randomAlphabetic(8)).get(uriOfResource); + final Response findOneResponse = RestAssured.given() + .header("Accept", "application/json") + .headers("If-Match", randomAlphabetic(8)) + .get(uriOfResource); // Then assertTrue(findOneResponse.getStatusCode() == 412); @@ -93,7 +109,7 @@ public abstract class AbstractBasicLiveTest extends Abst @Test public void whenResourcesAreRetrievedPaged_then200IsReceived() { - final Response response = givenAuth().get(getURL() + "?page=0&size=10"); + final Response response = RestAssured.get(getURL() + "?page=0&size=10"); assertThat(response.getStatusCode(), is(200)); } @@ -101,7 +117,7 @@ public abstract class AbstractBasicLiveTest extends Abst @Test public void whenPageOfResourcesAreRetrievedOutOfBounds_then404IsReceived() { final String url = getURL() + "?page=" + randomNumeric(5) + "&size=10"; - final Response response = givenAuth().get(url); + final Response response = RestAssured.get(url); assertThat(response.getStatusCode(), is(404)); } @@ -110,14 +126,14 @@ public abstract class AbstractBasicLiveTest extends Abst public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() { create(); - final Response response = givenAuth().get(getURL() + "?page=0&size=10"); + final Response response = RestAssured.get(getURL() + "?page=0&size=10"); assertFalse(response.body().as(List.class).isEmpty()); } @Test public void whenFirstPageOfResourcesAreRetrieved_thenSecondPageIsNext() { - final Response response = givenAuth().get(getURL() + "?page=0&size=2"); + final Response response = RestAssured.get(getURL() + "?page=0&size=2"); final String uriToNextPage = extractURIByRel(response.getHeader(HttpHeaders.LINK), "next"); assertEquals(getURL() + "?page=1&size=2", uriToNextPage); @@ -125,7 +141,7 @@ public abstract class AbstractBasicLiveTest extends Abst @Test public void whenFirstPageOfResourcesAreRetrieved_thenNoPreviousPage() { - final Response response = givenAuth().get(getURL() + "?page=0&size=2"); + final Response response = RestAssured.get(getURL() + "?page=0&size=2"); final String uriToPrevPage = extractURIByRel(response.getHeader(HttpHeaders.LINK), "prev"); assertNull(uriToPrevPage); @@ -136,7 +152,7 @@ public abstract class AbstractBasicLiveTest extends Abst create(); create(); - final Response response = givenAuth().get(getURL() + "?page=1&size=2"); + final Response response = RestAssured.get(getURL() + "?page=1&size=2"); final String uriToPrevPage = extractURIByRel(response.getHeader(HttpHeaders.LINK), "prev"); assertEquals(getURL() + "?page=0&size=2", uriToPrevPage); @@ -144,10 +160,10 @@ public abstract class AbstractBasicLiveTest extends Abst @Test public void whenLastPageOfResourcesIsRetrieved_thenNoNextPageIsDiscoverable() { - final Response first = givenAuth().get(getURL() + "?page=0&size=2"); + final Response first = RestAssured.get(getURL() + "?page=0&size=2"); final String uriToLastPage = extractURIByRel(first.getHeader(HttpHeaders.LINK), "last"); - final Response response = givenAuth().get(uriToLastPage); + final Response response = RestAssured.get(uriToLastPage); final String uriToNextPage = extractURIByRel(response.getHeader(HttpHeaders.LINK), "next"); assertNull(uriToNextPage); diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java b/spring-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java similarity index 76% rename from spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java rename to spring-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java index e7456f1667..c2dd3d84c7 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java +++ b/spring-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java @@ -5,6 +5,8 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; +import io.restassured.RestAssured; +import io.restassured.response.Response; import java.io.Serializable; @@ -15,7 +17,6 @@ import org.junit.Test; import org.springframework.http.MediaType; import com.google.common.net.HttpHeaders; -import io.restassured.response.Response; public abstract class AbstractDiscoverabilityLiveTest extends AbstractLiveTest { @@ -33,7 +34,7 @@ public abstract class AbstractDiscoverabilityLiveTest ex final String uriOfExistingResource = createAsUri(); // When - final Response res = givenAuth().post(uriOfExistingResource); + final Response res = RestAssured.post(uriOfExistingResource); // Then final String allowHeader = res.getHeader(HttpHeaders.ALLOW); @@ -44,11 +45,16 @@ public abstract class AbstractDiscoverabilityLiveTest ex public void whenResourceIsCreated_thenUriOfTheNewlyCreatedResourceIsDiscoverable() { // When final Foo newResource = new Foo(randomAlphabetic(6)); - final Response createResp = givenAuth().contentType(MediaType.APPLICATION_JSON_VALUE).body(newResource).post(getURL()); + final Response createResp = RestAssured.given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(newResource) + .post(getURL()); final String uriOfNewResource = createResp.getHeader(HttpHeaders.LOCATION); // Then - final Response response = givenAuth().header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).get(uriOfNewResource); + final Response response = RestAssured.given() + .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE) + .get(uriOfNewResource); final Foo resourceFromServer = response.body().as(Foo.class); assertThat(newResource, equalTo(resourceFromServer)); @@ -60,13 +66,13 @@ public abstract class AbstractDiscoverabilityLiveTest ex final String uriOfExistingResource = createAsUri(); // When - final Response getResponse = givenAuth().get(uriOfExistingResource); + final Response getResponse = RestAssured.get(uriOfExistingResource); // Then final String uriToAllResources = HTTPLinkHeaderUtil.extractURIByRel(getResponse.getHeader("Link"), "collection"); - final Response getAllResponse = givenAuth().get(uriToAllResources); - assertThat(getAllResponse.getStatusCode(), is(403)); + final Response getAllResponse = RestAssured.get(uriToAllResources); + assertThat(getAllResponse.getStatusCode(), is(200)); } // template method diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java b/spring-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java similarity index 79% rename from spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java rename to spring-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java index 72dbcedc64..5aa0f5a768 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java +++ b/spring-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java @@ -1,6 +1,8 @@ package org.baeldung.common.web; import static org.baeldung.Consts.APPLICATION_PORT; +import io.restassured.RestAssured; +import io.restassured.response.Response; import java.io.Serializable; @@ -9,9 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired; import com.google.common.base.Preconditions; import com.google.common.net.HttpHeaders; -import io.restassured.RestAssured; -import io.restassured.response.Response; -import io.restassured.specification.RequestSpecification; public abstract class AbstractLiveTest { @@ -48,20 +47,18 @@ public abstract class AbstractLiveTest { final Response createAsResponse(final T resource) { Preconditions.checkNotNull(resource); - final RequestSpecification givenAuthenticated = givenAuth(); final String resourceAsString = marshaller.encode(resource); - return givenAuthenticated.contentType(marshaller.getMime()).body(resourceAsString).post(getURL()); + return RestAssured.given() + .contentType(marshaller.getMime()) + .body(resourceAsString) + .post(getURL()); } // protected String getURL() { - return "http://localhost:" + APPLICATION_PORT + "/spring-security-rest-full/auth/foos"; - } - - protected final RequestSpecification givenAuth() { - return RestAssured.given().auth().preemptive().basic("user1", "user1Pass"); + return "http://localhost:" + APPLICATION_PORT + "/spring-rest-full/auth/foos"; } } diff --git a/spring-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java b/spring-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java new file mode 100644 index 0000000000..fb0fd00bb5 --- /dev/null +++ b/spring-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java @@ -0,0 +1,16 @@ +package org.baeldung.persistence; + +import org.baeldung.persistence.service.FooServicePersistenceIntegrationTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({ + // @formatter:off + + FooServicePersistenceIntegrationTest.class + +}) // +public class PersistenceTestSuite { + +} diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java b/spring-rest-full/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java rename to spring-rest-full/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-rest-full/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java rename to spring-rest-full/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/spring/ConfigTest.java b/spring-rest-full/src/test/java/org/baeldung/spring/ConfigTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/spring/ConfigTest.java rename to spring-rest-full/src/test/java/org/baeldung/spring/ConfigTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/test/IMarshaller.java b/spring-rest-full/src/test/java/org/baeldung/test/IMarshaller.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/test/IMarshaller.java rename to spring-rest-full/src/test/java/org/baeldung/test/IMarshaller.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/test/JacksonMarshaller.java b/spring-rest-full/src/test/java/org/baeldung/test/JacksonMarshaller.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/test/JacksonMarshaller.java rename to spring-rest-full/src/test/java/org/baeldung/test/JacksonMarshaller.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/test/TestMarshallerFactory.java b/spring-rest-full/src/test/java/org/baeldung/test/TestMarshallerFactory.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/test/TestMarshallerFactory.java rename to spring-rest-full/src/test/java/org/baeldung/test/TestMarshallerFactory.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/test/XStreamMarshaller.java b/spring-rest-full/src/test/java/org/baeldung/test/XStreamMarshaller.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/test/XStreamMarshaller.java rename to spring-rest-full/src/test/java/org/baeldung/test/XStreamMarshaller.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/util/IDUtil.java b/spring-rest-full/src/test/java/org/baeldung/util/IDUtil.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/util/IDUtil.java rename to spring-rest-full/src/test/java/org/baeldung/util/IDUtil.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/FooDiscoverabilityLiveTest.java b/spring-rest-full/src/test/java/org/baeldung/web/FooDiscoverabilityLiveTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/web/FooDiscoverabilityLiveTest.java rename to spring-rest-full/src/test/java/org/baeldung/web/FooDiscoverabilityLiveTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/FooLiveTest.java b/spring-rest-full/src/test/java/org/baeldung/web/FooLiveTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/web/FooLiveTest.java rename to spring-rest-full/src/test/java/org/baeldung/web/FooLiveTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java b/spring-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java similarity index 88% rename from spring-security-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java rename to spring-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java index f43ca34bba..62a8983356 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java +++ b/spring-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java @@ -1,29 +1,26 @@ package org.baeldung.web; -import static org.baeldung.Consts.APPLICATION_PORT; -import static org.hamcrest.Matchers.is; - import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; +import static org.baeldung.Consts.APPLICATION_PORT; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import io.restassured.RestAssured; +import io.restassured.response.Response; import java.util.List; import org.baeldung.common.web.AbstractBasicLiveTest; import org.baeldung.persistence.model.Foo; +import org.baeldung.spring.ConfigTest; +import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.baeldung.spring.ConfigTest; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import org.junit.runner.RunWith; -import org.junit.Test; -import io.restassured.response.Response; - -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { ConfigTest.class }, loader = AnnotationConfigContextLoader.class) @ActiveProfiles("test") @@ -45,32 +42,35 @@ public class FooPageableLiveTest extends AbstractBasicLiveTest { return createAsUri(new Foo(randomAlphabetic(6))); } + @Override @Test public void whenResourcesAreRetrievedPaged_then200IsReceived() { - final Response response = givenAuth().get(getPageableURL() + "?page=0&size=10"); + final Response response = RestAssured.get(getPageableURL() + "?page=0&size=10"); assertThat(response.getStatusCode(), is(200)); } + @Override @Test public void whenPageOfResourcesAreRetrievedOutOfBounds_then404IsReceived() { final String url = getPageableURL() + "?page=" + randomNumeric(5) + "&size=10"; - final Response response = givenAuth().get(url); + final Response response = RestAssured.get(url); assertThat(response.getStatusCode(), is(404)); } + @Override @Test public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() { create(); - final Response response = givenAuth().get(getPageableURL() + "?page=0&size=10"); + final Response response = RestAssured.get(getPageableURL() + "?page=0&size=10"); assertFalse(response.body().as(List.class).isEmpty()); } protected String getPageableURL() { - return "http://localhost:" + APPLICATION_PORT + "/spring-security-rest-full/auth/foos/pageable"; + return "http://localhost:" + APPLICATION_PORT + "/spring-rest-full/auth/foos/pageable"; } } diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java b/spring-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java similarity index 60% rename from spring-security-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java rename to spring-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java index 5d3d7fc518..6d5b94a686 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java +++ b/spring-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java @@ -1,17 +1,14 @@ package org.baeldung.web; -import org.baeldung.persistence.query.JPASpecificationLiveTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // @formatter:off - JPASpecificationLiveTest.class - ,FooDiscoverabilityLiveTest.class + FooDiscoverabilityLiveTest.class ,FooLiveTest.class ,FooPageableLiveTest.class - ,MyUserLiveTest.class }) // public class LiveTestSuite { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/util/HTTPLinkHeaderUtil.java b/spring-rest-full/src/test/java/org/baeldung/web/util/HTTPLinkHeaderUtil.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/web/util/HTTPLinkHeaderUtil.java rename to spring-rest-full/src/test/java/org/baeldung/web/util/HTTPLinkHeaderUtil.java diff --git a/spring-security-rest-full/src/test/resources/.gitignore b/spring-rest-full/src/test/resources/.gitignore similarity index 100% rename from spring-security-rest-full/src/test/resources/.gitignore rename to spring-rest-full/src/test/resources/.gitignore diff --git a/spring-rest-query-language/.gitignore b/spring-rest-query-language/.gitignore new file mode 100644 index 0000000000..83c05e60c8 --- /dev/null +++ b/spring-rest-query-language/.gitignore @@ -0,0 +1,13 @@ +*.class + +#folders# +/target +/neoDb* +/data +/src/main/webapp/WEB-INF/classes +*/META-INF/* + +# Packaged files # +*.jar +*.war +*.ear \ No newline at end of file diff --git a/spring-rest-query-language/README.md b/spring-rest-query-language/README.md new file mode 100644 index 0000000000..7677f96379 --- /dev/null +++ b/spring-rest-query-language/README.md @@ -0,0 +1,35 @@ +========= + +## REST Example Project Query Language + +### Courses +The "REST With Spring" Classes: http://bit.ly/restwithspring + +The "Learn Spring Security" Classes: http://github.learnspringsecurity.com + +### Relevant Articles: + +- [REST Query Language with Spring and JPA Criteria](http://www.baeldung.com/rest-search-language-spring-jpa-criteria) +- [REST Query Language with Spring Data JPA Specifications](http://www.baeldung.com/rest-api-search-language-spring-data-specifications) +- [REST Query Language with Spring Data JPA and QueryDSL](http://www.baeldung.com/rest-api-search-language-spring-data-querydsl) +- [REST Query Language – Advanced Search Operations](http://www.baeldung.com/rest-api-query-search-language-more-operations) +- [REST Query Language with RSQL](http://www.baeldung.com/rest-api-search-language-rsql-fiql) +- [REST Query Language – Implementing OR Operation](http://www.baeldung.com/rest-api-query-search-or-operation) + + + + +### Build the Project +``` +mvn clean install +``` + + +### Set up MySQL +``` +mysql -u root -p +> CREATE USER 'tutorialuser'@'localhost' IDENTIFIED BY 'tutorialmy5ql'; +> GRANT ALL PRIVILEGES ON *.* TO 'tutorialuser'@'localhost'; +> FLUSH PRIVILEGES; +``` + diff --git a/spring-security-rest-full/pom.xml b/spring-rest-query-language/pom.xml similarity index 98% rename from spring-security-rest-full/pom.xml rename to spring-rest-query-language/pom.xml index 12a611431e..bf3eb8cb78 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-rest-query-language/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung - spring-security-rest-full + spring-rest-query-language 0.1-SNAPSHOT - spring-security-rest-full + spring-rest-query-language war @@ -230,7 +230,7 @@ - spring-security-rest-full + spring-rest-query-language src/main/resources diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/GenericSpecificationsBuilder.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/GenericSpecificationsBuilder.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/GenericSpecificationsBuilder.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/GenericSpecificationsBuilder.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/IUserDAO.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/IUserDAO.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/IUserDAO.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/IUserDAO.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserPredicate.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserPredicatesBuilder.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/MyUserRepository.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserDAO.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserDAO.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserDAO.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserDAO.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserRepository.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserRepository.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserRepository.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserRepository.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserSpecification.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecification.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserSpecification.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecificationsBuilder.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserSpecificationsBuilder.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/UserSpecificationsBuilder.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/UserSpecificationsBuilder.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/CustomRsqlVisitor.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/CustomRsqlVisitor.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/CustomRsqlVisitor.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/CustomRsqlVisitor.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecBuilder.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecBuilder.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecBuilder.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecBuilder.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/GenericRsqlSpecification.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/dao/rsql/RsqlSearchOperation.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/model/MyUser.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/model/MyUser.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/model/MyUser.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/model/MyUser.java diff --git a/spring-rest-query-language/src/main/java/org/baeldung/persistence/model/User.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/model/User.java new file mode 100644 index 0000000000..670d4a2e74 --- /dev/null +++ b/spring-rest-query-language/src/main/java/org/baeldung/persistence/model/User.java @@ -0,0 +1,94 @@ +package org.baeldung.persistence.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + private String firstName; + + private String lastName; + + private String email; + + private int age; + + public User() { + super(); + } + + public Long getId() { + return id; + } + + public void setId(final Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(final String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(final String lastName) { + this.lastName = lastName; + } + + public String getEmail() { + return email; + } + + public void setEmail(final String username) { + email = username; + } + + public int getAge() { + return age; + } + + public void setAge(final int age) { + this.age = age; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((email == null) ? 0 : email.hashCode()); + return result; + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final User user = (User) obj; + return email.equals(user.email); + } + + @Override + public String toString() { + final StringBuilder builder = new StringBuilder(); + builder.append("User [firstName=").append(firstName).append("]").append("[lastName=").append(lastName).append("]").append("[username").append(email).append("]"); + return builder.toString(); + } + +} \ No newline at end of file diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/model/User_.java b/spring-rest-query-language/src/main/java/org/baeldung/persistence/model/User_.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/persistence/model/User_.java rename to spring-rest-query-language/src/main/java/org/baeldung/persistence/model/User_.java diff --git a/spring-rest-query-language/src/main/java/org/baeldung/spring/Application.java b/spring-rest-query-language/src/main/java/org/baeldung/spring/Application.java new file mode 100644 index 0000000000..7aa9ea5bc3 --- /dev/null +++ b/spring-rest-query-language/src/main/java/org/baeldung/spring/Application.java @@ -0,0 +1,40 @@ +package org.baeldung.spring; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.web.context.request.RequestContextListener; + +/** + * Main Application Class - uses Spring Boot. Just run this as a normal Java + * class to run up a Jetty Server (on http://localhost:8082/spring-rest-query-language) + * + */ +@EnableScheduling +@EnableAutoConfiguration +@ComponentScan("org.baeldung") +@SpringBootApplication +public class Application extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(Application.class); + } + + @Override + public void onStartup(ServletContext sc) throws ServletException { + // Manages the lifecycle of the root application context + sc.addListener(new RequestContextListener()); + } + + public static void main(final String[] args) { + SpringApplication.run(Application.class, args); + } +} \ No newline at end of file diff --git a/spring-rest-query-language/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-rest-query-language/src/main/java/org/baeldung/spring/PersistenceConfig.java new file mode 100644 index 0000000000..f3a87b189e --- /dev/null +++ b/spring-rest-query-language/src/main/java/org/baeldung/spring/PersistenceConfig.java @@ -0,0 +1,85 @@ +package org.baeldung.spring; + +import java.util.Properties; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; +import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import com.google.common.base.Preconditions; + +@Configuration +@EnableTransactionManagement +@PropertySource({ "classpath:persistence-${envTarget:h2}.properties" }) +@ComponentScan({ "org.baeldung.persistence" }) +// @ImportResource("classpath*:springDataPersistenceConfig.xml") +@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao") +public class PersistenceConfig { + + @Autowired + private Environment env; + + public PersistenceConfig() { + super(); + } + + @Bean + public LocalContainerEntityManagerFactoryBean entityManagerFactory() { + final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(dataSource()); + em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" }); + + final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); + // vendorAdapter.set + em.setJpaVendorAdapter(vendorAdapter); + em.setJpaProperties(additionalProperties()); + + return em; + } + + @Bean + public DataSource dataSource() { + final DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName"))); + dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url"))); + dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user"))); + dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass"))); + + return dataSource; + } + + @Bean + public PlatformTransactionManager transactionManager() { + final JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(entityManagerFactory().getObject()); + + return transactionManager; + } + + @Bean + public PersistenceExceptionTranslationPostProcessor exceptionTranslation() { + return new PersistenceExceptionTranslationPostProcessor(); + } + + final Properties additionalProperties() { + final Properties hibernateProperties = new Properties(); + hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto")); + hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect")); + // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true"); + return hibernateProperties; + } + +} \ No newline at end of file diff --git a/spring-rest-query-language/src/main/java/org/baeldung/spring/WebConfig.java b/spring-rest-query-language/src/main/java/org/baeldung/spring/WebConfig.java new file mode 100644 index 0000000000..41711ee1ad --- /dev/null +++ b/spring-rest-query-language/src/main/java/org/baeldung/spring/WebConfig.java @@ -0,0 +1,36 @@ +package org.baeldung.spring; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.ViewResolver; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.view.InternalResourceViewResolver; + +@Configuration +@ComponentScan("org.baeldung.web") +@EnableWebMvc +public class WebConfig extends WebMvcConfigurerAdapter { + + public WebConfig() { + super(); + } + + @Bean + public ViewResolver viewResolver() { + final InternalResourceViewResolver viewResolver = new InternalResourceViewResolver(); + viewResolver.setPrefix("/WEB-INF/view/"); + viewResolver.setSuffix(".jsp"); + return viewResolver; + } + + // API + @Override + public void addViewControllers(final ViewControllerRegistry registry) { + super.addViewControllers(registry); + registry.addViewController("/homepage.html"); + } + +} \ No newline at end of file diff --git a/spring-rest-query-language/src/main/java/org/baeldung/web/controller/HomeController.java b/spring-rest-query-language/src/main/java/org/baeldung/web/controller/HomeController.java new file mode 100644 index 0000000000..9c4d14cae3 --- /dev/null +++ b/spring-rest-query-language/src/main/java/org/baeldung/web/controller/HomeController.java @@ -0,0 +1,14 @@ +package org.baeldung.web.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping(value = "/") +public class HomeController { + + public String index() { + return "homepage"; + } + +} diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/UserController.java b/spring-rest-query-language/src/main/java/org/baeldung/web/controller/UserController.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/controller/UserController.java rename to spring-rest-query-language/src/main/java/org/baeldung/web/controller/UserController.java diff --git a/spring-rest-query-language/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java b/spring-rest-query-language/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java new file mode 100644 index 0000000000..b593116c4a --- /dev/null +++ b/spring-rest-query-language/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java @@ -0,0 +1,84 @@ +package org.baeldung.web.error; + +import javax.persistence.EntityNotFoundException; + +import org.baeldung.web.exception.MyResourceNotFoundException; +import org.hibernate.exception.ConstraintViolationException; +import org.springframework.dao.DataAccessException; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.dao.InvalidDataAccessApiUsageException; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +@ControllerAdvice +public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionHandler { + + public RestResponseEntityExceptionHandler() { + super(); + } + + // API + + // 400 + + @ExceptionHandler({ ConstraintViolationException.class }) + public ResponseEntity handleBadRequest(final ConstraintViolationException ex, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.BAD_REQUEST, request); + } + + @ExceptionHandler({ DataIntegrityViolationException.class }) + public ResponseEntity handleBadRequest(final DataIntegrityViolationException ex, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.BAD_REQUEST, request); + } + + @Override + protected ResponseEntity handleHttpMessageNotReadable(final HttpMessageNotReadableException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + // ex.getCause() instanceof JsonMappingException, JsonParseException // for additional information later on + return handleExceptionInternal(ex, bodyOfResponse, headers, HttpStatus.BAD_REQUEST, request); + } + + @Override + protected ResponseEntity handleMethodArgumentNotValid(final MethodArgumentNotValidException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, headers, HttpStatus.BAD_REQUEST, request); + } + + + // 404 + + @ExceptionHandler(value = { EntityNotFoundException.class, MyResourceNotFoundException.class }) + protected ResponseEntity handleNotFound(final RuntimeException ex, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.NOT_FOUND, request); + } + + // 409 + + @ExceptionHandler({ InvalidDataAccessApiUsageException.class, DataAccessException.class }) + protected ResponseEntity handleConflict(final RuntimeException ex, final WebRequest request) { + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.CONFLICT, request); + } + + // 412 + + // 500 + + @ExceptionHandler({ NullPointerException.class, IllegalArgumentException.class, IllegalStateException.class }) + /*500*/public ResponseEntity handleInternal(final RuntimeException ex, final WebRequest request) { + logger.error("500 Status Code", ex); + final String bodyOfResponse = "This should be application specific"; + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.INTERNAL_SERVER_ERROR, request); + } + +} diff --git a/spring-rest-query-language/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java b/spring-rest-query-language/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java new file mode 100644 index 0000000000..14b61f9832 --- /dev/null +++ b/spring-rest-query-language/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java @@ -0,0 +1,21 @@ +package org.baeldung.web.exception; + +public final class MyResourceNotFoundException extends RuntimeException { + + public MyResourceNotFoundException() { + super(); + } + + public MyResourceNotFoundException(final String message, final Throwable cause) { + super(message, cause); + } + + public MyResourceNotFoundException(final String message) { + super(message); + } + + public MyResourceNotFoundException(final Throwable cause) { + super(cause); + } + +} diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/util/CriteriaParser.java b/spring-rest-query-language/src/main/java/org/baeldung/web/util/CriteriaParser.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/util/CriteriaParser.java rename to spring-rest-query-language/src/main/java/org/baeldung/web/util/CriteriaParser.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/util/SearchCriteria.java b/spring-rest-query-language/src/main/java/org/baeldung/web/util/SearchCriteria.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/util/SearchCriteria.java rename to spring-rest-query-language/src/main/java/org/baeldung/web/util/SearchCriteria.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/util/SearchOperation.java b/spring-rest-query-language/src/main/java/org/baeldung/web/util/SearchOperation.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/util/SearchOperation.java rename to spring-rest-query-language/src/main/java/org/baeldung/web/util/SearchOperation.java diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/util/SpecSearchCriteria.java b/spring-rest-query-language/src/main/java/org/baeldung/web/util/SpecSearchCriteria.java similarity index 100% rename from spring-security-rest-full/src/main/java/org/baeldung/web/util/SpecSearchCriteria.java rename to spring-rest-query-language/src/main/java/org/baeldung/web/util/SpecSearchCriteria.java diff --git a/spring-rest-query-language/src/main/resources/application.properties b/spring-rest-query-language/src/main/resources/application.properties new file mode 100644 index 0000000000..01eaee7040 --- /dev/null +++ b/spring-rest-query-language/src/main/resources/application.properties @@ -0,0 +1,2 @@ +server.port=8082 +server.context-path=/spring-rest-query-language \ No newline at end of file diff --git a/spring-security-rest-full/src/main/resources/data.sql b/spring-rest-query-language/src/main/resources/data.sql similarity index 100% rename from spring-security-rest-full/src/main/resources/data.sql rename to spring-rest-query-language/src/main/resources/data.sql diff --git a/spring-rest-query-language/src/main/resources/logback.xml b/spring-rest-query-language/src/main/resources/logback.xml new file mode 100644 index 0000000000..ec0dc2469a --- /dev/null +++ b/spring-rest-query-language/src/main/resources/logback.xml @@ -0,0 +1,19 @@ + + + + + web - %date [%thread] %-5level %logger{36} - %message%n + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-rest-query-language/src/main/resources/persistence-h2.properties b/spring-rest-query-language/src/main/resources/persistence-h2.properties new file mode 100644 index 0000000000..839a466533 --- /dev/null +++ b/spring-rest-query-language/src/main/resources/persistence-h2.properties @@ -0,0 +1,22 @@ +## jdbc.X +#jdbc.driverClassName=com.mysql.jdbc.Driver +#jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate4_01?createDatabaseIfNotExist=true +#jdbc.user=tutorialuser +#jdbc.pass=tutorialmy5ql +# +## hibernate.X +#hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +#hibernate.show_sql=false +#hibernate.hbm2ddl.auto=create-drop + + +# jdbc.X +jdbc.driverClassName=org.h2.Driver +jdbc.url=jdbc:h2:mem:security_permission;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE +jdbc.user=sa +jdbc.pass= + +# hibernate.X +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=false +hibernate.hbm2ddl.auto=create-drop diff --git a/spring-rest-query-language/src/main/resources/persistence-mysql.properties b/spring-rest-query-language/src/main/resources/persistence-mysql.properties new file mode 100644 index 0000000000..8263b0d9ac --- /dev/null +++ b/spring-rest-query-language/src/main/resources/persistence-mysql.properties @@ -0,0 +1,10 @@ +# jdbc.X +jdbc.driverClassName=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate4_01?createDatabaseIfNotExist=true +jdbc.user=tutorialuser +jdbc.pass=tutorialmy5ql + +# hibernate.X +hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +hibernate.show_sql=false +hibernate.hbm2ddl.auto=create-drop diff --git a/spring-rest-query-language/src/main/resources/springDataPersistenceConfig.xml b/spring-rest-query-language/src/main/resources/springDataPersistenceConfig.xml new file mode 100644 index 0000000000..d6d0ec6e47 --- /dev/null +++ b/spring-rest-query-language/src/main/resources/springDataPersistenceConfig.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/spring-rest-query-language/src/main/webapp/WEB-INF/api-servlet.xml b/spring-rest-query-language/src/main/webapp/WEB-INF/api-servlet.xml new file mode 100644 index 0000000000..4ba9642448 --- /dev/null +++ b/spring-rest-query-language/src/main/webapp/WEB-INF/api-servlet.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/spring-rest-query-language/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-rest-query-language/src/main/webapp/WEB-INF/view/homepage.jsp new file mode 100644 index 0000000000..7cc14b5dcd --- /dev/null +++ b/spring-rest-query-language/src/main/webapp/WEB-INF/view/homepage.jsp @@ -0,0 +1,7 @@ + + + + +

    This is the body of the sample view

    + + \ No newline at end of file diff --git a/spring-rest-query-language/src/main/webapp/WEB-INF/web.xml b/spring-rest-query-language/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..4472afd112 --- /dev/null +++ b/spring-rest-query-language/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,42 @@ + + + + Spring REST Query language Application + + + + contextClass + + org.springframework.web.context.support.AnnotationConfigWebApplicationContext + + + + contextConfigLocation + org.baeldung.spring + + + + org.springframework.web.context.ContextLoaderListener + + + + + api + org.springframework.web.servlet.DispatcherServlet + 1 + + + api + / + + + + + index.html + + + \ No newline at end of file diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPACriteriaQueryIntegrationTest.java b/spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPACriteriaQueryIntegrationTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPACriteriaQueryIntegrationTest.java rename to spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPACriteriaQueryIntegrationTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPAQuerydslIntegrationTest.java b/spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPAQuerydslIntegrationTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPAQuerydslIntegrationTest.java rename to spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPAQuerydslIntegrationTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationIntegrationTest.java b/spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPASpecificationIntegrationTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationIntegrationTest.java rename to spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPASpecificationIntegrationTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java b/spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java similarity index 78% rename from spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java rename to spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java index 07b47dd8b6..044029c679 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java +++ b/spring-rest-query-language/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java @@ -1,16 +1,15 @@ package org.baeldung.persistence.query; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import io.restassured.RestAssured; import io.restassured.response.Response; -import io.restassured.specification.RequestSpecification; + import org.baeldung.persistence.model.User; import org.junit.Before; import org.junit.Test; import org.springframework.test.context.ActiveProfiles; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - //@RunWith(SpringJUnit4ClassRunner.class) //@ContextConfiguration(classes = { ConfigTest.class, // PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) @@ -24,7 +23,7 @@ public class JPASpecificationLiveTest { private User userTom; - private final String URL_PREFIX = "http://localhost:8082/spring-security-rest-full/auth/users/spec?search="; + private final String URL_PREFIX = "http://localhost:8082/spring-rest-query-language/auth/users/spec?search="; @Before public void init() { @@ -43,11 +42,11 @@ public class JPASpecificationLiveTest { // repository.save(userTom); } - private final String EURL_PREFIX = "http://localhost:8082/spring-security-rest-full/auth/users/espec?search="; + private final String EURL_PREFIX = "http://localhost:8082/spring-rest-query-language/auth/users/espec?search="; @Test public void givenFirstOrLastName_whenGettingListOfUsers_thenCorrect() { - final Response response = givenAuth().get(EURL_PREFIX + "firstName:john,'lastName:doe"); + final Response response = RestAssured.get(EURL_PREFIX + "firstName:john,'lastName:doe"); final String result = response.body() .asString(); assertTrue(result.contains(userJohn.getEmail())); @@ -56,7 +55,7 @@ public class JPASpecificationLiveTest { @Test public void givenFirstAndLastName_whenGettingListOfUsers_thenCorrect() { - final Response response = givenAuth().get(URL_PREFIX + "firstName:john,lastName:doe"); + final Response response = RestAssured.get(URL_PREFIX + "firstName:john,lastName:doe"); final String result = response.body() .asString(); @@ -66,7 +65,7 @@ public class JPASpecificationLiveTest { @Test public void givenFirstNameInverse_whenGettingListOfUsers_thenCorrect() { - final Response response = givenAuth().get(URL_PREFIX + "firstName!john"); + final Response response = RestAssured.get(URL_PREFIX + "firstName!john"); final String result = response.body() .asString(); @@ -76,7 +75,7 @@ public class JPASpecificationLiveTest { @Test public void givenMinAge_whenGettingListOfUsers_thenCorrect() { - final Response response = givenAuth().get(URL_PREFIX + "age>25"); + final Response response = RestAssured.get(URL_PREFIX + "age>25"); final String result = response.body() .asString(); @@ -86,7 +85,7 @@ public class JPASpecificationLiveTest { @Test public void givenFirstNamePrefix_whenGettingListOfUsers_thenCorrect() { - final Response response = givenAuth().get(URL_PREFIX + "firstName:jo*"); + final Response response = RestAssured.get(URL_PREFIX + "firstName:jo*"); final String result = response.body() .asString(); @@ -96,7 +95,7 @@ public class JPASpecificationLiveTest { @Test public void givenFirstNameSuffix_whenGettingListOfUsers_thenCorrect() { - final Response response = givenAuth().get(URL_PREFIX + "firstName:*n"); + final Response response = RestAssured.get(URL_PREFIX + "firstName:*n"); final String result = response.body() .asString(); @@ -106,7 +105,7 @@ public class JPASpecificationLiveTest { @Test public void givenFirstNameSubstring_whenGettingListOfUsers_thenCorrect() { - final Response response = givenAuth().get(URL_PREFIX + "firstName:*oh*"); + final Response response = RestAssured.get(URL_PREFIX + "firstName:*oh*"); final String result = response.body() .asString(); @@ -116,7 +115,7 @@ public class JPASpecificationLiveTest { @Test public void givenAgeRange_whenGettingListOfUsers_thenCorrect() { - final Response response = givenAuth().get(URL_PREFIX + "age>20,age<25"); + final Response response = RestAssured.get(URL_PREFIX + "age>20,age<25"); final String result = response.body() .asString(); @@ -124,11 +123,11 @@ public class JPASpecificationLiveTest { assertFalse(result.contains(userTom.getEmail())); } - private final String ADV_URL_PREFIX = "http://localhost:8082/spring-security-rest-full/auth/users/spec/adv?search="; + private final String ADV_URL_PREFIX = "http://localhost:8082/spring-rest-query-language/auth/users/spec/adv?search="; @Test public void givenFirstOrLastName_whenGettingAdvListOfUsers_thenCorrect() { - final Response response = givenAuth().get(ADV_URL_PREFIX + "firstName:john OR lastName:doe"); + final Response response = RestAssured.get(ADV_URL_PREFIX + "firstName:john OR lastName:doe"); final String result = response.body() .asString(); assertTrue(result.contains(userJohn.getEmail())); @@ -137,17 +136,11 @@ public class JPASpecificationLiveTest { @Test public void givenFirstOrFirstNameAndAge_whenGettingAdvListOfUsers_thenCorrect() { - final Response response = givenAuth().get(ADV_URL_PREFIX + "( firstName:john OR firstName:tom ) AND age>22"); + final Response response = RestAssured.get(ADV_URL_PREFIX + "( firstName:john OR firstName:tom ) AND age>22"); final String result = response.body() .asString(); assertFalse(result.contains(userJohn.getEmail())); assertTrue(result.contains(userTom.getEmail())); } - private final RequestSpecification givenAuth() { - return RestAssured.given() - .auth() - .preemptive() - .basic("user1", "user1Pass"); - } } diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/RsqlIntegrationTest.java b/spring-rest-query-language/src/test/java/org/baeldung/persistence/query/RsqlIntegrationTest.java similarity index 100% rename from spring-security-rest-full/src/test/java/org/baeldung/persistence/query/RsqlIntegrationTest.java rename to spring-rest-query-language/src/test/java/org/baeldung/persistence/query/RsqlIntegrationTest.java diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java b/spring-rest-query-language/src/test/java/org/baeldung/web/MyUserLiveTest.java similarity index 94% rename from spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java rename to spring-rest-query-language/src/test/java/org/baeldung/web/MyUserLiveTest.java index b598463da0..a478016280 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java +++ b/spring-rest-query-language/src/test/java/org/baeldung/web/MyUserLiveTest.java @@ -1,20 +1,19 @@ package org.baeldung.web; import static org.junit.Assert.assertEquals; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; import org.baeldung.persistence.model.MyUser; import org.junit.Test; import org.springframework.test.context.ActiveProfiles; -import io.restassured.RestAssured; -import io.restassured.response.Response; -import io.restassured.specification.RequestSpecification; - @ActiveProfiles("test") public class MyUserLiveTest { private final MyUser userJohn = new MyUser("john", "doe", "john@doe.com", 11); - private String URL_PREFIX = "http://localhost:8082/spring-security-rest-full/auth/api/myusers"; + private String URL_PREFIX = "http://localhost:8082/spring-rest-query-language/auth/api/myusers"; @Test public void whenGettingListOfUsers_thenCorrect() { diff --git a/spring-rest-query-language/src/test/resources/.gitignore b/spring-rest-query-language/src/test/resources/.gitignore new file mode 100644 index 0000000000..83c05e60c8 --- /dev/null +++ b/spring-rest-query-language/src/test/resources/.gitignore @@ -0,0 +1,13 @@ +*.class + +#folders# +/target +/neoDb* +/data +/src/main/webapp/WEB-INF/classes +*/META-INF/* + +# Packaged files # +*.jar +*.war +*.ear \ No newline at end of file diff --git a/spring-security-rest-full/.springBeans b/spring-security-rest-full/.springBeans deleted file mode 100644 index b01040d91b..0000000000 --- a/spring-security-rest-full/.springBeans +++ /dev/null @@ -1,17 +0,0 @@ - - - 1 - - - - - - - - - src/main/webapp/WEB-INF/api-servlet.xml - java:org.baeldung.spring.Application - - - - diff --git a/spring-security-rest-full/src/main/resources/application.properties b/spring-security-rest-full/src/main/resources/application.properties deleted file mode 100644 index c3e1f0b4bb..0000000000 --- a/spring-security-rest-full/src/main/resources/application.properties +++ /dev/null @@ -1,3 +0,0 @@ -server.port=8082 -server.context-path=/spring-security-rest-full -endpoints.metrics.enabled=true \ No newline at end of file diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java b/spring-security-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java deleted file mode 100644 index fda7b01c7a..0000000000 --- a/spring-security-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.baeldung.persistence; - -import org.baeldung.persistence.query.JPACriteriaQueryIntegrationTest; -import org.baeldung.persistence.query.JPAQuerydslIntegrationTest; -import org.baeldung.persistence.query.JPASpecificationIntegrationTest; -import org.baeldung.persistence.query.RsqlIntegrationTest; -import org.baeldung.persistence.service.FooServicePersistenceIntegrationTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - // @formatter:off - RsqlIntegrationTest.class - ,JPASpecificationIntegrationTest.class - ,FooServicePersistenceIntegrationTest.class - ,JPAQuerydslIntegrationTest.class - ,JPACriteriaQueryIntegrationTest.class -}) // -public class PersistenceTestSuite { - -} From a636f754b0ea47d2330fb9696d1dc89b6bd778a8 Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Wed, 25 Oct 2017 19:17:15 +0200 Subject: [PATCH 128/197] BAEL-1250 Initializing Arrays in Java (#2862) * Evaluation article: Different Types of Bean Injection in Spring * added tests & changed configuration to Java-based config * removed xml config files * rename unit tests * BAEL-972 - Apache Commons Text * remove code from evaluation article * remove code from evaluation article * BAEL-972 - Apache Commons Text - added another example * BAEL-972 - Apache Commons Text - just indentation * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java * BAEL-994 - TemporalAdjuster in Java - fix problems * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * BAEL-1033 Introduction to StreamUtils * fix formatting * BAEL-1033 minor refactor * BAEL-1035 Introduction to Eclipse Collections * format * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * BAEL-1035 Introduction to Eclipse Collections * cleanup * cleanup * BAEL-1109 Introduction to JCache * BAEL-1109 Introduction to JCache * remove unneeded property in pom.xml * fix formatting * close cache instances properly * remove latest commit * BAEL-1057 Introduction to rxjava-jdbc * refactor rxjava-jdbc * Refactor rxjava-jdbc * Refactoring rxjava-jdbc * BAEL-1171 java.lang.String API * refactor rxjava-jdbc * refactor String * String API - move multiple classes into a single class * move class into test package * BAEL-1171 String.lang.String API * BAEL-1171 java.lang.String API * BAEL-1250 Initializing Arrays in Java * BAEL-1250 Initializing Arrays in Java * BAEL-1250 Initializing Arrays in Java * small fix --- .../com/baeldung/array/ArrayInitializer.java | 17 ++++++++++++----- .../baeldung/array/ArrayInitializerTest.java | 6 ++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java b/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java index cd6d524ad2..0ba6c342d9 100644 --- a/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java +++ b/core-java/src/main/java/com/baeldung/array/ArrayInitializer.java @@ -2,6 +2,8 @@ package com.baeldung.array; import java.util.Arrays; +import org.apache.commons.lang.ArrayUtils; + public class ArrayInitializer { static int[] initializeArrayInLoop() { @@ -24,17 +26,17 @@ public class ArrayInitializer { } static String[] initializeArrayAtTimeOfDeclarationMethod1() { - String array[] = new String[]{"Toyota", "Mercedes", "BMW", "Volkswagen", "Skoda"}; + String array[] = new String[] { "Toyota", "Mercedes", "BMW", "Volkswagen", "Skoda" }; return array; } static int[] initializeArrayAtTimeOfDeclarationMethod2() { - int[] array = new int[]{1, 2, 3, 4, 5}; + int[] array = new int[] { 1, 2, 3, 4, 5 }; return array; } static int[] initializeArrayAtTimeOfDeclarationMethod3() { - int array[] = {1, 2, 3, 4, 5}; + int array[] = { 1, 2, 3, 4, 5 }; return array; } @@ -51,13 +53,13 @@ public class ArrayInitializer { } static int[] initializeArrayUsingArraysCopy() { - int array[] = {1, 2, 3, 4, 5}; + int array[] = { 1, 2, 3, 4, 5 }; int[] copy = Arrays.copyOf(array, 5); return copy; } static int[] initializeLargerArrayUsingArraysCopy() { - int array[] = {1, 2, 3, 4, 5}; + int array[] = { 1, 2, 3, 4, 5 }; int[] copy = Arrays.copyOf(array, 6); return copy; } @@ -68,4 +70,9 @@ public class ArrayInitializer { Arrays.setAll(array, p -> p > 9 ? 0 : p); return array; } + + static char[] initializeArrayUsingArraysUtilClone() { + char[] array = new char[] { 'a', 'b', 'c' }; + return ArrayUtils.clone(array); + } } diff --git a/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java b/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java index d3afad7b00..7265fa20e5 100644 --- a/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java +++ b/core-java/src/test/java/com/baeldung/array/ArrayInitializerTest.java @@ -8,6 +8,7 @@ import static com.baeldung.array.ArrayInitializer.initializeArrayRangeUsingArray import static com.baeldung.array.ArrayInitializer.initializeArrayUsingArraysCopy; import static com.baeldung.array.ArrayInitializer.initializeArrayUsingArraysFill; import static com.baeldung.array.ArrayInitializer.initializeArrayUsingArraysSetAll; +import static com.baeldung.array.ArrayInitializer.initializeArrayUsingArraysUtilClone; import static com.baeldung.array.ArrayInitializer.initializeLargerArrayUsingArraysCopy; import static com.baeldung.array.ArrayInitializer.initializeMultiDimensionalArrayInLoop; import static org.junit.Assert.assertArrayEquals; @@ -65,4 +66,9 @@ public class ArrayInitializerTest { public void whenInitializeLargerArrayRangeUsingArraysSetAll_thenCorrect() { assertArrayEquals(new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, initializeArrayUsingArraysSetAll()); } + + @Test + public void whenInitializeArrayUsingArraysUtilClone_thenCorrect() { + assertArrayEquals(new char[] { 'a', 'b', 'c' }, initializeArrayUsingArraysUtilClone()); + } } From 1da6e1df42efa7875a7769af75d30b3ee715a9df Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 25 Oct 2017 20:18:33 +0200 Subject: [PATCH 129/197] EditDistance refactor (#2853) --- .../editdistance/EditDistanceBase.java | 21 +++++++------------ .../EditDistanceDynamicProgramming.java | 7 ++++--- .../editdistance/EditDistanceRecursive.java | 9 ++++---- .../editdistance/EditDistanceTest.java | 13 ++++++------ 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java index e884c576c1..ec66621928 100644 --- a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceBase.java @@ -1,22 +1,15 @@ package com.baeldung.algorithms.editdistance; +import java.util.Arrays; + public class EditDistanceBase { - public static int costOfSubstitution(char a, char b) { - if (a == b) { - return 0; - } - return 1; + static int costOfSubstitution(char a, char b) { + return a == b ? 0 : 1; } - public static int min(int... numbers) { - int min = Integer.MAX_VALUE; - - for (int x : numbers) { - if (x < min) - min = x; - } - - return min; + static int min(int... numbers) { + return Arrays.stream(numbers) + .min().orElse(Integer.MAX_VALUE); } } diff --git a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java index 163714002b..1f8824c4f4 100644 --- a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceDynamicProgramming.java @@ -2,7 +2,7 @@ package com.baeldung.algorithms.editdistance; public class EditDistanceDynamicProgramming extends EditDistanceBase { - public static int calculate(String x, String y) { + static int calculate(String x, String y) { int[][] dp = new int[x.length() + 1][y.length() + 1]; for (int i = 0; i <= x.length(); i++) { @@ -14,12 +14,13 @@ public class EditDistanceDynamicProgramming extends EditDistanceBase { dp[i][j] = i; else { - dp[i][j] = min(dp[i - 1][j - 1] + costOfSubstitution(x.charAt(i - 1), y.charAt(j - 1)), dp[i - 1][j] + 1, dp[i][j - 1] + 1); + dp[i][j] = min(dp[i - 1][j - 1] + + costOfSubstitution(x.charAt(i - 1), y.charAt(j - 1)), + dp[i - 1][j] + 1, dp[i][j - 1] + 1); } } } return dp[x.length()][y.length()]; } - } diff --git a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java index 68e470147e..8ed48dc554 100644 --- a/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/editdistance/EditDistanceRecursive.java @@ -2,13 +2,15 @@ package com.baeldung.algorithms.editdistance; public class EditDistanceRecursive extends EditDistanceBase { - public static int calculate(String x, String y) { + static int calculate(String x, String y) { - if (x.isEmpty()) + if (x.isEmpty()) { return y.length(); + } - if (y.isEmpty()) + if (y.isEmpty()) { return x.length(); + } int substitution = calculate(x.substring(1), y.substring(1)) + costOfSubstitution(x.charAt(0), y.charAt(0)); int insertion = calculate(x, y.substring(1)) + 1; @@ -16,5 +18,4 @@ public class EditDistanceRecursive extends EditDistanceBase { return min(substitution, insertion, deletion); } - } diff --git a/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java b/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java index 1594f73a73..bab2f480a5 100644 --- a/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java +++ b/algorithms/src/test/java/com/baeldung/algorithms/editdistance/EditDistanceTest.java @@ -1,16 +1,17 @@ package com.baeldung.algorithms.editdistance; -import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import static org.junit.Assert.assertEquals; + @RunWith(Parameterized.class) public class EditDistanceTest extends EditDistanceDataProvider { - String x; - String y; - int result; + private String x; + private String y; + private int result; public EditDistanceTest(String a, String b, int res) { super(); @@ -21,11 +22,11 @@ public class EditDistanceTest extends EditDistanceDataProvider { @Test public void testEditDistance_RecursiveImplementation() { - Assert.assertEquals(result, EditDistanceRecursive.calculate(x, y)); + assertEquals(result, EditDistanceRecursive.calculate(x, y)); } @Test public void testEditDistance_givenDynamicProgrammingImplementation() { - Assert.assertEquals(result, EditDistanceDynamicProgramming.calculate(x, y)); + assertEquals(result, EditDistanceDynamicProgramming.calculate(x, y)); } } From 8248a66ddb151f86447e0b81439d6e7e993c61bc Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 25 Oct 2017 22:35:21 +0200 Subject: [PATCH 130/197] Build Optimization 25.10 (#2867) * First round * Second round --- cas-secured-app/pom.xml | 70 +++++++++++++++++++ ...SecuredAppApplicationIntegrationTest.java} | 2 +- ...eTest.java => ORMLiteIntegrationTest.java} | 2 +- ...Test.java => ReladomoIntegrationTest.java} | 2 +- .../AsyncServiceLongRunningUnitTest.java | 1 - 5 files changed, 73 insertions(+), 4 deletions(-) rename cas-secured-app/src/test/java/com/baeldung/cassecuredapp/{CasSecuredAppApplicationTests.java => CasSecuredAppApplicationIntegrationTest.java} (84%) rename libraries-data/src/test/java/com/baeldung/ormlite/{ORMLiteTest.java => ORMLiteIntegrationTest.java} (99%) rename libraries-data/src/test/java/com/baeldung/reladomo/{ReladomoTest.java => ReladomoIntegrationTest.java} (96%) diff --git a/cas-secured-app/pom.xml b/cas-secured-app/pom.xml index f66d54ae67..0548e0c315 100644 --- a/cas-secured-app/pom.xml +++ b/cas-secured-app/pom.xml @@ -106,5 +106,75 @@ + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + **/AutoconfigurationTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + + autoconfiguration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + **/*IntegrationTest.java + + + **/AutoconfigurationTest.java + + + + + + + json + + + + + + + + + diff --git a/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java b/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java similarity index 84% rename from cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java rename to cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java index 09dbaf0c61..2f2644e2ea 100644 --- a/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java +++ b/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class CasSecuredAppApplicationTests { +public class CasSecuredAppApplicationIntegrationTest { @Test public void contextLoads() { diff --git a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java b/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java similarity index 99% rename from libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java rename to libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java index 26eb481286..5a713902b4 100644 --- a/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteTest.java +++ b/libraries-data/src/test/java/com/baeldung/ormlite/ORMLiteIntegrationTest.java @@ -16,7 +16,7 @@ import com.j256.ormlite.dao.DaoManager; import com.j256.ormlite.jdbc.JdbcPooledConnectionSource; import com.j256.ormlite.table.TableUtils; -public class ORMLiteTest { +public class ORMLiteIntegrationTest { private static JdbcPooledConnectionSource connectionSource; private static Dao libraryDao; diff --git a/libraries-data/src/test/java/com/baeldung/reladomo/ReladomoTest.java b/libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java similarity index 96% rename from libraries-data/src/test/java/com/baeldung/reladomo/ReladomoTest.java rename to libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java index 61c29e8aa3..3660d9a8e1 100644 --- a/libraries-data/src/test/java/com/baeldung/reladomo/ReladomoTest.java +++ b/libraries-data/src/test/java/com/baeldung/reladomo/ReladomoIntegrationTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import com.gs.fw.common.mithra.test.ConnectionManagerForTests; import com.gs.fw.common.mithra.test.MithraTestResource; -public class ReladomoTest { +public class ReladomoIntegrationTest { private MithraTestResource mithraTestResource; @Before diff --git a/libraries/src/test/java/com/baeldung/awaitility/AsyncServiceLongRunningUnitTest.java b/libraries/src/test/java/com/baeldung/awaitility/AsyncServiceLongRunningUnitTest.java index d17a7dcf1b..7ca656efbf 100644 --- a/libraries/src/test/java/com/baeldung/awaitility/AsyncServiceLongRunningUnitTest.java +++ b/libraries/src/test/java/com/baeldung/awaitility/AsyncServiceLongRunningUnitTest.java @@ -1,6 +1,5 @@ package com.baeldung.awaitility; -import org.awaitility.Awaitility; import org.awaitility.Duration; import org.junit.Before; import org.junit.Test; From 080af1cb45f2a17d4e8834f3773a406e62da5f71 Mon Sep 17 00:00:00 2001 From: Mohamed Sanaulla Date: Thu, 26 Oct 2017 01:11:28 +0300 Subject: [PATCH 131/197] adding code for BAEL-1262 (#2866) * adding code for BAEL-1262 * fixing the build issue by moving the test to test folder --- .../runnable/RunnableVsThreadTest.java | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java new file mode 100644 index 0000000000..d0f4460f51 --- /dev/null +++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java @@ -0,0 +1,110 @@ +package com.baeldung.concurrent.runnable; + +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +import org.apache.commons.lang3.RandomUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class RunnableVsThreadTest { + + private static Logger log = + LoggerFactory.getLogger(RunnableVsThreadTest.class); + + @Test + public void givenARunnable_whenRunIt_thenResult() throws Exception{ + Thread thread = new Thread(new SimpleRunnable( + "SimpleRunnable executed using Thread")); + thread.start(); + thread.join(); + + ExecutorService executorService = + Executors.newCachedThreadPool(); + + executorService.submit(new SimpleRunnable( + "SimpleRunnable executed using ExecutorService")).get(); + + executorService.submit(()-> + log.info("Lambda runnable executed!!!")).get(); + executorService.shutdown(); + } + + @Test + public void givenAThread_whenRunIt_thenResult() throws Exception{ + Thread thread = new SimpleThread( + "SimpleThread executed using Thread"); + thread.start(); + thread.join(); + + ExecutorService executorService = + Executors.newCachedThreadPool(); + executorService.submit(new SimpleThread( + "SimpleThread executed using ExecutorService")).get(); + } + + @Test + public void givenACallable_whenRunIt_thenResult() throws Exception { + ExecutorService executorService = + Executors.newCachedThreadPool(); + + Future future = executorService.submit(new SimpleCallable()); + log.info("Result from callable: {}", future.get()); + + future = executorService.submit(() -> { + return RandomUtils.nextInt(0, 100); + }); + log.info("Result from callable: {}", future.get()); + + } +} + +class SimpleThread extends Thread{ + + private static final Logger log = + LoggerFactory.getLogger(SimpleThread.class); + + private String message; + + public SimpleThread(String message) { + this.message = message; + } + + @Override + public void run() { + log.info(message); + } +} + +class SimpleRunnable implements Runnable { + + private static final Logger log = + LoggerFactory.getLogger(SimpleRunnable.class); + + private String message; + + public SimpleRunnable(String message) { + this.message = message; + } + + + @Override + public void run() { + log.info(message); + } +} + +class SimpleCallable implements Callable { + + @Override + public Integer call() throws Exception { + return RandomUtils.nextInt(0, 100); + } + +} \ No newline at end of file From 6ac536861e5912bfbd70d7ebca8ca3ae200a1413 Mon Sep 17 00:00:00 2001 From: Graham Cox Date: Thu, 26 Oct 2017 03:30:53 +0100 Subject: [PATCH 132/197] Updated test names (#2856) --- .../baeldung/kotlin/junit5/CalculatorTest5.kt | 20 +++++++++---------- .../com/baeldung/kotlin/junit5/SimpleTest5.kt | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt index dd35805044..40cd9adc99 100644 --- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/CalculatorTest5.kt @@ -7,12 +7,12 @@ class CalculatorTest5 { private val calculator = Calculator() @Test - fun testAddition() { + fun whenAdding1and3_thenAnswerIs4() { Assertions.assertEquals(4, calculator.add(1, 3)) } @Test - fun testDivideByZero() { + fun whenDividingBy0_thenErrorOccurs() { val exception = Assertions.assertThrows(DivideByZeroException::class.java) { calculator.divide(5, 0) } @@ -21,7 +21,7 @@ class CalculatorTest5 { } @Test - fun testSquares() { + fun whenSquaringNumbers_thenCorrectAnswerGiven() { Assertions.assertAll( Executable { Assertions.assertEquals(1, calculator.square(1)) }, Executable { Assertions.assertEquals(4, calculator.square(2)) }, @@ -31,9 +31,9 @@ class CalculatorTest5 { @TestFactory fun testSquaresFactory() = listOf( - DynamicTest.dynamicTest("1 squared") { Assertions.assertEquals(1,calculator.square(1))}, - DynamicTest.dynamicTest("2 squared") { Assertions.assertEquals(4,calculator.square(2))}, - DynamicTest.dynamicTest("3 squared") { Assertions.assertEquals(9,calculator.square(3))} + DynamicTest.dynamicTest("when I calculate 1^2 then I get 1") { Assertions.assertEquals(1,calculator.square(1))}, + DynamicTest.dynamicTest("when I calculate 2^2 then I get 4") { Assertions.assertEquals(4,calculator.square(2))}, + DynamicTest.dynamicTest("when I calculate 3^2 then I get 9") { Assertions.assertEquals(9,calculator.square(3))} ) @TestFactory @@ -44,7 +44,7 @@ class CalculatorTest5 { 4 to 16, 5 to 25) .map { (input, expected) -> - DynamicTest.dynamicTest("$input squared") { + DynamicTest.dynamicTest("when I calculate $input^2 then I get $expected") { Assertions.assertEquals(expected, calculator.square(input)) } } @@ -59,14 +59,14 @@ class CalculatorTest5 { @TestFactory fun testSquaresFactory3() = squaresTestData .map { (input, expected) -> - DynamicTest.dynamicTest("$input squared") { + DynamicTest.dynamicTest("when I calculate $input^2 then I get $expected") { Assertions.assertEquals(expected, calculator.square(input)) } } @TestFactory fun testSquareRootsFactory3() = squaresTestData .map { (expected, input) -> - DynamicTest.dynamicTest("Square root of $input") { + DynamicTest.dynamicTest("I calculate the square root of $input then I get $expected") { Assertions.assertEquals(expected.toDouble(), calculator.squareRoot(input)) } } @@ -76,7 +76,7 @@ class CalculatorTest5 { Tag("logarithms") ) @Test - fun testLogarithms() { + fun whenIcalculateLog2Of8_thenIget3() { Assertions.assertEquals(3.0, calculator.log(2, 8)) } } diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt index c04ab568f7..70d3fb90bf 100644 --- a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/junit5/SimpleTest5.kt @@ -6,14 +6,14 @@ import org.junit.jupiter.api.Test class SimpleTest5 { @Test - fun testEmpty() { + fun whenEmptyList_thenListIsEmpty() { val list = listOf() Assertions.assertTrue(list::isEmpty) } @Test @Disabled - fun testMessage() { + fun when3equals4_thenTestFails() { Assertions.assertEquals(3, 4) { "Three does not equal four" } From 814aff30317f4b58196686626000defabe03eddf Mon Sep 17 00:00:00 2001 From: KevinGilmore Date: Wed, 25 Oct 2017 21:54:00 -0500 Subject: [PATCH 133/197] BAEL-1187 README.md (#2873) * BAEL-973: updated README * BAEL-1069: Updated README * BAEL-817: add README file * BAEL-1084: README update * BAEL-960: Update README * BAEL-1155: updated README * BAEL-1041: updated README * BAEL-973: Updated README * BAEL-1187: updated README --- jackson/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/jackson/README.md b/jackson/README.md index a710a1689e..a05c95de94 100644 --- a/jackson/README.md +++ b/jackson/README.md @@ -35,3 +35,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [Jackson – Unmarshall to Collection/Array](http://www.baeldung.com/jackson-collection-array) - [Jackson – Change Name of Field](http://www.baeldung.com/jackson-name-of-property) - [Serialize Only Fields that meet a Custom Criteria with Jackson](http://www.baeldung.com/jackson-serialize-field-custom-criteria) +- [Mapping Nested Values with Jackson](http://www.baeldung.com/jackson-nested-values) From c389f56da5b7c74584771b80692e73775c7e6c86 Mon Sep 17 00:00:00 2001 From: Nikhil Khatwani Date: Thu, 26 Oct 2017 23:16:35 +0530 Subject: [PATCH 134/197] Bael 1166 intro apache spark (#2875) * Changes for BAEL-1166 * Changes for BAEL_1166 * Changes for BAEL 1166 * Changes for BAEL 1166 * Changes for BAEL_1166 --- .../src/main/java/com/baeldung/WordCount.java | 49 +++++++------------ 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/apache-spark/src/main/java/com/baeldung/WordCount.java b/apache-spark/src/main/java/com/baeldung/WordCount.java index ec1dedcb69..bc73b05536 100644 --- a/apache-spark/src/main/java/com/baeldung/WordCount.java +++ b/apache-spark/src/main/java/com/baeldung/WordCount.java @@ -17,37 +17,24 @@ import scala.Tuple2; public class WordCount { private static final Pattern SPACE = Pattern.compile(" "); - + public static void main(String[] args) throws Exception { - if (args.length < 1) { - System.err.println("Usage: JavaWordCount "); - System.exit(1); + if (args.length < 1) { + System.err.println("Usage: JavaWordCount "); + System.exit(1); + } + SparkConf sparkConf = new SparkConf().setAppName("JavaWordCount") + .setMaster("local"); + JavaSparkContext ctx = new JavaSparkContext(sparkConf); + JavaRDD lines = ctx.textFile(args[0], 1); + + JavaRDD words = lines.flatMap(s -> Arrays.asList(SPACE.split(s)).iterator()); + JavaPairRDD wordAsTuple = words.mapToPair(word -> new Tuple2<>(word, 1)); + JavaPairRDD wordWithCount = wordAsTuple.reduceByKey((Integer i1, Integer i2)->i1 + i2); + List> output = wordWithCount.collect(); + for (Tuple2 tuple : output) { + System.out.println(tuple._1() + ": " + tuple._2()); + } + ctx.stop(); } - SparkConf sparkConf = new SparkConf().setAppName("JavaWordCount").setMaster("local"); - JavaSparkContext ctx = new JavaSparkContext(sparkConf); - JavaRDD lines = ctx.textFile(args[0], 1); - - JavaRDD words = lines.flatMap(s -> Arrays.asList(SPACE.split(s)).iterator()); - JavaPairRDD ones = words.mapToPair( - new PairFunction() { - @Override - public Tuple2 call(String s) { - return new Tuple2<>(s, 1); - } - }); - - JavaPairRDD counts = ones.reduceByKey( - new Function2() { - @Override - public Integer call(Integer i1, Integer i2) { - return i1 + i2; - } - }); - - List> output = counts.collect(); - for (Tuple2 tuple : output) { - System.out.println(tuple._1() + ": " + tuple._2()); - } - ctx.stop(); -} } From b1219990ec45c540c23a2d9ac502450a5ac2400a Mon Sep 17 00:00:00 2001 From: Eric Goebelbecker Date: Thu, 26 Oct 2017 14:34:25 -0400 Subject: [PATCH 135/197] Add Mockito tutorial for void methods (#2869) --- .../mockito/MockitoVoidMethodsTest.java | 62 +++++++++++++++++++ .../java/org/baeldung/mockito/MyList.java | 5 ++ 2 files changed, 67 insertions(+) create mode 100644 mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java b/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java new file mode 100644 index 0000000000..4de9a88dcc --- /dev/null +++ b/mockito/src/test/java/org/baeldung/mockito/MockitoVoidMethodsTest.java @@ -0,0 +1,62 @@ +package org.baeldung.mockito; + +import org.junit.Test; +import org.junit.runner.RunWith; +import static org.junit.Assert.assertEquals; + +import static org.mockito.Mockito.*; +import org.mockito.ArgumentCaptor; +import static org.mockito.Matchers.any; +import org.mockito.stubbing.Answer; +import org.mockito.runners.MockitoJUnitRunner; + +@RunWith(MockitoJUnitRunner.class) +public class MockitoVoidMethodsTest { + + @Test + public void whenAddCalledVerified() { + MyList mockVoid = mock(MyList.class); + mockVoid.add(0, ""); + verify(mockVoid, times(1)).add(0, ""); + } + + @Test(expected = Exception.class) + public void givenNull_addThrows() { + MyList mockVoid = mock(MyList.class); + doThrow().when(mockVoid).add(isA(Integer.class), isNull()); + mockVoid.add(0, null); + } + + @Test + public void whenAddCalledValueCaptured() { + MyList mockVoid = mock(MyList.class); + ArgumentCaptor valueCapture = ArgumentCaptor.forClass(String.class); + doNothing().when(mockVoid).add(any(Integer.class), valueCapture.capture()); + mockVoid.add(0, "captured"); + assertEquals("captured", valueCapture.getValue()); + } + + @Test + public void whenAddCalledAnswered() { + MyList mockVoid = mock(MyList.class); + doAnswer((Answer) invocation -> { + Object arg0 = invocation.getArgument(0); + Object arg1 = invocation.getArgument(1); + + //do something with the arguments here + assertEquals(3, arg0); + assertEquals("answer me", arg1); + + return null; + }).when(mockVoid).add(any(Integer.class), any(String.class)); + mockVoid.add(3, "answer me"); + } + + @Test + public void whenAddCalledRealMethodCalled() { + MyList mockVoid = mock(MyList.class); + doCallRealMethod().when(mockVoid).add(any(Integer.class), any(String.class)); + mockVoid.add(1, "real"); + verify(mockVoid, times(1)).add(1, "real"); + } +} diff --git a/mockito/src/test/java/org/baeldung/mockito/MyList.java b/mockito/src/test/java/org/baeldung/mockito/MyList.java index be69ef8a8a..0b501225ad 100644 --- a/mockito/src/test/java/org/baeldung/mockito/MyList.java +++ b/mockito/src/test/java/org/baeldung/mockito/MyList.java @@ -14,4 +14,9 @@ class MyList extends AbstractList { return 1; } + @Override + public void add(int index, String element) { + // no-op + } + } From dc349c17a89e56f4ea0f516cb172ac8966eba4d0 Mon Sep 17 00:00:00 2001 From: Michael C Good <31810784+michaelcgood@users.noreply.github.com> Date: Fri, 27 Oct 2017 00:32:25 -0400 Subject: [PATCH 136/197] BAEL-1238 michael.good703@gmail.com (#2879) * michael.good703@gmail.com michael.good703@gmail.com * michael.good703@gmail.com michael.good703@gmail.com * michael.good703@gmail.com michael.good703@gmail.com * update --- spring-boot/.factorypath | 149 ++++++++++++++++++ spring-boot/.gitignore | 1 + spring-boot/pom.xml | 16 +- .../java/com/baeldung/keycloak/Customer.java | 42 +++++ .../com/baeldung/keycloak/CustomerDAO.java | 7 + .../com/baeldung/keycloak/SecurityConfig.java | 52 ++++++ .../com/baeldung/keycloak/SpringBoot.java | 13 ++ .../com/baeldung/keycloak/WebController.java | 52 ++++++ .../src/main/resources/application.properties | 7 + .../main/resources/templates/customers.html | 33 ++++ .../main/resources/templates/external.html | 31 ++++ .../src/main/resources/templates/layout.html | 18 +++ .../keycloak/KeycloakConfigurationTest.java | 53 +++++++ .../src/main/webapp/META-INF/MANIFEST.MF | 3 + 14 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 spring-boot/.factorypath create mode 100644 spring-boot/src/main/java/com/baeldung/keycloak/Customer.java create mode 100644 spring-boot/src/main/java/com/baeldung/keycloak/CustomerDAO.java create mode 100644 spring-boot/src/main/java/com/baeldung/keycloak/SecurityConfig.java create mode 100644 spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java create mode 100644 spring-boot/src/main/java/com/baeldung/keycloak/WebController.java create mode 100644 spring-boot/src/main/resources/templates/customers.html create mode 100644 spring-boot/src/main/resources/templates/external.html create mode 100644 spring-boot/src/main/resources/templates/layout.html create mode 100644 spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java create mode 100644 spring-jms/src/main/webapp/META-INF/MANIFEST.MF diff --git a/spring-boot/.factorypath b/spring-boot/.factorypath new file mode 100644 index 0000000000..aa15485f5c --- /dev/null +++ b/spring-boot/.factorypath @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-boot/.gitignore b/spring-boot/.gitignore index e26d6af438..a64317df5e 100644 --- a/spring-boot/.gitignore +++ b/spring-boot/.gitignore @@ -2,3 +2,4 @@ .settings/ .classpath .project +/.apt_generated/ diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 9d44de64a3..583aaf2984 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -24,7 +24,10 @@ org.springframework.boot spring-boot-starter-web - + + org.keycloak + keycloak-spring-boot-starter + org.springframework.boot spring-boot-starter-data-jpa @@ -170,6 +173,17 @@ artemis-server + + + + org.keycloak.bom + keycloak-adapter-bom + 3.3.0.CR2 + pom + import + + + spring-boot diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/Customer.java b/spring-boot/src/main/java/com/baeldung/keycloak/Customer.java new file mode 100644 index 0000000000..c35eebf4c5 --- /dev/null +++ b/spring-boot/src/main/java/com/baeldung/keycloak/Customer.java @@ -0,0 +1,42 @@ +package com.baeldung.keycloak; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class Customer { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + private String name; + private String serviceRendered; + private String address; + + public long getId() { + return id; + } + public void setId(long id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getServiceRendered() { + return serviceRendered; + } + public void setServiceRendered(String serviceRendered) { + this.serviceRendered = serviceRendered; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + +} diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/CustomerDAO.java b/spring-boot/src/main/java/com/baeldung/keycloak/CustomerDAO.java new file mode 100644 index 0000000000..20d992d335 --- /dev/null +++ b/spring-boot/src/main/java/com/baeldung/keycloak/CustomerDAO.java @@ -0,0 +1,7 @@ +package com.baeldung.keycloak; + +import org.springframework.data.repository.CrudRepository; + +public interface CustomerDAO extends CrudRepository { + +} diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/SecurityConfig.java b/spring-boot/src/main/java/com/baeldung/keycloak/SecurityConfig.java new file mode 100644 index 0000000000..4ecb62b6d4 --- /dev/null +++ b/spring-boot/src/main/java/com/baeldung/keycloak/SecurityConfig.java @@ -0,0 +1,52 @@ +package com.baeldung.keycloak; + +import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver; +import org.keycloak.adapters.springsecurity.KeycloakSecurityComponents; +import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider; +import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.core.authority.mapping.SimpleAuthorityMapper; +import org.springframework.security.core.session.SessionRegistryImpl; +import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy; +import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy; + +@Configuration +@EnableWebSecurity +@ComponentScan(basePackageClasses = KeycloakSecurityComponents.class) +class SecurityConfig extends KeycloakWebSecurityConfigurerAdapter { + // Submits the KeycloakAuthenticationProvider to the AuthenticationManager + @Autowired + public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + KeycloakAuthenticationProvider keycloakAuthenticationProvider = keycloakAuthenticationProvider(); + keycloakAuthenticationProvider.setGrantedAuthoritiesMapper(new SimpleAuthorityMapper()); + auth.authenticationProvider(keycloakAuthenticationProvider); + } + + @Bean + public KeycloakSpringBootConfigResolver KeycloakConfigResolver() { + return new KeycloakSpringBootConfigResolver(); + } + + // Specifies the session authentication strategy + @Bean + @Override + protected SessionAuthenticationStrategy sessionAuthenticationStrategy() { + return new RegisterSessionAuthenticationStrategy(new SessionRegistryImpl()); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + super.configure(http); + http.authorizeRequests() + .antMatchers("/customers*") + .hasRole("user") + .anyRequest() + .permitAll(); + } +} diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java b/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java new file mode 100644 index 0000000000..87b22cf50a --- /dev/null +++ b/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java @@ -0,0 +1,13 @@ +package com.baeldung.keycloak; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringBoot { + + public static void main(String[] args) { + SpringApplication.run(SpringBoot.class, args); +} + +} diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/WebController.java b/spring-boot/src/main/java/com/baeldung/keycloak/WebController.java new file mode 100644 index 0000000000..3bafe1f195 --- /dev/null +++ b/spring-boot/src/main/java/com/baeldung/keycloak/WebController.java @@ -0,0 +1,52 @@ +package com.baeldung.keycloak; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +import java.security.Principal; + +import org.springframework.beans.factory.annotation.Autowired; + +@Controller +public class WebController { + + @Autowired + private CustomerDAO customerDAO; + + @GetMapping(path = "/") + public String index() { + return "external"; + } + + @GetMapping(path = "/customers") + public String customers(Principal principal, Model model) { + addCustomers(); + Iterable customers = customerDAO.findAll(); + model.addAttribute("customers", customers); + model.addAttribute("username", principal.getName()); + return "customers"; + } + + // add customers for demonstration + public void addCustomers() { + + Customer customer1 = new Customer(); + customer1.setAddress("1111 foo blvd"); + customer1.setName("Foo Industries"); + customer1.setServiceRendered("Important services"); + customerDAO.save(customer1); + + Customer customer2 = new Customer(); + customer2.setAddress("2222 bar street"); + customer2.setName("Bar LLP"); + customer2.setServiceRendered("Important services"); + customerDAO.save(customer2); + + Customer customer3 = new Customer(); + customer3.setAddress("33 main street"); + customer3.setName("Big LLC"); + customer3.setServiceRendered("Important services"); + customerDAO.save(customer3); + } +} diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties index 458b4e0d46..18d1223d43 100644 --- a/spring-boot/src/main/resources/application.properties +++ b/spring-boot/src/main/resources/application.properties @@ -49,3 +49,10 @@ contactInfoType=email endpoints.beans.id=springbeans endpoints.beans.sensitive=false + +#Keycloak Configuration +keycloak.auth-server-url=http://localhost:8180/auth +keycloak.realm=SpringBootKeycloak +keycloak.resource=login-app +keycloak.public-client=true +keycloak.principal-attribute=preferred_username diff --git a/spring-boot/src/main/resources/templates/customers.html b/spring-boot/src/main/resources/templates/customers.html new file mode 100644 index 0000000000..5a060d31da --- /dev/null +++ b/spring-boot/src/main/resources/templates/customers.html @@ -0,0 +1,33 @@ + + + + + +
    +

    + Hello, --name--. +

    + + + + + + + + + + + + + + + + + +
    IDNameAddressService Rendered
    Text ...Text ...Text ...Text...
    + +
    + + + diff --git a/spring-boot/src/main/resources/templates/external.html b/spring-boot/src/main/resources/templates/external.html new file mode 100644 index 0000000000..2f9cc76961 --- /dev/null +++ b/spring-boot/src/main/resources/templates/external.html @@ -0,0 +1,31 @@ + + + + + +
    +
    +

    Customer Portal

    +
    +
    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam + erat lectus, vehicula feugiat ultricies at, tempus sed ante. Cras + arcu erat, lobortis vitae quam et, mollis pharetra odio. Nullam sit + amet congue ipsum. Nunc dapibus odio ut ligula venenatis porta non + id dui. Duis nec tempor tellus. Suspendisse id blandit ligula, sit + amet varius mauris. Nulla eu eros pharetra, tristique dui quis, + vehicula libero. Aenean a neque sit amet tellus porttitor rutrum nec + at leo.

    + +

    Existing Customers

    +
    + Enter the intranet: customers +
    +
    + +
    + + + + diff --git a/spring-boot/src/main/resources/templates/layout.html b/spring-boot/src/main/resources/templates/layout.html new file mode 100644 index 0000000000..bab0c2982b --- /dev/null +++ b/spring-boot/src/main/resources/templates/layout.html @@ -0,0 +1,18 @@ + + + +Customer Portal + + + + + \ No newline at end of file diff --git a/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java b/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java new file mode 100644 index 0000000000..8e3436a8ef --- /dev/null +++ b/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java @@ -0,0 +1,53 @@ +package com.baeldung.keycloak; + + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.keycloak.KeycloakPrincipal; +import org.keycloak.KeycloakSecurityContext; +import org.keycloak.adapters.springboot.client.KeycloakSecurityContextClientRequestInterceptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.Spy; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import static org.junit.Assert.assertNotNull; +import static org.mockito.Mockito.when; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = SpringBoot.class) +public class KeycloakConfigurationTest { + + @Spy + private KeycloakSecurityContextClientRequestInterceptor factory; + + private MockHttpServletRequest servletRequest; + + @Mock + public KeycloakSecurityContext keycloakSecurityContext; + + @Mock + private KeycloakPrincipal keycloakPrincipal; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + servletRequest = new MockHttpServletRequest(); + RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(servletRequest)); + servletRequest.setUserPrincipal(keycloakPrincipal); + when(keycloakPrincipal.getKeycloakSecurityContext()).thenReturn(keycloakSecurityContext); + } + + @Test + public void testGetKeycloakSecurityContext() throws Exception { + assertNotNull(keycloakPrincipal.getKeycloakSecurityContext()); + } + + + +} diff --git a/spring-jms/src/main/webapp/META-INF/MANIFEST.MF b/spring-jms/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..5e9495128c --- /dev/null +++ b/spring-jms/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + From 7489cf6effece4e08ddc2bb2dc274278766472e5 Mon Sep 17 00:00:00 2001 From: nabyla <31042612+nabyla@users.noreply.github.com> Date: Fri, 27 Oct 2017 10:46:29 +0100 Subject: [PATCH 137/197] PR Bouncycastle article (#2882) * Add bouncycastle depedencies * Add certificate and private key to resources folder * add bouncycastle code sample * Add bouncycastle test --- libraries/pom.xml | 15 +++ .../bouncycastle/BouncyCastleCrypto.java | 111 ++++++++++++++++++ libraries/src/main/resources/Baeldung.cer | 20 ++++ libraries/src/main/resources/Baeldung.p12 | Bin 0 -> 2502 bytes .../bouncycastle/BouncyCastleLiveTest.java | 53 +++++++++ 5 files changed, 199 insertions(+) create mode 100644 libraries/src/main/java/com/baeldung/bouncycastle/BouncyCastleCrypto.java create mode 100644 libraries/src/main/resources/Baeldung.cer create mode 100644 libraries/src/main/resources/Baeldung.p12 create mode 100644 libraries/src/test/java/com/baeldung/bouncycastle/BouncyCastleLiveTest.java diff --git a/libraries/pom.xml b/libraries/pom.xml index b519b9cd53..409b4df08d 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -600,6 +600,21 @@ caffeine ${caffeine.version} + + org.bouncycastle + bcprov-jdk15on + 1.58 + + + org.bouncycastle + bcprov-jdk15on + 1.58 + + + org.bouncycastle + bcpkix-jdk15on + 1.58 + diff --git a/libraries/src/main/java/com/baeldung/bouncycastle/BouncyCastleCrypto.java b/libraries/src/main/java/com/baeldung/bouncycastle/BouncyCastleCrypto.java new file mode 100644 index 0000000000..5d8a7a6643 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/bouncycastle/BouncyCastleCrypto.java @@ -0,0 +1,111 @@ +package com.baeldung.bouncycastle; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.security.PrivateKey; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.cms.ContentInfo; +import org.bouncycastle.cert.X509CertificateHolder; +import org.bouncycastle.cert.jcajce.JcaCertStore; +import org.bouncycastle.cms.CMSAlgorithm; +import org.bouncycastle.cms.CMSEnvelopedData; +import org.bouncycastle.cms.CMSEnvelopedDataGenerator; +import org.bouncycastle.cms.CMSException; +import org.bouncycastle.cms.CMSProcessableByteArray; +import org.bouncycastle.cms.CMSSignedData; +import org.bouncycastle.cms.CMSSignedDataGenerator; +import org.bouncycastle.cms.CMSTypedData; +import org.bouncycastle.cms.KeyTransRecipientInformation; +import org.bouncycastle.cms.RecipientInformation; +import org.bouncycastle.cms.SignerInformation; +import org.bouncycastle.cms.SignerInformationStore; +import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; +import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder; +import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; +import org.bouncycastle.cms.jcajce.JceKeyTransRecipient; +import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; +import org.bouncycastle.operator.ContentSigner; +import org.bouncycastle.operator.OperatorCreationException; +import org.bouncycastle.operator.OutputEncryptor; +import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; +import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.bouncycastle.util.Store; + +public class BouncyCastleCrypto { + + public static byte[] signData(byte[] data, final X509Certificate signingCertificate, final PrivateKey signingKey) + throws CertificateEncodingException, OperatorCreationException, CMSException, IOException { + byte[] signedMessage = null; + List certList = new ArrayList(); + CMSTypedData cmsData = new CMSProcessableByteArray(data); + certList.add(signingCertificate); + Store certs = new JcaCertStore(certList); + CMSSignedDataGenerator cmsGenerator = new CMSSignedDataGenerator(); + ContentSigner contentSigner = new JcaContentSignerBuilder("SHA256withRSA").build(signingKey); + cmsGenerator.addSignerInfoGenerator( + new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider("BC").build()) + .build(contentSigner, signingCertificate)); + cmsGenerator.addCertificates(certs); + CMSSignedData cms = cmsGenerator.generate(cmsData, true); + signedMessage = cms.getEncoded(); + return signedMessage; + } + + public static boolean verifSignData(final byte[] signedData) + throws CMSException, IOException, OperatorCreationException, CertificateException { + ByteArrayInputStream bIn = new ByteArrayInputStream(signedData); + ASN1InputStream aIn = new ASN1InputStream(bIn); + CMSSignedData s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject())); + aIn.close(); + bIn.close(); + Store certs = s.getCertificates(); + SignerInformationStore signers = s.getSignerInfos(); + Collection c = signers.getSigners(); + SignerInformation signer = c.iterator().next(); + Collection certCollection = certs.getMatches(signer.getSID()); + Iterator certIt = certCollection.iterator(); + X509CertificateHolder certHolder = certIt.next(); + boolean verifResult = signer.verify(new JcaSimpleSignerInfoVerifierBuilder().build(certHolder)); + if (!verifResult) { + return false; + } + return true; + } + + public static byte[] encryptData(final byte[] data, X509Certificate encryptionCertificate) + throws CertificateEncodingException, CMSException, IOException { + byte[] encryptedData = null; + if (null != data && null != encryptionCertificate) { + CMSEnvelopedDataGenerator cmsEnvelopedDataGenerator = new CMSEnvelopedDataGenerator(); + JceKeyTransRecipientInfoGenerator jceKey = new JceKeyTransRecipientInfoGenerator(encryptionCertificate); + cmsEnvelopedDataGenerator.addRecipientInfoGenerator(jceKey); + CMSTypedData msg = new CMSProcessableByteArray(data); + OutputEncryptor encryptor = new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider("BC") + .build(); + CMSEnvelopedData cmsEnvelopedData = cmsEnvelopedDataGenerator.generate(msg, encryptor); + encryptedData = cmsEnvelopedData.getEncoded(); + } + return encryptedData; + } + + public static byte[] decryptData(final byte[] encryptedData, final PrivateKey decryptionKey) throws CMSException { + byte[] decryptedData = null; + if (null != encryptedData && null != decryptionKey) { + CMSEnvelopedData envelopedData = new CMSEnvelopedData(encryptedData); + Collection recip = envelopedData.getRecipientInfos().getRecipients(); + KeyTransRecipientInformation recipientInfo = (KeyTransRecipientInformation) recip.iterator().next(); + JceKeyTransRecipient recipient = new JceKeyTransEnvelopedRecipient(decryptionKey); + decryptedData = recipientInfo.getContent(recipient); + } + return decryptedData; + } +} diff --git a/libraries/src/main/resources/Baeldung.cer b/libraries/src/main/resources/Baeldung.cer new file mode 100644 index 0000000000..72d0918424 --- /dev/null +++ b/libraries/src/main/resources/Baeldung.cer @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDPjCCAiagAwIBAgIJAPvd1gx14C3CMA0GCSqGSIb3DQEBBQUAMEcxCzAJBgNV +BAYTAk1BMRAwDgYDVQQIEwdNb3JvY2NvMRMwEQYDVQQHEwpDYXNhYmxhbmNhMREw +DwYDVQQDEwhCYWVsZHVuZzAeFw0xNzEwMTIxMDQzMTRaFw0yNzEwMTMxMDQzMTRa +MEcxCzAJBgNVBAYTAk1BMRAwDgYDVQQIEwdNb3JvY2NvMRMwEQYDVQQHEwpDYXNh +YmxhbmNhMREwDwYDVQQDEwhCYWVsZHVuZzCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAMyi5GmOeN4QaH/CP5gSOyHX8znb5TDHWV8wc+ZT7kNU8zt5tGMh +jozK6hax155/6tOsBDR0rSYBhL+Dm/+uCVS7qOlRHhf6cNGtzGF1gnNJB2WjI8oM +AYm24xpLj1WphKUwKrn3nTMPnQup5OoNAMYl99flANrRYVjjxrLQvDZDUio6Iujr +CZ2TtXGM0g/gP++28KT7g1KlUui3xtB0u33wx7UN8Fix3JmjOaPHGwxGpwP3VGSj +fs8cuhqVwRQaZpCOoHU/P8wpXKw80sSdhz+SRueMPtVYqK0CiLL5/O0h0Y3le4IV +whgg3KG1iTGOWn60UMFn1EYmQ18k5Nsma6UCAwEAAaMtMCswCQYDVR0TBAIwADAR +BglghkgBhvhCAQEEBAMCBPAwCwYDVR0PBAQDAgUgMA0GCSqGSIb3DQEBBQUAA4IB +AQC8DDBmJ3p4xytxBiE0s4p1715WT6Dm/QJHp0XC0hkSoyZKDh+XVmrzm+J3SiW1 +vpswb5hLgPo040YX9jnDmgOD+TpleTuKHxZRYj92UYWmdjkWLVtFMcvOh+gxBiAP +pHIqZsqo8lfcyAuh8Jx834IXbknfCUtERDLG/rU9P/3XJhrM2GC5qPQznrW4EYhU +CGPyIJXmvATMVvXMWCtfogAL+n42vjYXQXZoAWomHhLHoNbSJUErnNdWDOh4WoJt +XJCxA6U5LSBplqb3wB2hUTqw+0admKltvmy+KA1PD7OxoGiY7V544zeGqJam1qxU +ia7y5BL6uOa/4ShSV8pcJDYz +-----END CERTIFICATE----- diff --git a/libraries/src/main/resources/Baeldung.p12 b/libraries/src/main/resources/Baeldung.p12 new file mode 100644 index 0000000000000000000000000000000000000000..65ec8bc8fec33120b2c11276883dde5dad7a3ea6 GIT binary patch literal 2502 zcmY+Ec{CJ^8pg-W7-KiSAxm~&AvE}qeFbou@HKRX#MCzW*R!0LL7Y% z7)Sr`m+g30_7yeFjs-&~fCI+{-yx;|%9MeT2(tgQ10!G4XA2 zkG>wSErwX=^nQsIu&jb*uF4fhJf{o`c{-h8IOQJ-3P1FiZj0wRF6K9 z8mc&Zv?tvBj9P!Y^4uoj2G=6#18%wBeI!8jBRU|{P+P>0Aj=k375X=>QV+%oS!bk}+lJ+=1;z2pF||>sP$r3Brd~; zK)4%I2x>Ka+<;kKSK~)>L|uxGz&8_NxTGL2SC%Ui58tY=@-RCRhmrcaiO=Kg3VLao zL4POxN4d@n*d5|D3|P>OiNs!L2y3}V91S9g=+MPm2z2B)8SfIlps2SxADFc?et7bp zX$NVVRh<~4WzxjUvYD%W)wYw9O8Brp^L0RcbZ~X#P4;$ zj@d^cTmNv5A?VBUvx?k4kPIs2@lgJ*dzk-y`e;r~_tMcguyihj(WZx;W7st6eU1^p zA%3;BP+|V=UsgnMaP2xR9K?kLwyMXM~nWS!589aEx|ZivtPE+FCig}|Cv7n z4X_Xg-u#7*)&HXc=rv2DY6l{514xv{C2smp+M* z0HVF+G4qecX9^nOQ_20k2BM02$9dQ593Rq`jJUz%jTp%B$M|BdRc91;W`+2m}mmXL+cwS z-&0lg5an|f6il`kXk#vPZhK2Z{$$;;@;0;b_10a*B5Rf5vKBR^@uJW`WS*}TZ=JLU zrj7F9)-nOh*HW4C!Otz_FqYnEa!4nC@x0Wy?`_DN=c%fjkhTs@U^UB&)l0w$4n{K* zxd;D}W@$I_F{l@h(sB)s*Iz+sw{FOEa8& z#EfydGU+EgJ3m#S4b&`TTCBfC)eJ1M>U(%yKc+7F3lI-0X##xff#=dtmj;cWs@*(1 zZXS(tbGXP@?braN#P>=GxwN^xFqQBRSvZbJniMWr*lo`MXc=JWLQ&?yr)-$(Q$h^t zmmrKH?`t%wDk~pX1aJ^CbU%HXCAh@rR6?f`m^|7yVOF)+`(Y=4B-tto(B<>E=#QYq z&@RDn^M$lUwdx-1I4h;lvzUX6)HqThjqi4SlgM#nYG;nAtd-nO%TPn)KA9c{jep;9 zv79sQ{V`P{aJuEBb+8(|yi8}R z6hXIAFE*35l(toZR?k^d;kDRbp0Bi3D0P+;?`sW)yZdU2IS(8r-PlbgD6J2GLhODl zx^Ea$kiSoZQ1qd#$ zrw<*y{e#y|n++B0#ujM&wp!KoH<8hT7JB{RiW`47kpL%2BP;hRkV5E^;HN+5b za*HI=nMx7`*nucDb(iCuuCi`KplQ=xzr^Ya{l%oz=!5s?{M_rv@Zq3;FGnmok06!C z!iZ>7b}M(R4R=#t|6J8 Date: Fri, 27 Oct 2017 13:23:32 -0400 Subject: [PATCH 138/197] BAEL-1238 Quick Guide to Using Keycloak with a Spring Boot Application (#2886) * michael.good703@gmail.com michael.good703@gmail.com * michael.good703@gmail.com michael.good703@gmail.com * michael.good703@gmail.com michael.good703@gmail.com * update From 6d0d878ba4f35435fe7fb91c55b63bee97aff27e Mon Sep 17 00:00:00 2001 From: daoire Date: Fri, 27 Oct 2017 20:59:09 +0100 Subject: [PATCH 139/197] Update README.md (#2887) --- spring-jpa/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-jpa/README.md b/spring-jpa/README.md index 70f4404f98..d93271164c 100644 --- a/spring-jpa/README.md +++ b/spring-jpa/README.md @@ -14,6 +14,7 @@ - [Spring, Hibernate and a JNDI Datasource](http://www.baeldung.com/spring-persistence-jpa-jndi-datasource) - [Deleting Objects with Hibernate](http://www.baeldung.com/delete-with-hibernate) - [Self-Contained Testing Using an In-Memory Database](http://www.baeldung.com/spring-jpa-test-in-memory-database) +- [Spring Data JPA – Adding a Method in All Repositories](http://www.baeldung.com/spring-data-jpa-method-in-all-repositories) ### Eclipse Config After importing the project into Eclipse, you may see the following error: From 303db6c66357f2258d3738b452f205cb69a68b79 Mon Sep 17 00:00:00 2001 From: Shaimaa Shalaby Date: Fri, 27 Oct 2017 23:42:37 +0200 Subject: [PATCH 140/197] Intro to JDO Queries 2/2 article (#2871) * ADD MyApp.java class ProductItem.java class modify: package.jdo to add a named query pom.xml to add datanucleus-jdo-query.jar * remove sys.out statements --- libraries/pom.xml | 54 +++++---- .../java/com/baeldung/jdo/query/MyApp.java | 104 ++++++++++++++++++ .../com/baeldung/jdo/query/ProductItem.java | 68 ++++++++++++ .../src/main/resources/META-INF/package.jdo | 10 +- 4 files changed, 214 insertions(+), 22 deletions(-) create mode 100644 libraries/src/main/java/com/baeldung/jdo/query/MyApp.java create mode 100644 libraries/src/main/java/com/baeldung/jdo/query/ProductItem.java diff --git a/libraries/pom.xml b/libraries/pom.xml index 409b4df08d..d04234bf2f 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> parent-modules com.baeldung @@ -105,6 +105,13 @@ + + maven-compiler-plugin + + 1.8 + 1.8 + +     @@ -326,6 +333,11 @@ datanucleus-xml 5.0.0-release + + org.datanucleus + datanucleus-jdo-query + 5.0.2 + net.openhft chronicle @@ -546,29 +558,29 @@ ${protonpack.version} - org.functionaljava - functionaljava - 4.7 - - - org.functionaljava - functionaljava-java8 - 4.7 + org.functionaljava + functionaljava + 4.7 - org.functionaljava - functionaljava-quickcheck - 4.7 - - - org.functionaljava - functionaljava-java-core - 4.7 + org.functionaljava + functionaljava-java8 + 4.7 - javax.cache - cache-api - ${cache.version} + org.functionaljava + functionaljava-quickcheck + 4.7 + + + org.functionaljava + functionaljava-java-core + 4.7 + + + javax.cache + cache-api + ${cache.version} com.hazelcast @@ -581,7 +593,7 @@ 1.0.1 - com.netopyr.wurmloch + com.netopyr.wurmloch wurmloch-crdt ${crdt.version} diff --git a/libraries/src/main/java/com/baeldung/jdo/query/MyApp.java b/libraries/src/main/java/com/baeldung/jdo/query/MyApp.java new file mode 100644 index 0000000000..384dde48d1 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/jdo/query/MyApp.java @@ -0,0 +1,104 @@ +package com.baeldung.jdo.query; + +import java.util.List; + +import javax.jdo.JDOQLTypedQuery; +import javax.jdo.PersistenceManager; +import javax.jdo.PersistenceManagerFactory; +import javax.jdo.Query; + +import org.datanucleus.api.jdo.JDOPersistenceManagerFactory; +import org.datanucleus.metadata.PersistenceUnitMetaData; + +public class MyApp { + + private static PersistenceManagerFactory pmf; + private static PersistenceManager pm; + + public static void main(String[] args) { + + defineDynamicPersistentUnit(); + createTestData(); + queryUsingJDOQL(); + queryUsingTypedJDOQL(); + queryUsingSQL(); + queryUsingJPQL(); + + } + + public static void createTestData(){ + ProductItem item1 = new ProductItem("supportedItem", "price less than 10", "SoldOut",5); + ProductItem item2 = new ProductItem("pro2", "price less than 10","InStock", 8); + ProductItem item3 = new ProductItem("pro3", "price more than 10","SoldOut", 15); + + if( pm != null ){ + pm.makePersistent(item1); + pm.makePersistent(item2); + pm.makePersistent(item3); + } + } + + public static void defineDynamicPersistentUnit(){ + + PersistenceUnitMetaData pumd = new PersistenceUnitMetaData("dynamic-unit", "RESOURCE_LOCAL", null); + pumd.addProperty("javax.jdo.option.ConnectionURL", "jdbc:mysql://localhost:3306/jdo_db"); + pumd.addProperty("javax.jdo.option.ConnectionUserName", "root"); + pumd.addProperty("javax.jdo.option.ConnectionPassword", "admin"); + pumd.addProperty("javax.jdo.option.ConnectionDriverName", "com.mysql.jdbc.Driver"); + pumd.addProperty("datanucleus.schema.autoCreateAll", "true"); + + pmf = new JDOPersistenceManagerFactory(pumd, null); + pm = pmf.getPersistenceManager(); + } + + public static void queryUsingJDOQL(){ + + Query query = pm.newQuery("SELECT FROM com.baeldung.jdo.query.ProductItem " + + "WHERE price < threshold PARAMETERS double threshold"); + List explicitParamResults = (List)query.execute(10); + + query = pm.newQuery("SELECT FROM " + + "com.baeldung.jdo.query.ProductItem WHERE price < :threshold"); + query.setParameters("double threshold"); + List explicitParamResults2 = (List)query.execute(10); + + query = pm.newQuery("SELECT FROM " + + "com.baeldung.jdo.query.ProductItem WHERE price < :threshold"); + List implicitParamResults = (List)query.execute(10); + + } + + public static void queryUsingTypedJDOQL(){ + + JDOQLTypedQuery tq = pm.newJDOQLTypedQuery(ProductItem.class); + QProductItem cand = QProductItem.candidate(); + tq=tq.filter(cand.price.lt(10).and(cand.name.startsWith("pro"))); + List results = tq.executeList(); + + } + + public static void queryUsingSQL(){ + + Query query = pm.newQuery("javax.jdo.query.SQL","select * from " + + "product_item where price < ? and status = ?"); + query.setClass(ProductItem.class); + query.setParameters(10,"InStock"); + List results = query.executeList(); + + } + + public static void queryUsingJPQL(){ + Query query = pm.newQuery("JPQL","select i from " + + "com.baeldung.jdo.query.ProductItem i where i.price < 10" + + " and i.status = 'InStock'"); + List results = (List) query.execute(); + + } + + public static void namedQuery(){ + Query query = pm.newNamedQuery( + ProductItem.class, "PriceBelow10"); + List results = query.executeList(); + + } +} diff --git a/libraries/src/main/java/com/baeldung/jdo/query/ProductItem.java b/libraries/src/main/java/com/baeldung/jdo/query/ProductItem.java new file mode 100644 index 0000000000..52221a7d97 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/jdo/query/ProductItem.java @@ -0,0 +1,68 @@ +package com.baeldung.jdo.query; + +import javax.jdo.annotations.IdGeneratorStrategy; +import javax.jdo.annotations.PersistenceAware; +import javax.jdo.annotations.PersistenceCapable; +import javax.jdo.annotations.Persistent; +import javax.jdo.annotations.PrimaryKey; + +@PersistenceCapable(table = "product_item") +public class ProductItem { + + @PrimaryKey + @Persistent(valueStrategy=IdGeneratorStrategy.INCREMENT) + int id; + String name; + String description; + String status; + double price; + + public ProductItem(){ + + } + + public ProductItem(String name,String description,String status,double price){ + this.name=name; + this.description = description; + this.status = status; + this.price = price; + } + + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + public double getPrice() { + return price; + } + public void setPrice(double price) { + this.price = price; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + +} diff --git a/libraries/src/main/resources/META-INF/package.jdo b/libraries/src/main/resources/META-INF/package.jdo index d30207e2e0..d3cf501bb6 100644 --- a/libraries/src/main/resources/META-INF/package.jdo +++ b/libraries/src/main/resources/META-INF/package.jdo @@ -16,6 +16,14 @@ - + + + + + + + + \ No newline at end of file From fb283f35c73a02ad664f8de49cfb1217d650fb1f Mon Sep 17 00:00:00 2001 From: dimitarsazdovski Date: Fri, 27 Oct 2017 23:45:27 +0200 Subject: [PATCH 141/197] BAEL 148 move to this repo (#2885) --- spring-groovy/pom.xml | 33 +++++++++++ .../com/baeldug/groovyconfig/BandsBean.java | 17 ++++++ .../groovyconfig/GroovyBeanConfig.groovy | 18 ++++++ .../baeldug/groovyconfig/JavaBeanConfig.java | 21 +++++++ .../baeldug/groovyconfig/JavaPersonBean.java | 57 +++++++++++++++++++ .../src/main/resources/xml-bean-config.xml | 12 ++++ .../groovyconfig/GroovyConfigurationTest.java | 50 ++++++++++++++++ .../groovyconfig/JavaConfigurationTest.java | 24 ++++++++ .../groovyconfig/XmlConfigurationTest.java | 23 ++++++++ 9 files changed, 255 insertions(+) create mode 100644 spring-groovy/src/main/java/com/baeldug/groovyconfig/BandsBean.java create mode 100644 spring-groovy/src/main/java/com/baeldug/groovyconfig/GroovyBeanConfig.groovy create mode 100644 spring-groovy/src/main/java/com/baeldug/groovyconfig/JavaBeanConfig.java create mode 100644 spring-groovy/src/main/java/com/baeldug/groovyconfig/JavaPersonBean.java create mode 100644 spring-groovy/src/main/resources/xml-bean-config.xml create mode 100644 spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationTest.java create mode 100644 spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationTest.java create mode 100644 spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationTest.java diff --git a/spring-groovy/pom.xml b/spring-groovy/pom.xml index 59c7ba4a7c..9086369fa4 100644 --- a/spring-groovy/pom.xml +++ b/spring-groovy/pom.xml @@ -37,5 +37,38 @@ spring-integration-groovy 4.3.7.RELEASE + + org.codehaus.groovy + groovy-all + 2.4.12 + + + + + maven-compiler-plugin + 3.7.0 + + groovy-eclipse-compiler + true + 1.8 + 1.8 + ${project.build.sourceEncoding} + + + + org.codehaus.groovy + groovy-eclipse-compiler + 2.9.2-01 + + + org.codehaus.groovy + groovy-eclipse-batch + 2.4.3-01 + + + + + + diff --git a/spring-groovy/src/main/java/com/baeldug/groovyconfig/BandsBean.java b/spring-groovy/src/main/java/com/baeldug/groovyconfig/BandsBean.java new file mode 100644 index 0000000000..1deba5d2f6 --- /dev/null +++ b/spring-groovy/src/main/java/com/baeldug/groovyconfig/BandsBean.java @@ -0,0 +1,17 @@ +package com.baeldug.groovyconfig; + +import java.util.ArrayList; +import java.util.List; + +public class BandsBean { + + private List bandsList = new ArrayList<>(); + + public List getBandsList() { + return bandsList; + } + + public void setBandsList(List bandsList) { + this.bandsList = bandsList; + } +} diff --git a/spring-groovy/src/main/java/com/baeldug/groovyconfig/GroovyBeanConfig.groovy b/spring-groovy/src/main/java/com/baeldug/groovyconfig/GroovyBeanConfig.groovy new file mode 100644 index 0000000000..32a6fedff0 --- /dev/null +++ b/spring-groovy/src/main/java/com/baeldug/groovyconfig/GroovyBeanConfig.groovy @@ -0,0 +1,18 @@ +package com.baeldug.groovyconfig; + +beans { + javaPesronBean(JavaPersonBean) { + firstName = 'John' + lastName = 'Doe' + age ='32' + eyesColor = 'blue' + hairColor='black' + } + + bandsBean(BandsBean) { bean-> + bean.scope = "singleton" + bandsList=['Nirvana', 'Pearl Jam', 'Foo Fighters'] + } + + registerAlias("bandsBean","bands") +} diff --git a/spring-groovy/src/main/java/com/baeldug/groovyconfig/JavaBeanConfig.java b/spring-groovy/src/main/java/com/baeldug/groovyconfig/JavaBeanConfig.java new file mode 100644 index 0000000000..7c4238ae28 --- /dev/null +++ b/spring-groovy/src/main/java/com/baeldug/groovyconfig/JavaBeanConfig.java @@ -0,0 +1,21 @@ +package com.baeldug.groovyconfig; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class JavaBeanConfig { + + @Bean + public JavaPersonBean javaPerson() { + JavaPersonBean jPerson = new JavaPersonBean(); + jPerson.setFirstName("John"); + jPerson.setLastName("Doe"); + jPerson.setAge("31"); + jPerson.setEyesColor("green"); + jPerson.setHairColor("blond"); + + return jPerson; + } + +} diff --git a/spring-groovy/src/main/java/com/baeldug/groovyconfig/JavaPersonBean.java b/spring-groovy/src/main/java/com/baeldug/groovyconfig/JavaPersonBean.java new file mode 100644 index 0000000000..db988d4abf --- /dev/null +++ b/spring-groovy/src/main/java/com/baeldug/groovyconfig/JavaPersonBean.java @@ -0,0 +1,57 @@ +package com.baeldug.groovyconfig; + +public class JavaPersonBean { + + public String jj; + + private String firstName; + + private String lastName; + + private String age; + + private String eyesColor; + + private String hairColor; + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getAge() { + return age; + } + + public void setAge(String age) { + this.age = age; + } + + public String getEyesColor() { + return eyesColor; + } + + public void setEyesColor(String eyesColor) { + this.eyesColor = eyesColor; + } + + public String getHairColor() { + return hairColor; + } + + public void setHairColor(String hairColor) { + this.hairColor = hairColor; + } + +} diff --git a/spring-groovy/src/main/resources/xml-bean-config.xml b/spring-groovy/src/main/resources/xml-bean-config.xml new file mode 100644 index 0000000000..3b880bbd70 --- /dev/null +++ b/spring-groovy/src/main/resources/xml-bean-config.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationTest.java b/spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationTest.java new file mode 100644 index 0000000000..91ca6dbfe9 --- /dev/null +++ b/spring-groovy/src/test/java/com/baeldug/groovyconfig/GroovyConfigurationTest.java @@ -0,0 +1,50 @@ +package com.baeldug.groovyconfig; + +import static org.junit.Assert.assertEquals; + +import java.io.File; + +import org.junit.Test; +import org.springframework.context.support.GenericGroovyApplicationContext; + +public class GroovyConfigurationTest { + + private static final String FILE_NAME = "GroovyBeanConfig.groovy"; + private static final String FILE_PATH = "src/main/java/com/baeldug/groovyconfig/"; + + @Test + public void whenGroovyConfig_thenCorrectPerson() throws Exception { + + GenericGroovyApplicationContext ctx = new GenericGroovyApplicationContext(); + ctx.load("file:" + getPathPart() + FILE_NAME); + ctx.refresh(); + + JavaPersonBean j = ctx.getBean(JavaPersonBean.class); + + assertEquals("32", j.getAge()); + assertEquals("blue", j.getEyesColor()); + assertEquals("black", j.getHairColor()); + } + + @Test + public void whenGroovyConfig_thenCorrectListLength() throws Exception { + + GenericGroovyApplicationContext ctx = new GenericGroovyApplicationContext(); + ctx.load("file:" + getPathPart() + FILE_NAME); + ctx.refresh(); + + BandsBean bb = ctx.getBean(BandsBean.class); + + assertEquals(3, bb.getBandsList() + .size()); + } + + private String getPathPart() { + String pathPart = new File(".").getAbsolutePath(); + pathPart = pathPart.replace(".", ""); + pathPart = pathPart.replace("\\", "/"); + pathPart = pathPart + FILE_PATH; + + return pathPart; + } +} diff --git a/spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationTest.java b/spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationTest.java new file mode 100644 index 0000000000..2d9b1000ff --- /dev/null +++ b/spring-groovy/src/test/java/com/baeldug/groovyconfig/JavaConfigurationTest.java @@ -0,0 +1,24 @@ +package com.baeldug.groovyconfig; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; + +public class JavaConfigurationTest { + + @Test + public void whenJavaConfig_thenCorrectPerson() { + + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); + ctx.register(JavaBeanConfig.class); + ctx.refresh(); + + JavaPersonBean j = ctx.getBean(JavaPersonBean.class); + + assertEquals("31", j.getAge()); + assertEquals("green", j.getEyesColor()); + assertEquals("blond", j.getHairColor()); + + } +} diff --git a/spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationTest.java b/spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationTest.java new file mode 100644 index 0000000000..3ee724207c --- /dev/null +++ b/spring-groovy/src/test/java/com/baeldug/groovyconfig/XmlConfigurationTest.java @@ -0,0 +1,23 @@ +package com.baeldug.groovyconfig; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class XmlConfigurationTest { + + @Test + public void whenXmlConfig_thenCorrectPerson() { + final ApplicationContext applicationContext = new ClassPathXmlApplicationContext("xml-bean-config.xml"); + + JavaPersonBean j = (JavaPersonBean) applicationContext.getBean("JavaPersonBean"); + + assertEquals("30", j.getAge()); + assertEquals("brown", j.getEyesColor()); + assertEquals("brown", j.getHairColor()); + + } + +} From 26f38c1b69f29e92ecef3f2e8988b5a772256a00 Mon Sep 17 00:00:00 2001 From: Hany Ahmed Date: Sat, 28 Oct 2017 04:48:33 +0200 Subject: [PATCH 142/197] JUnit5 with Mockito using @ExtendWith (#2770) * JUnit5 with Mockito using @ExtendWith * rename method: givenUserWithExistingName_whenSaveUser_thenGiveUsernameAlreadyExistsError rename this class according to the standard -- UserServiceUnitTest.java --- junit5/pom.xml | 7 +- .../com/baeldung/junit5/mockito/User.java | 41 ++++++ .../junit5/mockito/repository/MailClient.java | 9 ++ .../mockito/repository/SettingRepository.java | 9 ++ .../mockito/repository/UserRepository.java | 10 ++ .../mockito/service/DefaultUserService.java | 46 +++++++ .../junit5/mockito/service/Errors.java | 10 ++ .../junit5/mockito/service/UserService.java | 9 ++ .../junit5/mockito/MockitoExtension.java | 75 +++++++++++ .../junit5/mockito/UserServiceUnitTest.java | 122 ++++++++++++++++++ 10 files changed, 335 insertions(+), 3 deletions(-) create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/User.java create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java create mode 100644 junit5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java create mode 100644 junit5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java diff --git a/junit5/pom.xml b/junit5/pom.xml index 1fa4818447..b820d7b7bc 100644 --- a/junit5/pom.xml +++ b/junit5/pom.xml @@ -19,11 +19,12 @@ UTF-8 1.8 - 5.0.0-RC2 - 1.0.0-RC2 - 4.12.0-RC2 + 5.0.1 + 1.0.1 + 4.12.1 2.8.2 1.4.196 + 2.11.0 3.6.0 2.19.1 diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/User.java b/junit5/src/main/java/com/baeldung/junit5/mockito/User.java new file mode 100644 index 0000000000..4276fd62b9 --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/mockito/User.java @@ -0,0 +1,41 @@ +package com.baeldung.junit5.mockito; + +public class User { + + private Integer id; + private String name; + private int age; + + public User() { + } + + public User(String name, int age) { + this.name = name; + this.age = age; + } + + public Integer getId() { + return id; + } + public void setId(Integer id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public int getAge() { + return age; + } + public void setAge(int age) { + this.age = age; + } + + @Override + public String toString() { + return "User [id=" + id + ", name=" + name + ", age=" + age + "]"; + } + +} diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java b/junit5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java new file mode 100644 index 0000000000..d10169ef7a --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/mockito/repository/MailClient.java @@ -0,0 +1,9 @@ +package com.baeldung.junit5.mockito.repository; + +import com.baeldung.junit5.mockito.User; + +public interface MailClient { + + void sendUserRegistrationMail(User user); + +} diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java b/junit5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java new file mode 100644 index 0000000000..23ae8fa35c --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/mockito/repository/SettingRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.junit5.mockito.repository; + +public interface SettingRepository { + + int getUserMinAge(); + + int getUserNameMinLength(); + +} diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java b/junit5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java new file mode 100644 index 0000000000..e1b84c774b --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/mockito/repository/UserRepository.java @@ -0,0 +1,10 @@ +package com.baeldung.junit5.mockito.repository; + +import com.baeldung.junit5.mockito.User; + +public interface UserRepository { + + User insert(User user); + boolean isUsernameAlreadyExists(String userName); + +} diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java b/junit5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java new file mode 100644 index 0000000000..888edbd710 --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/mockito/service/DefaultUserService.java @@ -0,0 +1,46 @@ +package com.baeldung.junit5.mockito.service; + +import com.baeldung.junit5.mockito.User; +import com.baeldung.junit5.mockito.repository.MailClient; +import com.baeldung.junit5.mockito.repository.SettingRepository; +import com.baeldung.junit5.mockito.repository.UserRepository; + +public class DefaultUserService implements UserService { + + private UserRepository userRepository; + private SettingRepository settingRepository; + private MailClient mailClient; + + public DefaultUserService(UserRepository userRepository, SettingRepository settingRepository, MailClient mailClient) { + this.userRepository = userRepository; + this.settingRepository = settingRepository; + this.mailClient = mailClient; + } + + @Override + public User register(User user) { + validate(user); + User insertedUser = userRepository.insert(user); + mailClient.sendUserRegistrationMail(insertedUser); + return insertedUser; + } + + private void validate(User user) { + if(user.getName() == null) { + throw new RuntimeException(Errors.USER_NAME_REQUIRED); + } + + if(user.getName().length() < settingRepository.getUserNameMinLength()) { + throw new RuntimeException(Errors.USER_NAME_SHORT); + } + + if(user.getAge() < settingRepository.getUserMinAge()) { + throw new RuntimeException(Errors.USER_AGE_YOUNG); + } + + if(userRepository.isUsernameAlreadyExists(user.getName())) { + throw new RuntimeException(Errors.USER_NAME_DUPLICATE); + } + } + +} diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java b/junit5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java new file mode 100644 index 0000000000..28283754a3 --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/mockito/service/Errors.java @@ -0,0 +1,10 @@ +package com.baeldung.junit5.mockito.service; + +public class Errors { + + public static final String USER_NAME_REQUIRED = "user.name.required"; + public static final String USER_NAME_SHORT = "user.name.short"; + public static final String USER_AGE_YOUNG = "user.age.young"; + public static final String USER_NAME_DUPLICATE = "user.name.duplicate"; + +} diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java b/junit5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java new file mode 100644 index 0000000000..326d019b4a --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/mockito/service/UserService.java @@ -0,0 +1,9 @@ +package com.baeldung.junit5.mockito.service; + +import com.baeldung.junit5.mockito.User; + +public interface UserService { + + User register(User user); + +} diff --git a/junit5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java b/junit5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java new file mode 100644 index 0000000000..5836ef46e6 --- /dev/null +++ b/junit5/src/test/java/com/baeldung/junit5/mockito/MockitoExtension.java @@ -0,0 +1,75 @@ +/* + * Copyright 2015-2016 the original author or authors. + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution and is available at + * + * http://www.eclipse.org/legal/epl-v10.html + */ + +package com.baeldung.junit5.mockito; + +import static org.mockito.Mockito.mock; + +import java.lang.reflect.Parameter; + +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ExtensionContext.Namespace; +import org.junit.jupiter.api.extension.ExtensionContext.Store; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolver; +import org.junit.jupiter.api.extension.TestInstancePostProcessor; +import org.mockito.MockitoAnnotations; +import org.mockito.Mock; + +/** + * {@code MockitoExtension} showcases the {@link TestInstancePostProcessor} + * and {@link ParameterResolver} extension APIs of JUnit 5 by providing + * dependency injection support at the field level and at the method parameter + * level via Mockito 2.x's {@link Mock @Mock} annotation. + * + * @since 5.0 + */ +public class MockitoExtension implements TestInstancePostProcessor, ParameterResolver { + + @Override + public void postProcessTestInstance(Object testInstance, ExtensionContext context) { + MockitoAnnotations.initMocks(testInstance); + } + + @Override + public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { + return parameterContext.getParameter().isAnnotationPresent(Mock.class); + } + + @Override + public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { + return getMock(parameterContext.getParameter(), extensionContext); + } + + private Object getMock(Parameter parameter, ExtensionContext extensionContext) { + Class mockType = parameter.getType(); + Store mocks = extensionContext.getStore(Namespace.create(MockitoExtension.class, mockType)); + String mockName = getMockName(parameter); + + if (mockName != null) { + return mocks.getOrComputeIfAbsent(mockName, key -> mock(mockType, mockName)); + } + else { + return mocks.getOrComputeIfAbsent(mockType.getCanonicalName(), key -> mock(mockType)); + } + } + + private String getMockName(Parameter parameter) { + String explicitMockName = parameter.getAnnotation(Mock.class).name().trim(); + if (!explicitMockName.isEmpty()) { + return explicitMockName; + } + else if (parameter.isNamePresent()) { + return parameter.getName(); + } + return null; + } + +} \ No newline at end of file diff --git a/junit5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java b/junit5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java new file mode 100644 index 0000000000..1ddab0531a --- /dev/null +++ b/junit5/src/test/java/com/baeldung/junit5/mockito/UserServiceUnitTest.java @@ -0,0 +1,122 @@ +package com.baeldung.junit5.mockito; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import com.baeldung.junit5.mockito.repository.MailClient; +import com.baeldung.junit5.mockito.repository.SettingRepository; +import com.baeldung.junit5.mockito.repository.UserRepository; +import com.baeldung.junit5.mockito.service.DefaultUserService; +import com.baeldung.junit5.mockito.service.Errors; +import com.baeldung.junit5.mockito.service.UserService; + +@RunWith(JUnitPlatform.class) +@ExtendWith(MockitoExtension.class) +public class UserServiceUnitTest { + + UserService userService; + @Mock UserRepository userRepository; + + User user; + + @BeforeEach + void init(@Mock SettingRepository settingRepository, @Mock MailClient mailClient) { + userService = new DefaultUserService(userRepository, settingRepository, mailClient); + when(settingRepository.getUserMinAge()).thenReturn(10); + when(settingRepository.getUserNameMinLength()).thenReturn(4); + when(userRepository.isUsernameAlreadyExists(any(String.class))).thenReturn(false); + } + + @Test + void givenValidUser_whenSaveUser_thenSucceed(@Mock MailClient mailClient) { + // Given + user = new User("Jerry", 12); + when(userRepository.insert(any(User.class))).then(new Answer() { + int sequence = 1; + + @Override + public User answer(InvocationOnMock invocation) throws Throwable { + User user = (User) invocation.getArgument(0); + user.setId(sequence++); + return user; + } + }); + + // When + User insertedUser = userService.register(user); + + // Then + verify(userRepository).insert(user); + Assertions.assertNotNull(user.getId()); + verify(mailClient).sendUserRegistrationMail(insertedUser); + } + + @Test + void givenShortName_whenSaveUser_thenGiveShortUsernameError() { + // Given + user = new User("tom", 12); + + // When + try { + userService.register(user); + fail("Should give an error"); + } catch(Exception ex) { + assertEquals(ex.getMessage(), Errors.USER_NAME_SHORT); + } + + // Then + verify(userRepository, never()).insert(user); + } + + @Test + void givenSmallAge_whenSaveUser_thenGiveYoungUserError() { + // Given + user = new User("jerry", 3); + + // When + try { + userService.register(user); + fail("Should give an error"); + } catch(Exception ex) { + assertEquals(ex.getMessage(), Errors.USER_AGE_YOUNG); + } + + // Then + verify(userRepository, never()).insert(user); + } + + @Test + void givenUserWithExistingName_whenSaveUser_thenGiveUsernameAlreadyExistsError() { + // Given + user = new User("jerry", 12); + Mockito.reset(userRepository); + when(userRepository.isUsernameAlreadyExists(any(String.class))).thenReturn(true); + + // When + try { + userService.register(user); + fail("Should give an error"); + } catch(Exception ex) { + assertEquals(ex.getMessage(), Errors.USER_NAME_DUPLICATE); + } + + // Then + verify(userRepository, never()).insert(user); + } + +} From 7ad1e5692b284e4602c99e6f5c02c8f1952f8123 Mon Sep 17 00:00:00 2001 From: Yasin Bhojawala Date: Sat, 28 Oct 2017 20:41:20 +0530 Subject: [PATCH 143/197] BAEL-1217 Guide to Spring Type Conversions --- spring-boot/.gitignore | 1 - .../java/org/baeldung/config/WebConfig.java | 11 +++++ .../converter/GenericBigDecimalConverter.java | 36 +++++++++++++++ .../converter/StringToEmployeeConverter.java | 14 ++++++ .../converter/CustomConverterTest.java | 45 +++++++++++++++++++ 5 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java create mode 100644 spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java create mode 100644 spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java diff --git a/spring-boot/.gitignore b/spring-boot/.gitignore index a64317df5e..e26d6af438 100644 --- a/spring-boot/.gitignore +++ b/spring-boot/.gitignore @@ -2,4 +2,3 @@ .settings/ .classpath .project -/.apt_generated/ diff --git a/spring-boot/src/main/java/org/baeldung/config/WebConfig.java b/spring-boot/src/main/java/org/baeldung/config/WebConfig.java index 4ef407823e..6609791c69 100644 --- a/spring-boot/src/main/java/org/baeldung/config/WebConfig.java +++ b/spring-boot/src/main/java/org/baeldung/config/WebConfig.java @@ -1,7 +1,11 @@ package org.baeldung.config; +import org.baeldung.converter.GenericBigDecimalConverter; +import org.baeldung.converter.StringToEnumConverterFactory; +import org.baeldung.converter.StringToEmployeeConverter; import org.baeldung.web.resolver.HeaderVersionArgumentResolver; import org.springframework.context.annotation.Configuration; +import org.springframework.format.FormatterRegistry; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @@ -14,4 +18,11 @@ public class WebConfig extends WebMvcConfigurerAdapter { public void addArgumentResolvers(final List argumentResolvers) { argumentResolvers.add(new HeaderVersionArgumentResolver()); } + + @Override + public void addFormatters(FormatterRegistry registry) { + registry.addConverter(new StringToEmployeeConverter()); + registry.addConverterFactory(new StringToEnumConverterFactory()); + registry.addConverter(new GenericBigDecimalConverter()); + } } diff --git a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java b/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java new file mode 100644 index 0000000000..da46c43dad --- /dev/null +++ b/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java @@ -0,0 +1,36 @@ +package org.baeldung.converter; + +import com.google.common.collect.ImmutableSet; +import org.springframework.core.convert.TypeDescriptor; +import org.springframework.core.convert.converter.GenericConverter; + +import java.math.BigDecimal; +import java.util.Set; + +public class GenericBigDecimalConverter implements GenericConverter { + @Override + public Set getConvertibleTypes () { + + ConvertiblePair[] pairs = new ConvertiblePair[] { + new ConvertiblePair(Number.class, BigDecimal.class), + new ConvertiblePair(String.class, BigDecimal.class)}; + + return ImmutableSet.copyOf(pairs); + } + + @Override + public Object convert (Object source, TypeDescriptor sourceType, + TypeDescriptor targetType) { + if (sourceType.getType() == BigDecimal.class) { + return source; + } + + if(sourceType.getType() == String.class) { + String number = (String) source; + return new BigDecimal(number); + } else { + Number number = (Number) source; + return new BigDecimal(number.doubleValue()); + } + } +} diff --git a/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java b/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java new file mode 100644 index 0000000000..d7356323ee --- /dev/null +++ b/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java @@ -0,0 +1,14 @@ +package org.baeldung.converter; + + +import com.baeldung.toggle.Employee; +import org.springframework.core.convert.converter.Converter; + +public class StringToEmployeeConverter implements Converter { + + @Override + public Employee convert(String from) { + String[] data = from.split(","); + return new Employee(Long.parseLong(data[0]), Double.parseDouble(data[1])); + } +} diff --git a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java new file mode 100644 index 0000000000..eda05a8441 --- /dev/null +++ b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java @@ -0,0 +1,45 @@ +package org.baeldung.converter; + +import com.baeldung.toggle.Employee; +import org.baeldung.Application; +import org.baeldung.domain.Modes; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.core.convert.ConversionService; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +import java.math.BigDecimal; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = Application.class) +@WebAppConfiguration +public class CustomConverterTest { + + @Autowired + ConversionService conversionService; + + @Test + public void whenConvertStringToIntegerUsingDefaultConverter_thenSuccess() { + System.out.println(conversionService.convert("25", Integer.class)); + } + + @Test + public void whenConvertStringToEmployee_thenSuccess() { + System.out.println(conversionService.convert("1,50000.00", Employee.class)); + } + + @Test + public void whenConvertStringToEnum_thenSuccess() { + System.out.println(conversionService.convert("ALPHA", Modes.class)); + } + + @Test + public void whenConvertingToBigDecimalUsingGenericConverter_thenSuccess() { + System.out.println(conversionService.convert(Integer.valueOf(11), BigDecimal.class)); + System.out.println(conversionService.convert(Double.valueOf(25.23), BigDecimal.class)); + System.out.println(conversionService.convert("2.32", BigDecimal.class)); + } +} From 89f9e2fed6fd2f15a26a84edf4e5045caf0cc2e5 Mon Sep 17 00:00:00 2001 From: Yasin Bhojawala Date: Sat, 28 Oct 2017 20:43:39 +0530 Subject: [PATCH 144/197] reverting .gitignore changes --- spring-boot/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot/.gitignore b/spring-boot/.gitignore index e26d6af438..ebf3ee7f16 100644 --- a/spring-boot/.gitignore +++ b/spring-boot/.gitignore @@ -2,3 +2,4 @@ .settings/ .classpath .project +/.apt_generated/ \ No newline at end of file From d97456ead8942538b646e00a94d9e6b0e855fb28 Mon Sep 17 00:00:00 2001 From: Sergey Petunin Date: Sat, 28 Oct 2017 17:38:57 +0200 Subject: [PATCH 145/197] BAEL-1221: How Spring MVC Really Works (#2892) --- .../guest/springmvc/web/InternalsController.java | 8 ++++++++ .../guest/springmvc/web/MyInputResource.java | 14 ++++++++++++++ .../guest/springmvc/web/MyOutputResource.java | 15 +++++++++++++++ .../web/RestfulWebServiceController.java | 14 ++++++++++++++ 4 files changed, 51 insertions(+) create mode 100644 guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyInputResource.java create mode 100644 guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyOutputResource.java create mode 100644 guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/RestfulWebServiceController.java diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java index c39da4e3e5..04adb9211e 100644 --- a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java +++ b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java @@ -4,6 +4,8 @@ import com.forketyfork.guest.springmvc.model.LoginData; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import java.util.Collections; @@ -28,4 +30,10 @@ public class InternalsController { } } + @ResponseBody + @PostMapping("/message") + public MyOutputResource sendMessage(@RequestBody MyInputResource inputResource) { + return new MyOutputResource("Received: " + inputResource.getRequestMessage()); + } + } diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyInputResource.java b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyInputResource.java new file mode 100644 index 0000000000..4c30cfb842 --- /dev/null +++ b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyInputResource.java @@ -0,0 +1,14 @@ +package com.forketyfork.guest.springmvc.web; + +public class MyInputResource { + + private String requestMessage; + + public String getRequestMessage() { + return requestMessage; + } + + public void setRequestMessage(String requestMessage) { + this.requestMessage = requestMessage; + } +} diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyOutputResource.java b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyOutputResource.java new file mode 100644 index 0000000000..bcb76056a4 --- /dev/null +++ b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyOutputResource.java @@ -0,0 +1,15 @@ +package com.forketyfork.guest.springmvc.web; + +public class MyOutputResource { + + private String responseMessage; + + public MyOutputResource(String responseMessage) { + this.responseMessage = responseMessage; + } + + public String getResponseMessage() { + return responseMessage; + } + +} diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/RestfulWebServiceController.java b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/RestfulWebServiceController.java new file mode 100644 index 0000000000..820c80db7a --- /dev/null +++ b/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/RestfulWebServiceController.java @@ -0,0 +1,14 @@ +package com.forketyfork.guest.springmvc.web; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class RestfulWebServiceController { + + @GetMapping("/message") + public MyOutputResource getMessage() { + return new MyOutputResource("Hello!"); + } + +} From 5f795ca5e518c7831b1102520a3fd4d9c94f2b44 Mon Sep 17 00:00:00 2001 From: Shubham Date: Sun, 29 Oct 2017 08:32:29 +0530 Subject: [PATCH 146/197] Added Kotlin datetime package and test cases for BAEL-896 --- .../com/baeldung/datetime/UseDuration.kt | 15 +++++ .../com/baeldung/datetime/UseLocalDate.kt | 42 +++++++++++++ .../com/baeldung/datetime/UseLocalDateTime.kt | 10 ++++ .../com/baeldung/datetime/UseLocalTime.kt | 32 ++++++++++ .../kotlin/com/baeldung/datetime/UsePeriod.kt | 15 +++++ .../com/baeldung/datetime/UseZonedDateTime.kt | 12 ++++ .../datetime/UseLocalDateTimeUnitTest.kt | 23 ++++++++ .../kotlin/datetime/UseLocalDateUnitTest.kt | 59 +++++++++++++++++++ .../kotlin/datetime/UseLocalTimeUnitTest.kt | 37 ++++++++++++ .../kotlin/datetime/UsePeriodUnitTest.kt | 28 +++++++++ .../datetime/UseZonedDateTimeUnitTest.kt | 19 ++++++ 11 files changed, 292 insertions(+) create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/datetime/UseDuration.kt create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalDate.kt create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalDateTime.kt create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalTime.kt create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/datetime/UsePeriod.kt create mode 100644 core-kotlin/src/main/kotlin/com/baeldung/datetime/UseZonedDateTime.kt create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalDateTimeUnitTest.kt create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalDateUnitTest.kt create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalTimeUnitTest.kt create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UsePeriodUnitTest.kt create mode 100644 core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseZonedDateTimeUnitTest.kt diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseDuration.kt b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseDuration.kt new file mode 100644 index 0000000000..40fb161c08 --- /dev/null +++ b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseDuration.kt @@ -0,0 +1,15 @@ +package com.baeldung.datetime + +import java.time.Duration +import java.time.LocalTime + +class UseDuration { + + fun modifyDates(localTime: LocalTime, duration: Duration): LocalTime { + return localTime.plus(duration) + } + + fun getDifferenceBetweenDates(localTime1: LocalTime, localTime2: LocalTime): Duration { + return Duration.between(localTime1, localTime2) + } +} \ No newline at end of file diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalDate.kt b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalDate.kt new file mode 100644 index 0000000000..250c071bbe --- /dev/null +++ b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalDate.kt @@ -0,0 +1,42 @@ +package com.baeldung.datetime + +import java.time.DayOfWeek +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.temporal.ChronoUnit +import java.time.temporal.TemporalAdjusters + +class UseLocalDate { + + fun getLocalDateUsingFactoryOfMethod(year: Int, month: Int, dayOfMonth: Int): LocalDate { + return LocalDate.of(year, month, dayOfMonth) + } + + fun getLocalDateUsingParseMethod(representation: String): LocalDate { + return LocalDate.parse(representation) + } + + fun getLocalDateFromClock(): LocalDate { + return LocalDate.now() + } + + fun getNextDay(localDate: LocalDate): LocalDate { + return localDate.plusDays(1) + } + + fun getPreviousDay(localDate: LocalDate): LocalDate { + return localDate.minus(1, ChronoUnit.DAYS) + } + + fun getDayOfWeek(localDate: LocalDate): DayOfWeek { + return localDate.dayOfWeek + } + + fun getFirstDayOfMonth(): LocalDate { + return LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()) + } + + fun getStartOfDay(localDate: LocalDate): LocalDateTime { + return localDate.atStartOfDay() + } +} \ No newline at end of file diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalDateTime.kt b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalDateTime.kt new file mode 100644 index 0000000000..ab7bbfcee1 --- /dev/null +++ b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalDateTime.kt @@ -0,0 +1,10 @@ +package com.baeldung.datetime + +import java.time.LocalDateTime + +class UseLocalDateTime { + + fun getLocalDateTimeUsingParseMethod(representation: String): LocalDateTime { + return LocalDateTime.parse(representation) + } +} \ No newline at end of file diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalTime.kt b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalTime.kt new file mode 100644 index 0000000000..152515621f --- /dev/null +++ b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseLocalTime.kt @@ -0,0 +1,32 @@ +package com.baeldung.datetime + +import java.time.LocalDateTime +import java.time.LocalTime +import java.time.temporal.ChronoUnit + +class UseLocalTime { + + fun getLocalTimeUsingFactoryOfMethod(hour: Int, min: Int, seconds: Int): LocalTime { + return LocalTime.of(hour, min, seconds) + } + + fun getLocalTimeUsingParseMethod(timeRepresentation: String): LocalTime { + return LocalTime.parse(timeRepresentation) + } + + fun getLocalTimeFromClock(): LocalTime { + return LocalTime.now() + } + + fun addAnHour(localTime: LocalTime): LocalTime { + return localTime.plus(1, ChronoUnit.HOURS) + } + + fun getHourFromLocalTime(localTime: LocalTime): Int { + return localTime.hour + } + + fun getLocalTimeWithMinuteSetToValue(localTime: LocalTime, minute: Int): LocalTime { + return localTime.withMinute(minute) + } +} \ No newline at end of file diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datetime/UsePeriod.kt b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UsePeriod.kt new file mode 100644 index 0000000000..df66a3d546 --- /dev/null +++ b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UsePeriod.kt @@ -0,0 +1,15 @@ +package com.baeldung.datetime + +import java.time.LocalDate +import java.time.Period + +class UsePeriod { + + fun modifyDates(localDate: LocalDate, period: Period): LocalDate { + return localDate.plus(period) + } + + fun getDifferenceBetweenDates(localDate1: LocalDate, localDate2: LocalDate): Period { + return Period.between(localDate1, localDate2) + } +} \ No newline at end of file diff --git a/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseZonedDateTime.kt b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseZonedDateTime.kt new file mode 100644 index 0000000000..fd1838bd2d --- /dev/null +++ b/core-kotlin/src/main/kotlin/com/baeldung/datetime/UseZonedDateTime.kt @@ -0,0 +1,12 @@ +package com.baeldung.datetime + +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.ZonedDateTime + +class UseZonedDateTime { + + fun getZonedDateTime(localDateTime: LocalDateTime, zoneId: ZoneId): ZonedDateTime { + return ZonedDateTime.of(localDateTime, zoneId) + } +} \ No newline at end of file diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalDateTimeUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalDateTimeUnitTest.kt new file mode 100644 index 0000000000..8f9f8374ed --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalDateTimeUnitTest.kt @@ -0,0 +1,23 @@ +package com.baeldung.kotlin.datetime + +import com.baeldung.datetime.UseLocalDateTime +import java.time.LocalDate +import java.time.LocalTime +import java.time.Month + +import org.junit.Test + +import org.junit.Assert.assertEquals + +class UseLocalDateTimeUnitTest { + + var useLocalDateTime = UseLocalDateTime() + + @Test + fun givenString_whenUsingParse_thenLocalDateTime() { + assertEquals(LocalDate.of(2016, Month.MAY, 10), useLocalDateTime.getLocalDateTimeUsingParseMethod("2016-05-10T06:30") + .toLocalDate()) + assertEquals(LocalTime.of(6, 30), useLocalDateTime.getLocalDateTimeUsingParseMethod("2016-05-10T06:30") + .toLocalTime()) + } +} \ No newline at end of file diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalDateUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalDateUnitTest.kt new file mode 100644 index 0000000000..ac42e91c6c --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalDateUnitTest.kt @@ -0,0 +1,59 @@ +package com.baeldung.kotlin.datetime + +import com.baeldung.datetime.UseLocalDate +import org.junit.Assert +import org.junit.Test +import java.time.DayOfWeek +import java.time.LocalDate +import java.time.LocalDateTime + +class UseLocalDateUnitTest { + + var useLocalDate = UseLocalDate() + + @Test + fun givenValues_whenUsingFactoryOf_thenLocalDate() { + Assert.assertEquals("2016-05-10", useLocalDate.getLocalDateUsingFactoryOfMethod(2016, 5, 10) + .toString()) + } + + @Test + fun givenString_whenUsingParse_thenLocalDate() { + Assert.assertEquals("2016-05-10", useLocalDate.getLocalDateUsingParseMethod("2016-05-10") + .toString()) + } + + @Test + fun whenUsingClock_thenLocalDate() { + Assert.assertEquals(LocalDate.now(), useLocalDate.getLocalDateFromClock()) + } + + @Test + fun givenDate_whenUsingPlus_thenNextDay() { + Assert.assertEquals(LocalDate.now() + .plusDays(1), useLocalDate.getNextDay(LocalDate.now())) + } + + @Test + fun givenDate_whenUsingMinus_thenPreviousDay() { + Assert.assertEquals(LocalDate.now() + .minusDays(1), useLocalDate.getPreviousDay(LocalDate.now())) + } + + @Test + fun givenToday_whenUsingGetDayOfWeek_thenDayOfWeek() { + Assert.assertEquals(DayOfWeek.SUNDAY, useLocalDate.getDayOfWeek(LocalDate.parse("2016-05-22"))) + } + + @Test + fun givenToday_whenUsingWithTemporalAdjuster_thenFirstDayOfMonth() { + Assert.assertEquals(1, useLocalDate.getFirstDayOfMonth() + .dayOfMonth.toLong()) + } + + @Test + fun givenLocalDate_whenUsingAtStartOfDay_thenReturnMidnight() { + Assert.assertEquals(LocalDateTime.parse("2016-05-22T00:00:00"), useLocalDate.getStartOfDay(LocalDate.parse("2016-05-22"))) + } + +} \ No newline at end of file diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalTimeUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalTimeUnitTest.kt new file mode 100644 index 0000000000..83fc57f850 --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseLocalTimeUnitTest.kt @@ -0,0 +1,37 @@ +package com.baeldung.kotlin.datetime + +import com.baeldung.datetime.UseLocalTime +import java.time.LocalTime + +import org.junit.Assert +import org.junit.Test + +class UseLocalTimeUnitTest { + + internal var useLocalTime = UseLocalTime() + + @Test + fun givenValues_whenUsingFactoryOf_thenLocalTime() { + Assert.assertEquals("07:07:07", useLocalTime.getLocalTimeUsingFactoryOfMethod(7, 7, 7).toString()) + } + + @Test + fun givenString_whenUsingParse_thenLocalTime() { + Assert.assertEquals("06:30", useLocalTime.getLocalTimeUsingParseMethod("06:30").toString()) + } + + @Test + fun givenTime_whenAddHour_thenLocalTime() { + Assert.assertEquals("07:30", useLocalTime.addAnHour(LocalTime.of(6, 30)).toString()) + } + + @Test + fun getHourFromLocalTime() { + Assert.assertEquals(1, useLocalTime.getHourFromLocalTime(LocalTime.of(1, 1)).toLong()) + } + + @Test + fun getLocalTimeWithMinuteSetToValue() { + Assert.assertEquals(LocalTime.of(10, 20), useLocalTime.getLocalTimeWithMinuteSetToValue(LocalTime.of(10, 10), 20)) + } +} \ No newline at end of file diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UsePeriodUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UsePeriodUnitTest.kt new file mode 100644 index 0000000000..48be72feb0 --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UsePeriodUnitTest.kt @@ -0,0 +1,28 @@ +package com.baeldung.kotlin.datetime + +import com.baeldung.datetime.UsePeriod +import java.time.LocalDate +import java.time.Period + +import org.junit.Assert +import org.junit.Test + +class UsePeriodUnitTest { + + var usingPeriod = UsePeriod() + + @Test + fun givenPeriodAndLocalDate_thenCalculateModifiedDate() { + val period = Period.ofDays(1) + val localDate = LocalDate.parse("2007-05-10") + Assert.assertEquals(localDate.plusDays(1), usingPeriod.modifyDates(localDate, period)) + } + + @Test + fun givenDates_thenGetPeriod() { + val localDate1 = LocalDate.parse("2007-05-10") + val localDate2 = LocalDate.parse("2007-05-15") + + Assert.assertEquals(Period.ofDays(5), usingPeriod.getDifferenceBetweenDates(localDate1, localDate2)) + } +} \ No newline at end of file diff --git a/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseZonedDateTimeUnitTest.kt b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseZonedDateTimeUnitTest.kt new file mode 100644 index 0000000000..a9d7d973ef --- /dev/null +++ b/core-kotlin/src/test/kotlin/com/baeldung/kotlin/datetime/UseZonedDateTimeUnitTest.kt @@ -0,0 +1,19 @@ +package com.baeldung.kotlin.datetime + +import com.baeldung.datetime.UseZonedDateTime +import org.junit.Assert +import org.junit.Test +import java.time.LocalDateTime +import java.time.ZoneId + +class UseZonedDateTimeUnitTest { + + internal var zonedDateTime = UseZonedDateTime() + + @Test + fun givenZoneId_thenZonedDateTime() { + val zoneId = ZoneId.of("Europe/Paris") + val zonedDatetime = zonedDateTime.getZonedDateTime(LocalDateTime.parse("2016-05-20T06:30"), zoneId) + Assert.assertEquals(zoneId, ZoneId.from(zonedDatetime)) + } +} \ No newline at end of file From e4d90382c30d3cdbd8d3eb2899866995c112ee2d Mon Sep 17 00:00:00 2001 From: Dassi orleando Date: Sun, 29 Oct 2017 06:52:54 +0100 Subject: [PATCH 147/197] BAEL-132: Configure Jenkins to run and show Jmeter tests (#2860) * Different types of bean injection in Spring * Difference between two dates in java * Update README.md * Simple clean of difference between dates * Clean my test article * Improve dates diff: for dates and datetimes * Move difference between dates from core-java to libraries * BAEL-890 - Kotlin-Allopen with Spring example * BAEL-1107 - Introduction to Apache Cayenne Orm * BAEL-1107: update formating and version of libs * BAEL-1107: update properties of Author * BAEL-1157: Apache Cayenne - Advanced Querying * BAEL-1157: Fix imports * BAEL-1157: code indentation * BAEL-1157: Update list of author names * BAEL-132: Configure Jenkins to Run and Show Jmeter Tests * Removed submodule spring-jmeter-jenkins * Commit again spring-jmeter-jenkins --- pom.xml | 1 + spring-jmeter-jenkins/.gitignore | 24 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 49502 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + spring-jmeter-jenkins/README.md | 55 +++++ spring-jmeter-jenkins/mvnw | 233 ++++++++++++++++++ spring-jmeter-jenkins/mvnw.cmd | 145 +++++++++++ spring-jmeter-jenkins/pom.xml | 52 ++++ .../SpringJMeterJenkinsApplication.java | 13 + .../java/com/baeldung/domain/Student.java | 66 +++++ .../repository/StudentRepository.java | 7 + .../src/main/resources/JMeter-Jenkins.jmx | 96 ++++++++ .../src/main/resources/application.properties | 14 ++ .../SpringJMeterJenkinsApplicationTests.java | 16 ++ 14 files changed, 723 insertions(+) create mode 100644 spring-jmeter-jenkins/.gitignore create mode 100644 spring-jmeter-jenkins/.mvn/wrapper/maven-wrapper.jar create mode 100644 spring-jmeter-jenkins/.mvn/wrapper/maven-wrapper.properties create mode 100644 spring-jmeter-jenkins/README.md create mode 100755 spring-jmeter-jenkins/mvnw create mode 100644 spring-jmeter-jenkins/mvnw.cmd create mode 100644 spring-jmeter-jenkins/pom.xml create mode 100644 spring-jmeter-jenkins/src/main/java/com/baeldung/SpringJMeterJenkinsApplication.java create mode 100644 spring-jmeter-jenkins/src/main/java/com/baeldung/domain/Student.java create mode 100644 spring-jmeter-jenkins/src/main/java/com/baeldung/repository/StudentRepository.java create mode 100644 spring-jmeter-jenkins/src/main/resources/JMeter-Jenkins.jmx create mode 100644 spring-jmeter-jenkins/src/main/resources/application.properties create mode 100644 spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationTests.java diff --git a/pom.xml b/pom.xml index 4f10c31ae3..d537adf08e 100644 --- a/pom.xml +++ b/pom.xml @@ -171,6 +171,7 @@ spring-hibernate5 spring-integration spring-jersey + spring-jmeter-jenkins spring-jms spring-jooq spring-jpa diff --git a/spring-jmeter-jenkins/.gitignore b/spring-jmeter-jenkins/.gitignore new file mode 100644 index 0000000000..2af7cefb0a --- /dev/null +++ b/spring-jmeter-jenkins/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/spring-jmeter-jenkins/.mvn/wrapper/maven-wrapper.jar b/spring-jmeter-jenkins/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..5fd4d5023f1463b5ba3970e33c460c1eb26d748d GIT binary patch literal 49502 zcmb@tV|1n6wzeBvGe*U>ZQHh;%-Bg)Y}={WHY%yuwkkF%MnzxVwRUS~wY|@J_gP;% z^VfXZ{5793?z><89(^dufT2xlYVOQnYG>@?lA@vQF|UF0&X7tk8BUf?wq2J& zZe&>>paKUg4@;fwk0yeUPvM$yk)=f>TSFFB^a8f|_@mbE#MaBnd5qf6;hXq}c%IeK zn7gB0Kldbedq-vl@2wxJi{$%lufroKUjQLSFmt|<;M8~<5otM5ur#Dgc@ivmwRiYZW(Oco7kb8DWmo|a{coqYMU2raB9r6e9viK6MI3c&%jp05-Tf*O#6@8Ra=egYy01 z-V!G;_omANEvU-8!*>*)lWka9M<+IkNsrsenbXOfLc6qrYe`;lpst;vfs*70$z9UM zq%L>pFCOr$X*|9&3L2h;?VA9-IU*iR6FiGlJ=b~DzE5s^thxXUs4%~*zD#K&k>wZAU8 zpaa!M+Z-zjkfGK15N!&o<3=cgbZV7%ex@j^)Q9V`q^i;Fsbkbe6eHJ;dx{QbdCCs1 zdxq^WxoPsr`eiK3D0Ep}k$ank-0G&+lY!ZHDZBYEx%% z2FyE?Lb0cflLB)kDIj;G=m`^UO<4h(RWdF-DT>p{1J5J90!K!AgC0)?jxPbm$KUjg zJED+#7xQmAmr`(S%BQTV-c97As~r3zD$E;3S)@}p5udA@m6pLgRL5h-;m>LvCq?&Q zokC7Vnk-zBEaa;=Y;6(LJHS>mOJV&%0YfRdUOqbKZy~b z(905jIW0Pg;y`Yv2t+RnDvL4yGEUX*tK)JT6TWn4ik~L)fX#tAV!d8)+A)qWtSjcr z7s|f%f;*%XW!jiRvv9ayj@f&dc|1tKDc{O3BWcLGsn-OYyXRLXEOEwP4k?c`nIut0 z?4S;eO@EoynmkxHq>QpDL1q^wOQxrl))2qya?dk05^5hK? z{P6;WKHUaHw9B0dd&|xw&CYN2fVrn};Gq<=Z^QZk3e~HzzY~JrnPCs0XwMp#B<9Gm zw0?7h#4EY%O-ub6mi&O2vcpIkuM?st;RtEpKSz^Xr#3WHhpsZd!gh|_jGQ`KA30T- zKlz9vgB;pY^}Uh??nQKSzk>2&J+Qi*r3DeX4^$%2ag9^x_YckA-f9p_;8ulh(8j9~ zes{O#{v!m%n^el(VryTF-C%xfJJ$rZj)|Y|8o&))q9CEwg2;Wz&xzyHD=@T_B%b}C z=8G^*4*J4#jUJn{7-3^U(_uUp6E8+GDt#le)nya-Q4kL5ZGiFxT4bF+mX`whcif*? z>CL&Ryn3HHT^^QmWYr<}Q1_Jj7fOh}cS8r+^R#at-CnNl3!1_$96&7nR}gh}))7a0J&z-_eI))+{RCt)r8|7|sV9o01^9nv?aePxMqwPP!x|sNmnn&6{K$K*mVX9lxSAmcqAV1(hKA-=coeTb*otxTOGYXsh zW$31^q7L@<#y~SUYoNKP1JK?4|FQNQb$i8mCG@WhX9i_^;@M2f#!nq7_K*M!4lGz1 z5tfADkO7BZDLgVQ?k7C)f;$eqjHI&zgxhf}x$8^ZEwFfm-qY=+M+fbS)9r8fFE5H9 zv{WPU35cR8%z;(W%5<>y+E&v84J4^Y##N!$B++RI`CZ1i3IW9Nau=*pSxW&^Ov-F> zex=&9XYLVcm1Y?am>2VC`%gMev9$#~; zYwxYvMfeKFsd!OBB@eOb2QNHFcsfKm;&z{OVEUiYmQ}~L@>$Ms@|Ptf3jQO-=Q;1+ zFCw+p+Z3lK_FmIAYnk2V;o915cDM}%Ht5RH%w}P>Yg9{h1mZ}~R6tUII4X7i4-2i% z2Uiw3_uHR!d~5(s;p6btI@-xhAkRg9K|n#}PNT9Dw9P>z$3>30lP1(=mcQ|tpyv3@ ze1qU!69OAx4s7$8r7Y-#5I`m!BXq`f!6C(BtUlG-oq+liqMCS_D@0nSFc%y+N6_Zh zi%L3LhF3zZP{d1)L&SXxPD(fp@T@J;jZeNaf$zl>vAh7=tI z2;wS^QyRdZm~)Ur&!af;8eB8*7(F96K^=WbC$)#TWvB~Awo5AtPf8Il4snD}Xsqd< z>cH+gcg72nTg5tl>oFbwdT{BDyy1=f=4~h~L$)UX;FXa;NdSlyF{(YLrx&VDp`pQI zh3pQtC=d8i1V6yUmFon*LQsNYWen?eO-gSZ4cvYcdEd0klSxcBYw+|5AyCv6TT96h z{7Yh9`h}biU?3oBFn=d8>Hn`1Q*w6rgeX^QbC-WFwjY}Int0;qUny4WMjIee@#0%l z>YAWLVCNo1lp$>9L$Tx`t!dp?>5Pfbhc*!*wzfWkj_x`Q?`3Jc@9r8uq~dgb+lgeh zlA`eUal3e2ZnWQSSYB>qy#85^>j7!=uO-hG5*erp22NaC81#Ytioc>r?D9$b_JiC+ zSp)8KR$%}FjFNRkeE#c5vKbXNJDBoO< z)73Jt7Y|3v45efud1xkg2GO3OwYfsuBV`f6S_D>Aoh2%=`1Y$bHP>0kBvTSowX57H z&1nbbx=IT>X^ScKYL&&{LNq~^UNgR|at`D;SxTYpLvnj_F*bGgNV2tEl1k$ccA&NW zmX(LV*>Op)BOgoric(98mIU)$eUa&jM5bKlnOrHm$p^v@u;W0J)!@XWg+#X=9En(-tiw!l?65rD=zzl(+%<)bI{ZN;SRco{jO;>7 zlSY|TIxuN|d#YHx^^~>iYj2V>cC>wQwWzGVI!6#epjJ6tl_`7tDY17WMKMB@s*Jr& zXOs*@>EwQ6s>M13eZEBJ#q0|;8jao{wK4keesH9?$OSk~_3#*x`8fAzQa7fprQ6(Z zi$}B%m81y*S)RxaX;wW!5{{EDw8)IE3XDRO1Y^%TMr}c|Y>WBAKT=b*K&uMT(?JSl zO>gVtl_bKQ$??TeWr7wYO+Vbl?CTQj?JrW&td`|#@;R2Gca9jq^p`{@)KY97o3}Af zfTh{pUUWD;P7sq=I!lA6;*hq0Nq`F56T)x$K?BMOk}tptYw(%$?*otp2N6IF3#GgqM46Cda!qzvGZcMgcGV`bY5ZIfOB6^;US#WgRai zq#vS8ZqPY953|eFw<-p2Cakx|z#_{4pG}mk{EANI{PnK*CUslvS8whko=OTe13|It z>{O2p=mmanR2-n>LQHaMo}noWCmjFO@7^z~`Y{V>O`@rT{yBS=VXsb}*Pi_zDqM3? zjCZqWR}fEzAkms+Hiq8~qRAFvo}dVW{1gcZ?v&PdX?UG*yS}zT9g7nZ!F1WRH}sHA zJ4~B2Br~8?uhbaX!3g+7=3fVM)q^wEzv**rk5e34==NRCV z3G$G5B!DICFslm)c){oesa_0muLxGoq`xYVNURl*NhE#v2>y9vDz&vJwrB`Q>DhN# zY2GnY!Y^8E%PU0}haXL$8a5QN1-&7NWuC~{62j| z2ozmFyx8GpOzj?&KK1JF28;E8H_p4N^LMm9K0y}!lCxcK79eFGTtGm?7jy?t94Q@X zli|our1#|>f*68fyA0bSn=YisYSl8HB(dFN4Y$qb7p4DR0YQt=^eEMnJkgiM48$>QV6x5*^a|D|t zMPDk}u<^YEYrt|H&hy)DRk%rDIb{LTo;h7=fp^J9Lr&`{9`8_pS*tQ_$KXB$2#5{h z-&yPbN-zInq{7aYZuaItS8-2Mb4OQe2jD*&)0~898E|HlAq`o!M&It@vvnj z_y@))>~_oR%S8OfmFTGYIat^#8_YKMqWLac<^}RZFDcJqvSJa>&6HaLS7p-$)QyL= zHrO|t75`d41Bp37RZtKR%g^%o@9C5Ce=CjuvVQ-KI#Uw2WWa>cho;jztUt~Le*_pT zkfA2iif9QFp;vhd)|A?tdAQ?9o~?EqgL;=)eKFQ{E^u?OIP}fl^5A;$^ZVutCIqj5 z&*i+G?!Px|5~~6zTYf>~uw*kM`5p&Hju&#w!7^An3*mQwTK22wC7p^OsvMjWf`$MY zLX|ZFV#+>Uq2!QyRD9cgbI9nswteMAMWtK(_=d%r?TLrx?_rkjbjI(rbK#T9Gn}J| z5ajow3ZErpw+%}YfVL-q^{r~##xJ^_ux2yO1!LJZXg)>F70STV=&Ruwp&XP^_?$h0 zn>$a?!>N+Kt$UXzg`e+szB}*uw)Z$uL6?>*!0IrE)SgV~#a?Qgg7HuTsu3ncrcs|l z=sQSMtr}S!sQ4SriKg=M`1Y|bC`XJ+J(YT)op!Q);kj0_e)YNVNw8SI|1f%9%X?i5>$lLE(Wfc$wY?(O985d5e*)UPtF!7gG3(Kd z-^=-%-wWCEK`r4oFh^{|;Ci%W^P>K%9dBNDqi%c$Q{iY#(zbwN7~pQI=SHd%WuV7Z zO?0P;Zc6yeN;)IbJIP0=>W)EgE!76jM^?IyQ*D(T})1NGmP z~YAb6T^#R6;)Ls;cV~LWk z33lcLpbSjxStw9Z>Nv&+rPOXxCGB=?ttZs?{OF7;GYlV&w7-82POb$XrogqFpLA2`j&MLZXr=IG>PAFSb2np~x;E_kV{ zsDwbK$?iYRn7$;mHYZhQn6P2#_hXAHd?;q~!Zy}%;@%wT3u|Sa-!WxxOE_fwyFv*Db@>X;Rl+fK1oP?55*dN0#2%SuikZ)y7Kx>`8*9d?}5 zKvXF7J5&Ey6{A8qUFxrFOh<$xdSWV^dw7z|`7RVZJhAwO72V zRrM_3*wI`^ycl7~>6KaCYBr#WGR>}B)Q(V%&$MhVrU>u~ql zjGeZF&>=_ld$oY!V}5}Gb> z*iP38KOav9RHY)0uITwgz99w- zJX-0BGCdY*$c7pi@>@-`2>#>}c(DHaI62ntpKz z`c01Z#u7WuMZ71!jl7hv5|o61+uv5nG?*dffEL~328P5HlKh2&RQ;9X@f>c1x<>v= zZWNSz3Ii~oyAsKCmbd}|$2%ZN&3gc9>(NV=Z4Fnz2F@)PPbx1wwVMsUn=-G=cqE3# zjY{G4OI~2o$|*iuswTg1=hcZK$C=0^rOt-aOwXuxU=*uT?yF00)6sE}ZAZyy*$ZTH zk!P*xILX#5RygHy{k?2((&pRQv9_Ew+wZ>KPho_o1-{~I*s1h8 zBse@ONdkk-8EG?r5qof}lwTxdmmEN|%qw(STW|PFsw1LD!h_Vjo;C4?@h|da4Y;*; zvApQ=T&=jWU39Uz=_yN@Bn0{{)yn8RZ2&X!<*KBv-7tcWdkF1Ij8D0mU zwbcs}0vDaLGd@xx%S_QZ1H)GTt`~>+#z}HXJTl9S!sd9seVJc|_wUMSdD$>k`K_RG zlq(fsnR@KM^;C}}&vG2t+}_nGPuI5ovg$6TYeMPIREGxP@2r~RKd@>gV`mq0XENsh z%IRZ-ZNP+4#J`o-yRpP;w@;CrSr3wiix3e9Qc|s(WapRq950P->g|JYC$A)$YrGeH zz5dKlAHAPJ>%?llqqB&#+#VU3sp=9>Xms1J;tSYN>LMwNtU68yr!})K4X>%^IrIDp z>SHy&6fJHybwS^BW>okFeaQp6wxaVP`hy;ZX#e+=w3c?PGD&_LmeqL8oZ*YaM1+#S z5WNAKo4+99JW(+qcMjh;+c%R#R?t;(aQ`2`C=bo((ERzgAwKKazXy*0wHN;v;P|f> zBW&?`h#_I^?Bc5GX7XP@|MOiw%&-#?EQ|w+FdCl_&qPN&s$|Z17UCF9oXS#N z)px6>zm&}0osTnCGI;AXsj`q=LpIsW4x}q~70uey5N_NpdJ*Gv^@$g@f2{EB>LP7Y zE5P`jZh1vHNgk7LfMT({jLCjRZa4ubW;UA#%<@Zj?efrPdm{W3J5UEFgm`YkVqz;AMFetZuM5uQpvORb1GDX`WZGwTrF z46+&sAri5QXCfGYpdgonWR5`>ZEa;?jrKvfNvXF<&l)1uU-3q#4X16R2~?P0yg3H` zfw82QWZo^cac+%(g^_6`+2>~Fvy{pOCGnj86+=-!N`GPWAjus1ejhn6f4|mDkU6EE z&u~;xfdRMkj=h;4d~~+4(>L8weT3cz9e@E11EH!tX<IC!@kS+dsIQA`HQ2vdoS zzSD0U?mb1M0@qXu{yhZk2Y6}2B-AvvYg|tRr6z*_*2l*VLiR6G;M{O^Znq~LI%=I_ zCEU{htx&Bo+69G`p|A@R>KlY1*;;!{aWq?Pc0Cu!mT-0S`!>3<@s%Ri;utYNQ+CXDj+LC5<*$4*$-mogGg^S~3JRv{ry zPJzKJg!XKb>P}yJVc^1V@T&MV{z;@DLhvV{dG?RogCcPkROivliSr58>5Zw&&A2?n z9`JOLU;eQGaOr6GB(u{t3!+$NaLge$x#M&*sg!J;m~rRc)Ij5|?KX_4WiM-eE%t8e zqUM7eZ~ZonavR;K4g2t$4Fj=UVyEHM7LPb%8#0?Ks{~?!qhx9)2^>rg8{0npLtFKR zJB)19TFiD^T7IUXA8wt!@n5gj&@OK~EO}MR6^qd?^-?%-0~b2K9RWh+_mSEQQWsLCFOt#JlAQMgNxvv-m z;sF*r;WZ*Wi@I|6pMN+|_rLYKlWwvpKZY9rA;fo8l8hFQGI?4#kt1-r4UL;nPF@{~ z2T~a@2>yD|GuU55boxoIIe_BFo2Vq&rs&2itv|B>OC*bIeOqMBRw~y5KRMwiVHc)` zIBdliiY?Ai7*+k#NZf3MW5!hya~RZ6r7k)b?HF0e(n`ZX=iCpT7St`FDwL@SGgKlq zNnnU*3IcnYDzJg{7V$cb`xeb4(s(({&%f69XMTw-JQErS%?X_}?&y&tvHw@>1v{#R z4J@(=el^kRI+jGa;4)l#v%-jM^$~0ulxh6-{w*4Lsa>Tuc z>ElR3uM~GUChI)c{TW${73A3$vs<&iH;e?4HjW2MvSz9tp9@69+`_@x{Qte^eFo5IlAi&zw$=t6u8K%8JtjRI88PFNM7R>DaCO3rgngmk zI-RMOyt@kr-gVra=tl^@J#tI7M$dird(?aU!`&1xcm~2;dHN(RCxh4H((f|orQ!BS zu;(3Vn+^doXaqlhnjBJj-)w?5{;EEZTMx+?G>Rp4U^g<_yw_blAkdbj=5YrNhZB9@ zNmW=-!yFx5?5aF^+6*1XI|s3lIn_eyh`uv%?liNzSC#z&z^R(mqEYL@TdWzgkf>g1 zedzs*={eJavn{8vF%4nf@et<@wkOPR>NiVuYtESbFXQ;sDz_;|ITVeoW|me5>jN5P z5--{13JT{3ktkAf9M;Jty)yectg#{+9sK{C;2CvPU81tB3{8S5>hK{EXdVe?fR?sd8m`V zPM*$)g$HKp0~9Xf6#z!YJ&g!%VkCMxkt>ofE!62?#-&%|95^)JJ9 zk;GlJdoH0HwtDF(_aTv}mt$?EyRyE6@pm5DG~Gj-2%3HcZT13e)$)z99bdK_WCx|Q zQNza(R)Z>ZKTn8oIdcw%c^pFaMpFZ4HOds!BODgSBWJJYW3I_WJvoEm4xsfs%#LZ6 zdPCk{5XJ>2f7Hj-i*9lTW6BKCIuy)3L!b3(uPoSgW1WA+OEYYBRgSsJq7wjHh%c8ymMs3FU%~cprqL*084p*^T3{J%Gwq`jB30n(&y6- zII8-_r-s5&CVtsoNZ9%On?7yn;oZG03-$wx^uRk9>b*ufh15|HHk|%=MA^ioyb9CYU$7y$4R|M5HvpiCTxKSU`LUg$+ zB3IBl&{qO}agqF~BFM6&11wMeR-#Rkuh_(^j+P4{;X_w|siva$5P`dykyhfAUD%e8 z+{G0|7(Q`_U91sMKFO^rHoCWfXi0$^ev)-187G}klYv@+Rf%uZ&T4-Uhh=)pcU6O1 znXc^c5)!$X+39|4`yNHuCj0wkm+K1VN0G3_EL?-ZH$p5Y*v6ec4MV zS~1~}ZUhl&i^4`Fa|zyH4I%rXp;D6{&@*^TPEX2;4aI$}H@*ROEyFfe^RZI%;T>X> z>WVSUmx@2gGBxkV&nfyPK=JI$HxRKUv(-*xA_C;lDxT|PgX*&YYdkrd5-*3E1OSXBs>35DLsHHp%zm+n0N(Yu{lMo>_t&d1Xy zfCxl=(CNNx>ze+7w)60mp>(M``Qn$aUrVb$cJAb6=Do7VgW`Qn2;v5{9tB)jP$_mB zn{Hb_sMs4yxK|!`PI7+zO68}{Iv)dpu!+ZZl)xuoVU(oFsm<3gT{j2c*ORl|Lt+?dR^M?0 znW6rNA)cR*ci;z?BaG(f(XynY_y+kTjj~T$9{N{>ITQ4-DmZ6{cOkoea9*LpYL{Apo0hSpLqJu z9`tjP&ei;%pn9QY>-$9=<73M#X;qGb+%Bt0x>=u`eDtthI+LWB9CdAO=ulZo9&Ohs2X8GW>b7#&U|py28KTvPBl#Nqv^{AgkVXrOyS z@%3)}$I&mJOYWoG$BBb)Kb~0ptDmBxHNH^i6B8FA7NR2HfTnjP?eDnoY4NS_aYg4P zGGPw11sAf^^fTkY#j@T#6Ll*^GVaPo-1;aS6_a}{r{tWZilzse2m zc?LS=B|EWxCD|!O%|%t3C@Rd7=rKJRsteAWRoDu|*Kx-QwYZQeYpGrZ_1J%mFM;*S*u=0 z%1OC9>kmCGqBBu#-1jVPRVW*BTv%3uPI8fO?JOZD#P_W^V+K7&KVB>hzZ@PdY*%Ezo;}|5Mk`Mo2m*_K%no*jDJGp(s9j;&U`Z>z zO#SEe)k!p$VE-j2xDoX$!;Up5%8x$c`GH$l+gTA*YQaE0jwCOA<*__2NkV){z_u2=4NQ zSk$(oj$%ygio?3V8T3IyGMYvPs`t{im2IoHs7or+>>MYvG%Q?PwOLqe%73uGh6Wn; zo>e7qI$9?%cVVkvQLOLKcU5n*`~qn8pzkdu=Z4#2VnhUy>S*;kT=NqA!dQtnE?wVg zOKobxJ|QCjk`!(2*~5NQx{{=Lr=)ndyn{V|&PxUa=xQXVU?#M24F8H%C*uvs(#Va0 zSkp}0EFYq0#9xp&$O?gIInc#^^_6Ol88W%)S5A@HeE0(SR&!Yl>u=*5JEoUViDR@2 zJBjTsp=Y44W`Nb2+*CcZCkwP(QChX1s)b09DEIZCKt1$q2~;&DJ9!{bQ1Y6&T_9u1 zZM8^im8Wf#FUO6tZqc7#`z0cN_JA>#U_b7he%?cCnlV2&47y5Fc)Z7bp5xGe1zNq9 zl1VaV-tsm3fY=oIX^SPl!P;9$o?**0brq#ShM~3CXhh^SK0oOKB9O>;q3G@ z&4&h$mLSgohc^5IC|H>IGfZvVQFUT>T$|U7{znY`56<5d)07oiv*2R0+-BGPPkWJ! zIOzKF+<5o2YLWP|SGCx8w@<>u6K1o`++xJ+6kaJrt<&0Haq zyUccgxI$sR07Vo9-pF);heBva;?&NcAzC*gSSG9B3c?A;IH9J zl$j%F4*8;F0;H2Cjo*kWz4{kSh?nX}23&&KL+U(#nOAuR`wn@uwUNkWEgb*ZShKPy z`aXTJT4f*Um4`iv2KOfzf-~`#pOfH8>is*xnLBDTyx2Xuc8Y2Od6z((P2AZK@b_96 z#0V6jdw>sEDJ#uNGV|EshD1g&bYZCzCZTZ)286HLHc8Eyy_HPi;d#%;Wx}d6tUUxq z_VB$+898z_{9-A<*v6VI7?(dC04o!8$>DQ$OdbrA_@<6auiBNp{Dw$Hs@@gcybIQT zAU7Pc5YEX&&9IZ~iDo&V`&8K$-4o$)g?wF8xdv1I8-n}1bc7tviIBqt z#iIl1Hn;W?>2&#bU#VZ1wxq(7z=Q15#0yoz)#|r`KSPKI-{aN%l61^?B4RMDt?Vk` z)G#K6vUN?C!t{Q<@O4$0(qI>$U@@TI2FVF;AhSSb5}LtXx&=k&8%MWM3wv;Xq0p~W z#ZX;QFv5G9-i6=+d;R7Dwi)ciIZ1_V!aw;K^etau+g0fOA2HXpV#LQZGzf?h#@}(o z|3w!sZ|&mp$;tmDiO=zef5C|Alz+@@4u5#yZ7yNpP=&`432%a{K#{;nsS!jwk-$Qs zZRty}+N`Y~)c8|$&ra{bOQWM2K7qa}4Y{ndK%dKp&{ zFCvX{PAy_C{xzS_-`0>JlPP7&5!5 zBQ$NQz^z#2y-VeIxnfY|RzU`w+1t6vwQ|wM)LlpuaUzYehGII;>2DYyR|~wC@l97s zgX=f*1qtfDyco%BHmN+o<2qoi`D67R+RM$$NN5-moE4kx3MCFfuip*45nComOZKQf z3!(8tkSdhY5+A%@Y=eVEZkXU3S6B2V-R$ZuRIXWhsrJg3g)p4vXY@RV60bKuG zT6T!enE<;(A{*HPQhae*(@_!maV~AWD4EOwq10tkCXq+HPoe_Pu?d4Kg=2ypcs?&f zLa>mEmPF4ucJ%i~fEsNIa{QmQU27%Abh|w(`q)s~He5$5WYQ_wNJX6Qop<=7;I1jd zNZak`}0lVm+^O!i;|Lwo}ofXuJ)*UtH4xaPm*R7?YS*<&D__=@Kki>{f_Z-XqM;Tj195+~@d;rx zh5pj8oMuupWa#E(%85**I~1Zat-Sa^_R11-CiKdd`8m(DGuzOm9lX$Dd!DX!_Al}d zS!-|}dWG80S;`jSKDH%Uv;-OJNeBI0Bp$z->{_>1KU%h&Af7nns(L=xRN1 zLvOP=*UWIr)_5G2+fCsUV7mV|D>-~_VnvZ3_>=9 z_bL6`eK%W*9eJ34&Puz^@^ZIyoF@%DTun#OOEdUEn8>N9q(}?5*?`o?!_<(i%yc`k zf!xXD6SQscHgPgiHt>x6{n{+}%azrfV4VHi#umyi0;11c816`E??2`$;Rc`)qA2H( z5L|{o=ut7Te=^~@cR0_#cah0?w0Me$&>}ga8xxy=?DDl#}S~Y z4o2n`%IyGjQEP%8qS|v(kFK&RCJbF1gsRVJ>ceSjU`LuYJu%C>SRV#l`)ShD&KKzv ztD<9l0lcW0UQ8xjv|1NXRrCZhZh3JFX_BNT@V|u9$o~8M=cjOX|5iBS|9PAGPvQLc z6sA~BTM(~!c&V=5<}ZIx}O7A;|&bd7vR_y)t+ z?Vm7kb^gJ88g;!fRfMTSvKaPozQz4WcYD8l#0WxQ${P%0A$pwhjXzyA0ZzErH{1@M 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 OJOEd-=rxTO#Qy`$*1Hh^ literal 0 HcmV?d00001 diff --git a/spring-jmeter-jenkins/.mvn/wrapper/maven-wrapper.properties b/spring-jmeter-jenkins/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..c954cec91c --- /dev/null +++ b/spring-jmeter-jenkins/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip diff --git a/spring-jmeter-jenkins/README.md b/spring-jmeter-jenkins/README.md new file mode 100644 index 0000000000..49c18122a2 --- /dev/null +++ b/spring-jmeter-jenkins/README.md @@ -0,0 +1,55 @@ +BASIC CRUD API with Spring Boot +================================ + +This is the code of a simple API for some CRUD operations realised for a seminar at [FGI](www.fgi-ud.org) using Spring Boot. + +### Demo +* API: The online version **is**/**will be** hosted here: https://fgi-tcheck.herokuapp.com +* Mobile version is also opensource and located here: https://github.com/valdesekamdem/tcheck-mobile + +### Features +#### Currently Implemented +* CRUD + * Student + +#### To DO +* Validations of input with: [Spring Data Rest Validators](http://docs.spring.io/spring-data/rest/docs/2.1.0.RELEASE/reference/html/validation-chapter.html) + + +### Requirements + +- Maven +- JDK 8 +- MongoDB + +### Running + +To build and start the server simply type + +```bash +$ mvn clean install +$ mvn spring-boot:run -Dserver.port=8989 +``` + +### Available CRUD + +You can see what crud operation are available using curl: + +```bash +$ curl localhost:8080 +``` +You can view existing student objects with this command: + +```bash +$ curl localhost:8080/students +``` +Or create a new one via a POST: + +```bash +$ curl -X POST -H "Content-Type:application/json" -d '{ "firstName" : "Dassi", "lastName" : "Orleando", "phoneNumber": "+237 545454545", "email": "mymail@yahoo.fr" }' localhost:8080/students +``` + + +Now with default configurations it will be available at: [http://localhost:8080](http://localhost:8080) + +Enjoy it :) \ No newline at end of file diff --git a/spring-jmeter-jenkins/mvnw b/spring-jmeter-jenkins/mvnw new file mode 100755 index 0000000000..a1ba1bf554 --- /dev/null +++ b/spring-jmeter-jenkins/mvnw @@ -0,0 +1,233 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir=$(cd "$wdir/.."; pwd) + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} "$@" diff --git a/spring-jmeter-jenkins/mvnw.cmd b/spring-jmeter-jenkins/mvnw.cmd new file mode 100644 index 0000000000..2b934e89dd --- /dev/null +++ b/spring-jmeter-jenkins/mvnw.cmd @@ -0,0 +1,145 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +set MAVEN_CMD_LINE_ARGS=%* + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% \ No newline at end of file diff --git a/spring-jmeter-jenkins/pom.xml b/spring-jmeter-jenkins/pom.xml new file mode 100644 index 0000000000..38b5f98e45 --- /dev/null +++ b/spring-jmeter-jenkins/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + spring-jmeter-jenkins + 0.0.1-SNAPSHOT + jar + + spring-jmeter-jenkins + Run and Show JMeter test with Jenkins + + + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-data-mongodb + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-jmeter-jenkins/src/main/java/com/baeldung/SpringJMeterJenkinsApplication.java b/spring-jmeter-jenkins/src/main/java/com/baeldung/SpringJMeterJenkinsApplication.java new file mode 100644 index 0000000000..3bc1f64f41 --- /dev/null +++ b/spring-jmeter-jenkins/src/main/java/com/baeldung/SpringJMeterJenkinsApplication.java @@ -0,0 +1,13 @@ +package com.baeldung; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; + +@SpringBootApplication +@EnableMongoRepositories +public class SpringJMeterJenkinsApplication { + public static void main(String[] args) { + SpringApplication.run(SpringJMeterJenkinsApplication.class, args); + } +} diff --git a/spring-jmeter-jenkins/src/main/java/com/baeldung/domain/Student.java b/spring-jmeter-jenkins/src/main/java/com/baeldung/domain/Student.java new file mode 100644 index 0000000000..0f6150fc48 --- /dev/null +++ b/spring-jmeter-jenkins/src/main/java/com/baeldung/domain/Student.java @@ -0,0 +1,66 @@ +package com.baeldung.domain; + +import javax.validation.constraints.NotNull; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.io.Serializable; + +@Document(collection = "STUDENT") +public class Student implements Serializable { + + @Id + private String id; + @NotNull + private String firstName; + private String lastName; + @NotNull + private String phoneNumber; + private String email; + + public String getId() { + return id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Override + public String toString() { + return "Student{" + + "firstName='" + firstName + '\'' + + ", lastName='" + lastName + '\'' + + ", phoneNumber='" + phoneNumber + '\'' + + ", email='" + email + '\'' + + '}'; + } +} diff --git a/spring-jmeter-jenkins/src/main/java/com/baeldung/repository/StudentRepository.java b/spring-jmeter-jenkins/src/main/java/com/baeldung/repository/StudentRepository.java new file mode 100644 index 0000000000..d0ca7d8510 --- /dev/null +++ b/spring-jmeter-jenkins/src/main/java/com/baeldung/repository/StudentRepository.java @@ -0,0 +1,7 @@ +package com.baeldung.repository; + +import org.springframework.data.mongodb.repository.MongoRepository; +import com.baeldung.domain.Student; + +public interface StudentRepository extends MongoRepository { +} diff --git a/spring-jmeter-jenkins/src/main/resources/JMeter-Jenkins.jmx b/spring-jmeter-jenkins/src/main/resources/JMeter-Jenkins.jmx new file mode 100644 index 0000000000..49ce2dec1d --- /dev/null +++ b/spring-jmeter-jenkins/src/main/resources/JMeter-Jenkins.jmx @@ -0,0 +1,96 @@ + + + + + + false + false + + + + + + + + continue + + false + 1 + + 5 + 1 + 1507776008000 + 1507776008000 + false + + + + + + + + + localhost + 8989 + + + /students + GET + true + false + true + false + + + + + + + false + + saveConfig + + + true + true + true + + true + true + true + true + false + true + true + false + false + false + true + false + false + false + true + 0 + true + true + true + true + true + + + + + + + 10 + + + + + + + true + + + + diff --git a/spring-jmeter-jenkins/src/main/resources/application.properties b/spring-jmeter-jenkins/src/main/resources/application.properties new file mode 100644 index 0000000000..c7d86e14b0 --- /dev/null +++ b/spring-jmeter-jenkins/src/main/resources/application.properties @@ -0,0 +1,14 @@ +# the db host +spring.data.mongodb.host=localhost +# the connection port (defaults to 27107) +spring.data.mongodb.port=27017 +# The database's name +spring.data.mongodb.database=JMeter-Jenkins + +# Or this +# spring.data.mongodb.uri=mongodb://localhost/JMeter-Jenkins + +# spring.data.mongodb.username= +# spring.data.mongodb.password= + +spring.data.mongodb.repositories.enabled=true \ No newline at end of file diff --git a/spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationTests.java b/spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationTests.java new file mode 100644 index 0000000000..b39a5605b1 --- /dev/null +++ b/spring-jmeter-jenkins/src/test/java/com/baeldung/SpringJMeterJenkinsApplicationTests.java @@ -0,0 +1,16 @@ +package com.baeldung; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class SpringJMeterJenkinsApplicationTests { + + @Test + public void contextLoads() { + } + +} From 88adbb6421e6c76c48ceeeff4b328dc9b2c7317a Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 29 Oct 2017 07:21:20 +0100 Subject: [PATCH 148/197] Update pom.xml (#2897) --- libraries/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libraries/pom.xml b/libraries/pom.xml index d04234bf2f..25c1113fea 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -617,11 +617,6 @@ bcprov-jdk15on 1.58 - - org.bouncycastle - bcprov-jdk15on - 1.58 - org.bouncycastle bcpkix-jdk15on From 568198fed9bbfb9c87a6c440f1d695ce956fc613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9F=D0=B5=D1=82?= =?UTF-8?q?=D1=83=D0=BD=D0=B8=D0=BD?= Date: Sun, 29 Oct 2017 11:43:08 +0100 Subject: [PATCH 149/197] BAEL-1280: Mapping Dynamic Values (@Formula, @Filter, @Any, @Where) --- hibernate5/pom.xml | 2 +- .../hibernate/HibernateMultiTenantUtil.java | 2 +- .../com/baeldung/hibernate/HibernateUtil.java | 62 +++++-- .../com/baeldung/hibernate/pojo/Employee.java | 87 ++++++++++ .../hibernate/pojo/EntityDescription.java | 55 ++++++ .../com/baeldung/hibernate/pojo/Phone.java | 50 ++++++ .../baeldung/hibernate/pojo/package-info.java | 9 + .../hibernate/DynamicMappingTest.java | 164 ++++++++++++++++++ .../hibernate-multitenancy.properties | 9 + .../src/test/resources/hibernate.properties | 2 +- 10 files changed, 425 insertions(+), 17 deletions(-) create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/Employee.java create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/EntityDescription.java create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/Phone.java create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/package-info.java create mode 100644 hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingTest.java create mode 100644 hibernate5/src/test/resources/hibernate-multitenancy.properties diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml index c501b7f11d..a9e3742e1c 100644 --- a/hibernate5/pom.xml +++ b/hibernate5/pom.xml @@ -22,7 +22,7 @@ org.hibernate hibernate-core - 5.2.9.Final + 5.2.12.Final junit diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java index 5a10b2ba56..30f3c3cf53 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java @@ -68,7 +68,7 @@ public class HibernateMultiTenantUtil { Properties properties = new Properties(); URL propertiesURL = Thread.currentThread() .getContextClassLoader() - .getResource("hibernate.properties"); + .getResource("hibernate-multitenancy.properties"); FileInputStream inputStream = new FileInputStream(propertiesURL.getFile()); properties.load(inputStream); System.out.println("LOADED PROPERTIES FROM hibernate.properties"); diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java index c1f7301d46..91392bd454 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java @@ -1,24 +1,58 @@ package com.baeldung.hibernate; +import com.baeldung.hibernate.pojo.Employee; +import com.baeldung.hibernate.pojo.EntityDescription; +import com.baeldung.hibernate.pojo.Phone; import org.hibernate.SessionFactory; -import org.hibernate.cfg.Configuration; +import org.hibernate.boot.Metadata; +import org.hibernate.boot.MetadataSources; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +import org.hibernate.service.ServiceRegistry; + +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Properties; public class HibernateUtil { + private static SessionFactory sessionFactory; - private static final SessionFactory sessionFactory; - - static { - try { - Configuration configuration = new Configuration().configure(); - sessionFactory = configuration.buildSessionFactory(); - - } catch (Throwable ex) { - System.err.println("Initial SessionFactory creation failed." + ex); - throw new ExceptionInInitializerError(ex); + public static SessionFactory getSessionFactory() throws IOException { + if (sessionFactory == null) { + ServiceRegistry serviceRegistry = configureServiceRegistry(); + sessionFactory = makeSessionFactory(serviceRegistry); } - } - - public static SessionFactory getSessionFactory() { return sessionFactory; } + + private static SessionFactory makeSessionFactory(ServiceRegistry serviceRegistry) { + MetadataSources metadataSources = new MetadataSources(serviceRegistry); + metadataSources.addPackage("com.baeldung.hibernate.pojo"); + metadataSources.addAnnotatedClass(Employee.class); + metadataSources.addAnnotatedClass(Phone.class); + metadataSources.addAnnotatedClass(EntityDescription.class); + + Metadata metadata = metadataSources.buildMetadata(); + return metadata.getSessionFactoryBuilder() + .build(); + + } + + private static ServiceRegistry configureServiceRegistry() throws IOException { + Properties properties = getProperties(); + return new StandardServiceRegistryBuilder().applySettings(properties) + .build(); + } + + private static Properties getProperties() throws IOException { + Properties properties = new Properties(); + URL propertiesURL = Thread.currentThread() + .getContextClassLoader() + .getResource("hibernate.properties"); + try (FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) { + properties.load(inputStream); + } + return properties; + } + } \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Employee.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Employee.java new file mode 100644 index 0000000000..e9732b2b67 --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Employee.java @@ -0,0 +1,87 @@ +package com.baeldung.hibernate.pojo; + +import org.hibernate.annotations.*; + +import javax.persistence.Entity; +import javax.persistence.*; +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +@Entity +@Where(clause = "deleted = false") +@FilterDef(name = "incomeLevelFilter", parameters = @ParamDef(name = "incomeLimit", type = "int")) +@Filter(name = "incomeLevelFilter", condition = "grossIncome > :incomeLimit") +public class Employee implements Serializable { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + private long grossIncome; + + private int taxInPercents; + + private boolean deleted; + + public long getTaxJavaWay() { + return grossIncome * taxInPercents / 100; + } + + @Formula("grossIncome * taxInPercents / 100") + private long tax; + + @OneToMany + @JoinColumn(name = "employee_id") + @Where(clause = "deleted = false") + private Set phones = new HashSet<>(0); + + public Employee() { + } + + public Employee(long grossIncome, int taxInPercents) { + this.grossIncome = grossIncome; + this.taxInPercents = taxInPercents; + } + + public Integer getId() { + return id; + } + + public long getGrossIncome() { + return grossIncome; + } + + public int getTaxInPercents() { + return taxInPercents; + } + + public long getTax() { + return tax; + } + + public void setId(Integer id) { + this.id = id; + } + + public void setGrossIncome(long grossIncome) { + this.grossIncome = grossIncome; + } + + public void setTaxInPercents(int taxInPercents) { + this.taxInPercents = taxInPercents; + } + + public boolean getDeleted() { + return deleted; + } + + public void setDeleted(boolean deleted) { + this.deleted = deleted; + } + + public Set getPhones() { + return phones; + } + +} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/EntityDescription.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/EntityDescription.java new file mode 100644 index 0000000000..131bb73a80 --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/EntityDescription.java @@ -0,0 +1,55 @@ +package com.baeldung.hibernate.pojo; + +import org.hibernate.annotations.Any; + +import javax.persistence.*; +import java.io.Serializable; + +@Entity +public class EntityDescription implements Serializable { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + private String description; + + @Any( + metaDef = "EntityDescriptionMetaDef", + metaColumn = @Column(name = "entity_type") + ) + @JoinColumn(name = "entity_id") + private Serializable entity; + + public EntityDescription() { + } + + public EntityDescription(String description, Serializable entity) { + this.description = description; + this.entity = entity; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Serializable getEntity() { + return entity; + } + + public void setEntity(Serializable entity) { + this.entity = entity; + } +} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Phone.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Phone.java new file mode 100644 index 0000000000..d923bda5de --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Phone.java @@ -0,0 +1,50 @@ +package com.baeldung.hibernate.pojo; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import java.io.Serializable; + +@Entity +public class Phone implements Serializable { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + private boolean deleted; + + private String number; + + public Phone() { + } + + public Phone(String number) { + this.number = number; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public boolean isDeleted() { + return deleted; + } + + public void setDeleted(boolean deleted) { + this.deleted = deleted; + } + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } +} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/package-info.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/package-info.java new file mode 100644 index 0000000000..992cda7c1d --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/package-info.java @@ -0,0 +1,9 @@ +@AnyMetaDef(name = "EntityDescriptionMetaDef", metaType = "string", idType = "int", + metaValues = { + @MetaValue(value = "Employee", targetEntity = Employee.class), + @MetaValue(value = "Phone", targetEntity = Phone.class) + }) +package com.baeldung.hibernate.pojo; + +import org.hibernate.annotations.AnyMetaDef; +import org.hibernate.annotations.MetaValue; \ No newline at end of file diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingTest.java new file mode 100644 index 0000000000..456985eeae --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingTest.java @@ -0,0 +1,164 @@ +package com.baeldung.hibernate; + +import com.baeldung.hibernate.pojo.Employee; +import com.baeldung.hibernate.pojo.EntityDescription; +import com.baeldung.hibernate.pojo.Phone; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; + +import static org.junit.Assert.*; + +public class DynamicMappingTest { + + private Session session; + + private Transaction transaction; + + @Before + public void setUp() throws IOException { + session = HibernateUtil.getSessionFactory().openSession(); + transaction = session.beginTransaction(); + + session.createNativeQuery("delete from phone").executeUpdate(); + session.createNativeQuery("delete from employee").executeUpdate(); + + transaction.commit(); + transaction = session.beginTransaction(); + } + + @After + public void tearDown() { + transaction.commit(); + session.close(); + } + + @Test + public void givenEntity_whenFieldMappedWithFormula_thenFieldIsCalculated() { + Employee employee = new Employee(10_000L, 25); + assertEquals(2_500L, employee.getTaxJavaWay()); + + session.save(employee); + session.flush(); + session.clear(); + + employee = session.get(Employee.class, employee.getId()); + assertEquals(2_500L, employee.getTax()); + } + + @Test + public void givenEntityMappedWithWhere_whenDeletedIsTrue_thenEntityNotFetched() { + Employee employee = new Employee(); + + session.save(employee); + session.clear(); + + employee = session.find(Employee.class, employee.getId()); + assertNotNull(employee); + + employee.setDeleted(true); + session.flush(); + + employee = session.find(Employee.class, employee.getId()); + assertNotNull(employee); + + session.clear(); + + employee = session.find(Employee.class, employee.getId()); + assertNull(employee); + + } + + @Test + public void givenCollectionMappedWithWhere_whenDeletedIsTrue_thenEntityNotFetched() { + Employee employee = new Employee(); + Phone phone1 = new Phone("555-45-67"); + Phone phone2 = new Phone("555-89-01"); + employee.getPhones().add(phone1); + employee.getPhones().add(phone2); + + session.save(phone1); + session.save(phone2); + session.save(employee); + session.flush(); + session.clear(); + + employee = session.find(Employee.class, employee.getId()); + assertEquals(employee.getPhones().size(), 2); + + employee.getPhones().iterator().next().setDeleted(true); + session.flush(); + session.clear(); + + employee = session.find(Employee.class, employee.getId()); + assertEquals(employee.getPhones().size(), 1); + + List fullPhoneList = session.createQuery("from Phone").getResultList(); + assertEquals(2, fullPhoneList.size()); + + } + + @Test + public void givenFilterByIncome_whenIncomeLimitSet_thenFilterIsApplied() throws IOException { + session.save(new Employee(10_000, 25)); + session.save(new Employee(12_000, 25)); + session.save(new Employee(15_000, 25)); + + session.flush(); + session.clear(); + + session.enableFilter("incomeLevelFilter") + .setParameter("incomeLimit", 11_000); + + List employees = session.createQuery("from Employee").getResultList(); + + assertEquals(2, employees.size()); + + Employee employee = session.get(Employee.class, 1); + assertEquals(10_000, employee.getGrossIncome()); + + session.close(); + + session = HibernateUtil.getSessionFactory().openSession(); + transaction = session.beginTransaction(); + + employees = session.createQuery("from Employee").getResultList(); + + assertEquals(3, employees.size()); + + } + + @Test + public void givenMappingWithAny_whenDescriptionAddedToEntity_thenDescriptionCanReferAnyEntity() { + Employee employee = new Employee(); + Phone phone1 = new Phone("555-45-67"); + Phone phone2 = new Phone("555-89-01"); + employee.getPhones().add(phone1); + employee.getPhones().add(phone2); + + EntityDescription employeeDescription = new EntityDescription("Send to conference next year", employee); + EntityDescription phone1Description = new EntityDescription("Home phone (do not call after 10PM)", phone1); + EntityDescription phone2Description = new EntityDescription("Work phone", phone1); + + session.save(phone1); + session.save(phone2); + session.save(employee); + session.save(employeeDescription); + session.save(phone1Description); + session.save(phone2Description); + session.flush(); + session.clear(); + + List descriptions = session.createQuery("from EntityDescription").getResultList(); + + assertTrue(Employee.class.isAssignableFrom(descriptions.get(0).getEntity().getClass())); + assertTrue(Phone.class.isAssignableFrom(descriptions.get(1).getEntity().getClass())); + assertTrue(Phone.class.isAssignableFrom(descriptions.get(2).getEntity().getClass())); + } + +} diff --git a/hibernate5/src/test/resources/hibernate-multitenancy.properties b/hibernate5/src/test/resources/hibernate-multitenancy.properties new file mode 100644 index 0000000000..298ecd05d3 --- /dev/null +++ b/hibernate5/src/test/resources/hibernate-multitenancy.properties @@ -0,0 +1,9 @@ +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1 +hibernate.connection.username=sa +hibernate.connection.autocommit=true +jdbc.password= + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=true +hibernate.multiTenancy=DATABASE diff --git a/hibernate5/src/test/resources/hibernate.properties b/hibernate5/src/test/resources/hibernate.properties index 298ecd05d3..7b8764637b 100644 --- a/hibernate5/src/test/resources/hibernate.properties +++ b/hibernate5/src/test/resources/hibernate.properties @@ -6,4 +6,4 @@ jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.show_sql=true -hibernate.multiTenancy=DATABASE +hibernate.hbm2ddl.auto=create-drop \ No newline at end of file From e56da99216d9e63bc8b7c9b61569f9fe35e0fc63 Mon Sep 17 00:00:00 2001 From: Yasin Bhojawala Date: Sun, 29 Oct 2017 17:20:47 +0530 Subject: [PATCH 150/197] BAEL-1217 Guide to Spring Type Conversions Review comments --- .../converter/GenericBigDecimalConverter.java | 5 ++- .../StringToEmployeeConverterController.java | 21 ++++++++++ .../converter/CustomConverterTest.java | 20 +++++++--- ...ringToEmployeeConverterControllerTest.java | 39 +++++++++++++++++++ 4 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java create mode 100644 spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java diff --git a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java b/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java index da46c43dad..e96dbeaf47 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java +++ b/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java @@ -5,6 +5,7 @@ import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.GenericConverter; import java.math.BigDecimal; +import java.math.MathContext; import java.util.Set; public class GenericBigDecimalConverter implements GenericConverter { @@ -30,7 +31,9 @@ public class GenericBigDecimalConverter implements GenericConverter { return new BigDecimal(number); } else { Number number = (Number) source; - return new BigDecimal(number.doubleValue()); + BigDecimal converted = new BigDecimal(number.doubleValue()); + converted.setScale(2, BigDecimal.ROUND_HALF_EVEN); + return converted; } } } diff --git a/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java b/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java new file mode 100644 index 0000000000..f08bd9149e --- /dev/null +++ b/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java @@ -0,0 +1,21 @@ +package org.baeldung.converter.controller; + +import com.baeldung.toggle.Employee; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/string-to-employee") +public class StringToEmployeeConverterController { + + @GetMapping + public ResponseEntity getStringToEmployee(@RequestParam("employee") Employee employee) { + return ResponseEntity.ok(employee); + } + + @PostMapping(consumes = {MediaType.TEXT_PLAIN_VALUE}) + public ResponseEntity postStringToEmployee(@RequestBody Employee employee) { + return ResponseEntity.ok(employee); + } +} diff --git a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java index eda05a8441..8446196758 100644 --- a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java +++ b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java @@ -13,6 +13,8 @@ import org.springframework.test.context.web.WebAppConfiguration; import java.math.BigDecimal; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class) @WebAppConfiguration @@ -23,23 +25,29 @@ public class CustomConverterTest { @Test public void whenConvertStringToIntegerUsingDefaultConverter_thenSuccess() { - System.out.println(conversionService.convert("25", Integer.class)); + assertThat(conversionService.convert("25", Integer.class)).isEqualTo(25); } @Test public void whenConvertStringToEmployee_thenSuccess() { - System.out.println(conversionService.convert("1,50000.00", Employee.class)); + Employee employee = conversionService.convert("1,50000.00", Employee.class); + Employee actualEmployee = new Employee(1, 50000.00); + assertThat(conversionService.convert("1,50000.00", Employee.class)) + .isEqualToComparingFieldByField(actualEmployee); } @Test public void whenConvertStringToEnum_thenSuccess() { - System.out.println(conversionService.convert("ALPHA", Modes.class)); + assertThat(conversionService.convert("ALPHA", Modes.class)).isEqualTo(Modes.ALPHA); } @Test public void whenConvertingToBigDecimalUsingGenericConverter_thenSuccess() { - System.out.println(conversionService.convert(Integer.valueOf(11), BigDecimal.class)); - System.out.println(conversionService.convert(Double.valueOf(25.23), BigDecimal.class)); - System.out.println(conversionService.convert("2.32", BigDecimal.class)); + assertThat(conversionService.convert(Integer.valueOf(11), BigDecimal.class)). + isEqualTo(BigDecimal.valueOf(11)); + assertThat(conversionService.convert(Double.valueOf(25.23), BigDecimal.class)) + .isEqualByComparingTo(BigDecimal.valueOf(Double.valueOf(25.23))); + assertThat(conversionService.convert("2.32", BigDecimal.class)) + .isEqualTo(BigDecimal.valueOf(2.32)); } } diff --git a/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java new file mode 100644 index 0000000000..5e005af0ea --- /dev/null +++ b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java @@ -0,0 +1,39 @@ +package org.baeldung.converter.controller; + +import org.baeldung.Application; +import org.baeldung.boot.DemoApplication; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +import static org.hamcrest.CoreMatchers.is; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) +@AutoConfigureMockMvc +//@AutoConfigureTestDatabase +public class StringToEmployeeConverterControllerTest { + + @Autowired + private MockMvc mockMvc; + + @Test + public void getStringToEmployeeTest() throws Exception { + mockMvc.perform(get("/string-to-employee?employee=1,2000")) + .andDo(print()) + .andExpect(jsonPath("$.id", is(1))) + .andExpect(jsonPath("$.salary", is(2000.0))) + .andExpect(status().isOk()); + } +} \ No newline at end of file From 9fee77a9d94a3547f6198647bd94f97612fb6aaa Mon Sep 17 00:00:00 2001 From: Yasin Bhojawala Date: Sun, 29 Oct 2017 17:24:59 +0530 Subject: [PATCH 151/197] reverting unnecessary files --- .../StringToEmployeeConverterController.java | 21 ---------- ...ringToEmployeeConverterControllerTest.java | 39 ------------------- 2 files changed, 60 deletions(-) delete mode 100644 spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java delete mode 100644 spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java diff --git a/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java b/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java deleted file mode 100644 index f08bd9149e..0000000000 --- a/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.baeldung.converter.controller; - -import com.baeldung.toggle.Employee; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/string-to-employee") -public class StringToEmployeeConverterController { - - @GetMapping - public ResponseEntity getStringToEmployee(@RequestParam("employee") Employee employee) { - return ResponseEntity.ok(employee); - } - - @PostMapping(consumes = {MediaType.TEXT_PLAIN_VALUE}) - public ResponseEntity postStringToEmployee(@RequestBody Employee employee) { - return ResponseEntity.ok(employee); - } -} diff --git a/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java deleted file mode 100644 index 5e005af0ea..0000000000 --- a/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.baeldung.converter.controller; - -import org.baeldung.Application; -import org.baeldung.boot.DemoApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.MediaType; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.web.servlet.MockMvc; - -import static org.hamcrest.CoreMatchers.is; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) -@AutoConfigureMockMvc -//@AutoConfigureTestDatabase -public class StringToEmployeeConverterControllerTest { - - @Autowired - private MockMvc mockMvc; - - @Test - public void getStringToEmployeeTest() throws Exception { - mockMvc.perform(get("/string-to-employee?employee=1,2000")) - .andDo(print()) - .andExpect(jsonPath("$.id", is(1))) - .andExpect(jsonPath("$.salary", is(2000.0))) - .andExpect(status().isOk()); - } -} \ No newline at end of file From 7ee0ac104de0afdd308151f619428ea80891d6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=9F=D0=B5=D1=82?= =?UTF-8?q?=D1=83=D0=BD=D0=B8=D0=BD?= Date: Sun, 29 Oct 2017 14:06:46 +0100 Subject: [PATCH 152/197] BAEL-1280: Fixed sample code issues --- hibernate5/pom.xml | 6 ++++ ...ava => DynamicMappingIntegrationTest.java} | 34 +++++++++---------- 2 files changed, 23 insertions(+), 17 deletions(-) rename hibernate5/src/test/java/com/baeldung/hibernate/{DynamicMappingTest.java => DynamicMappingIntegrationTest.java} (81%) diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml index a9e3742e1c..8543d1dae3 100644 --- a/hibernate5/pom.xml +++ b/hibernate5/pom.xml @@ -29,6 +29,12 @@ junit 4.12 + + org.assertj + assertj-core + 3.8.0 + test + com.h2database h2 diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingIntegrationTest.java similarity index 81% rename from hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingTest.java rename to hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingIntegrationTest.java index 456985eeae..b207d6630a 100644 --- a/hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingTest.java +++ b/hibernate5/src/test/java/com/baeldung/hibernate/DynamicMappingIntegrationTest.java @@ -12,9 +12,9 @@ import org.junit.Test; import java.io.IOException; import java.util.List; -import static org.junit.Assert.*; +import static org.assertj.core.api.Assertions.assertThat; -public class DynamicMappingTest { +public class DynamicMappingIntegrationTest { private Session session; @@ -34,21 +34,21 @@ public class DynamicMappingTest { @After public void tearDown() { - transaction.commit(); + transaction.rollback(); session.close(); } @Test public void givenEntity_whenFieldMappedWithFormula_thenFieldIsCalculated() { Employee employee = new Employee(10_000L, 25); - assertEquals(2_500L, employee.getTaxJavaWay()); + assertThat(employee.getTaxJavaWay()).isEqualTo(2_500L); session.save(employee); session.flush(); session.clear(); employee = session.get(Employee.class, employee.getId()); - assertEquals(2_500L, employee.getTax()); + assertThat(employee.getTax()).isEqualTo(2_500L); } @Test @@ -59,18 +59,18 @@ public class DynamicMappingTest { session.clear(); employee = session.find(Employee.class, employee.getId()); - assertNotNull(employee); + assertThat(employee).isNotNull(); employee.setDeleted(true); session.flush(); employee = session.find(Employee.class, employee.getId()); - assertNotNull(employee); + assertThat(employee).isNotNull(); session.clear(); employee = session.find(Employee.class, employee.getId()); - assertNull(employee); + assertThat(employee).isNull(); } @@ -89,17 +89,17 @@ public class DynamicMappingTest { session.clear(); employee = session.find(Employee.class, employee.getId()); - assertEquals(employee.getPhones().size(), 2); + assertThat(employee.getPhones()).hasSize(2); employee.getPhones().iterator().next().setDeleted(true); session.flush(); session.clear(); employee = session.find(Employee.class, employee.getId()); - assertEquals(employee.getPhones().size(), 1); + assertThat(employee.getPhones()).hasSize(1); List fullPhoneList = session.createQuery("from Phone").getResultList(); - assertEquals(2, fullPhoneList.size()); + assertThat(fullPhoneList).hasSize(2); } @@ -117,10 +117,10 @@ public class DynamicMappingTest { List employees = session.createQuery("from Employee").getResultList(); - assertEquals(2, employees.size()); + assertThat(employees).hasSize(2); Employee employee = session.get(Employee.class, 1); - assertEquals(10_000, employee.getGrossIncome()); + assertThat(employee.getGrossIncome()).isEqualTo(10_000); session.close(); @@ -129,7 +129,7 @@ public class DynamicMappingTest { employees = session.createQuery("from Employee").getResultList(); - assertEquals(3, employees.size()); + assertThat(employees).hasSize(3); } @@ -156,9 +156,9 @@ public class DynamicMappingTest { List descriptions = session.createQuery("from EntityDescription").getResultList(); - assertTrue(Employee.class.isAssignableFrom(descriptions.get(0).getEntity().getClass())); - assertTrue(Phone.class.isAssignableFrom(descriptions.get(1).getEntity().getClass())); - assertTrue(Phone.class.isAssignableFrom(descriptions.get(2).getEntity().getClass())); + assertThat(Employee.class.isAssignableFrom(descriptions.get(0).getEntity().getClass())).isTrue(); + assertThat(Phone.class.isAssignableFrom(descriptions.get(1).getEntity().getClass())).isTrue(); + assertThat(Phone.class.isAssignableFrom(descriptions.get(2).getEntity().getClass())).isTrue(); } } From 729c392019658fad952734acd0faf2a5ec0c58c6 Mon Sep 17 00:00:00 2001 From: Yasin Bhojawala Date: Sun, 29 Oct 2017 19:16:42 +0530 Subject: [PATCH 153/197] BAEL-1217 fixed failing tests --- .../org/baeldung/converter/GenericBigDecimalConverter.java | 3 +-- .../test/java/org/baeldung/converter/CustomConverterTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java b/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java index e96dbeaf47..7be038910b 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java +++ b/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java @@ -32,8 +32,7 @@ public class GenericBigDecimalConverter implements GenericConverter { } else { Number number = (Number) source; BigDecimal converted = new BigDecimal(number.doubleValue()); - converted.setScale(2, BigDecimal.ROUND_HALF_EVEN); - return converted; + return converted.setScale(2, BigDecimal.ROUND_HALF_EVEN); } } } diff --git a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java index 8446196758..faa6baffbb 100644 --- a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java +++ b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java @@ -44,7 +44,7 @@ public class CustomConverterTest { @Test public void whenConvertingToBigDecimalUsingGenericConverter_thenSuccess() { assertThat(conversionService.convert(Integer.valueOf(11), BigDecimal.class)). - isEqualTo(BigDecimal.valueOf(11)); + isEqualTo(BigDecimal.valueOf(11.00).setScale(2, BigDecimal.ROUND_HALF_EVEN)); assertThat(conversionService.convert(Double.valueOf(25.23), BigDecimal.class)) .isEqualByComparingTo(BigDecimal.valueOf(Double.valueOf(25.23))); assertThat(conversionService.convert("2.32", BigDecimal.class)) From 7c2b4e6f881da4a6296183b456be99a39157df48 Mon Sep 17 00:00:00 2001 From: Yasin Bhojawala Date: Sun, 29 Oct 2017 19:20:54 +0530 Subject: [PATCH 154/197] format code --- .../test/java/org/baeldung/converter/CustomConverterTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java index faa6baffbb..0fd181c1de 100644 --- a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java +++ b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java @@ -43,8 +43,8 @@ public class CustomConverterTest { @Test public void whenConvertingToBigDecimalUsingGenericConverter_thenSuccess() { - assertThat(conversionService.convert(Integer.valueOf(11), BigDecimal.class)). - isEqualTo(BigDecimal.valueOf(11.00).setScale(2, BigDecimal.ROUND_HALF_EVEN)); + assertThat(conversionService.convert(Integer.valueOf(11), BigDecimal.class)) + .isEqualTo(BigDecimal.valueOf(11.00).setScale(2, BigDecimal.ROUND_HALF_EVEN)); assertThat(conversionService.convert(Double.valueOf(25.23), BigDecimal.class)) .isEqualByComparingTo(BigDecimal.valueOf(Double.valueOf(25.23))); assertThat(conversionService.convert("2.32", BigDecimal.class)) From 95cf16de281a362a94f191bec3b0f675548707f1 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Sun, 29 Oct 2017 16:05:26 +0100 Subject: [PATCH 155/197] Spring Boot Bootstrap upgrade (#2904) --- pom.xml | 1 + spring-boot-bootstrap/pom.xml | 77 ++++++++++++++++++- .../org/baeldung/persistence/model/Book.java | 3 +- .../persistence/repo/BookRepository.java | 6 +- .../java/org/baeldung/web/BookController.java | 30 +++----- .../baeldung/web/RestExceptionHandler.java | 12 ++- .../org/baeldung/web/SimpleController.java | 2 +- ...tBootstrapApplicationIntegrationTest.java} | 3 +- ...> SpringBootBootstrapIntegrationTest.java} | 4 +- .../keycloak/KeycloakConfigurationTest.java | 69 ++++++++--------- 10 files changed, 132 insertions(+), 75 deletions(-) rename spring-boot-bootstrap/src/test/java/org/baeldung/{SpringBootBootstrapApplicationTests.java => SpringBootBootstrapApplicationIntegrationTest.java} (83%) rename spring-boot-bootstrap/src/test/java/org/baeldung/{LiveTest.java => SpringBootBootstrapIntegrationTest.java} (97%) diff --git a/pom.xml b/pom.xml index d537adf08e..033215d6ae 100644 --- a/pom.xml +++ b/pom.xml @@ -149,6 +149,7 @@ spring-batch spring-bom spring-boot + spring-boot-bootstrap spring-cloud-data-flow spring-cloud spring-core diff --git a/spring-boot-bootstrap/pom.xml b/spring-boot-bootstrap/pom.xml index 9da37a3261..5ad8330a89 100644 --- a/spring-boot-bootstrap/pom.xml +++ b/spring-boot-bootstrap/pom.xml @@ -12,10 +12,10 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.3.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 + vavr javax-servlets javaxval @@ -124,11 +124,11 @@ pdf protobuffer - querydsl + persistence-modules/querydsl reactor-core - redis + persistence-modules/redis rest-assured rest-testing resteasy @@ -136,7 +136,7 @@ spring-swagger-codegen selenium-junit-testng - solr + persistence-modules/solr spark-java spring-5-mvc @@ -155,21 +155,21 @@ spring-core spring-cucumber spring-aop - spring-data-cassandra + persistence-modules/spring-data-cassandra spring-data-couchbase-2 - spring-data-dynamodb + persistence-modules/spring-data-dynamodb spring-data-elasticsearch spring-data-mongodb - spring-data-neo4j - spring-data-redis + persistence-modules/spring-data-neo4j + persistence-modules/spring-data-redis spring-data-rest - spring-data-solr + persistence-modules/spring-data-solr spring-dispatcher-servlet spring-exceptions spring-freemarker - spring-hibernate3 + persistence-modules/spring-hibernate-3 spring-hibernate4 - spring-hibernate5 + persistence-modules/spring-hibernate-5 spring-integration spring-jersey spring-jmeter-jenkins @@ -245,11 +245,11 @@ rabbitmq vertx - spring-data-gemfire + persistence-modules/spring-data-gemfire mybatis spring-drools drools - liquibase + persistence-modules/liquibase spring-boot-property-exp mockserver undertow From 6eb586a8c6aa0bf2ed4c0d220657ef90aa29d873 Mon Sep 17 00:00:00 2001 From: KevinGilmore Date: Sun, 29 Oct 2017 21:01:37 -0500 Subject: [PATCH 159/197] BAEL-1183 README (#2910) * BAEL-973: updated README * BAEL-1069: Updated README * BAEL-817: add README file * BAEL-1084: README update * BAEL-960: Update README * BAEL-1155: updated README * BAEL-1041: updated README * BAEL-973: Updated README * BAEL-1187: updated README * BAEL-1183: Update README --- junit5/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5/README.md b/junit5/README.md index a3bb8fc1be..d0fa19bd83 100644 --- a/junit5/README.md +++ b/junit5/README.md @@ -6,4 +6,4 @@ - [Guide to Dynamic Tests in Junit 5](http://www.baeldung.com/junit5-dynamic-tests) - [A Guied to JUnit 5 Extensions](http://www.baeldung.com/junit-5-extensions) - [Inject Parameters into JUnit Jupiter Unit Tests](http://www.baeldung.com/junit-5-parameters) - +- [Mockito and JUnit 5 – Using ExtendWith](http://www.baeldung.com/mockito-junit-5-extension) From 73bfdda38d48c1f5c817a7a9d0243caff0b71b71 Mon Sep 17 00:00:00 2001 From: Michael C Good <31810784+michaelcgood@users.noreply.github.com> Date: Sun, 29 Oct 2017 23:09:22 -0400 Subject: [PATCH 160/197] BAEL-1238 Quick Guide to Using Keycloak with a Spring Boot Application (#2908) * michael.good703@gmail.com michael.good703@gmail.com * michael.good703@gmail.com michael.good703@gmail.com * michael.good703@gmail.com michael.good703@gmail.com * update * michael.good703@gmail.com Had to add @SpringBootApplication(exclude = MySQLAutoconfiguration.class) --- spring-boot/.gitignore | 2 +- .../src/main/java/com/baeldung/keycloak/SpringBoot.java | 6 +++++- .../com/baeldung/keycloak/KeycloakConfigurationTest.java | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot/.gitignore b/spring-boot/.gitignore index ebf3ee7f16..88e3308e9d 100644 --- a/spring-boot/.gitignore +++ b/spring-boot/.gitignore @@ -2,4 +2,4 @@ .settings/ .classpath .project -/.apt_generated/ \ No newline at end of file + diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java b/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java index 87b22cf50a..9904c66725 100644 --- a/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java +++ b/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java @@ -3,7 +3,11 @@ package com.baeldung.keycloak; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication + +import com.baeldung.autoconfiguration.MySQLAutoconfiguration; + +@SpringBootApplication(exclude = MySQLAutoconfiguration.class) + public class SpringBoot { public static void main(String[] args) { diff --git a/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java b/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java index e64764842a..7d88c25909 100644 --- a/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java +++ b/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java @@ -47,4 +47,5 @@ public class KeycloakConfigurationTest { public void testGetKeycloakSecurityContext() throws Exception { assertNotNull(keycloakPrincipal.getKeycloakSecurityContext()); } + } From 5a961c52f838e8b50204a1e2433fc253942bd6e9 Mon Sep 17 00:00:00 2001 From: Seun Matt Date: Mon, 30 Oct 2017 15:45:16 +0100 Subject: [PATCH 161/197] Refactor CAS Modules into CAS (#2916) * added updated example codes * updated example code StringToCharStream * deleted StringToCharStream.java locally * removed redundant file * added code for apache commons collection SetUtils * refactored example code * added example code for bytebuddy * added example code for PCollections * update pom * refactored tests for PCollections * spring security xml config * spring security xml config * remove redundant comment * example code for apache-shiro * updated example code for Vavr Collections * updated Vavr's Collection example * updated Vavr Collection file * updated example code for Apache Shiro * updated Vavr Collections example * added example code for N1QL * update example code for N1QL * added integration test for N1QL * update N1QL Example code * update the N1QL example Code * rename module to couchbase * rename module to couchbase * change module name in parent module and pom * added cas-server module * added cas secured app for Spring SSO with CAS * refactor cas modules into cas folder --- cas/cas-secured-app/.gitignore | 24 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 47610 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + cas/cas-secured-app/mvnw | 225 +++++++++++++++++ cas/cas-secured-app/mvnw.cmd | 143 +++++++++++ cas/cas-secured-app/pom.xml | 110 ++++++++ .../CasSecuredAppApplication.java | 91 +++++++ .../cassecuredapp/config/SecurityConfig.java | 83 +++++++ .../controllers/AuthController.java | 35 +++ .../controllers/IndexController.java | 15 ++ .../controllers/SecuredPageController.java | 24 ++ .../src/main/resources/application.properties | 1 + .../main/resources/templates/auth/logout.ftl | 10 + .../src/main/resources/templates/index.ftl | 11 + .../main/resources/templates/secure/index.ftl | 12 + .../CasSecuredAppApplicationTests.java | 16 ++ cas/cas-server/.gitignore | 14 ++ cas/cas-server/LICENSE.txt | 202 +++++++++++++++ cas/cas-server/README.md | 88 +++++++ cas/cas-server/build.cmd | 82 ++++++ cas/cas-server/build.sh | 97 ++++++++ cas/cas-server/etc/cas/config/application.yml | 2 + cas/cas-server/etc/cas/config/cas.properties | 7 + cas/cas-server/etc/cas/config/log4j2.xml | 117 +++++++++ cas/cas-server/etc/cas/thekeystore | Bin 0 -> 2225 bytes cas/cas-server/etc/cas/thekeystore.crt | Bin 0 -> 808 bytes cas/cas-server/maven/maven-wrapper.properties | 1 + cas/cas-server/mvnw | 234 ++++++++++++++++++ cas/cas-server/mvnw.bat | 174 +++++++++++++ cas/cas-server/pom.xml | 158 ++++++++++++ .../src/main/resources/application.properties | 126 ++++++++++ .../src/main/resources/cas.properties | 41 +++ .../resources/services/casSecuredApp.json | 8 + pom.xml | 4 +- 34 files changed, 2154 insertions(+), 2 deletions(-) create mode 100644 cas/cas-secured-app/.gitignore create mode 100644 cas/cas-secured-app/.mvn/wrapper/maven-wrapper.jar create mode 100644 cas/cas-secured-app/.mvn/wrapper/maven-wrapper.properties create mode 100644 cas/cas-secured-app/mvnw create mode 100644 cas/cas-secured-app/mvnw.cmd create mode 100644 cas/cas-secured-app/pom.xml create mode 100644 cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java create mode 100644 cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java create mode 100644 cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java create mode 100644 cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java create mode 100644 cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java create mode 100644 cas/cas-secured-app/src/main/resources/application.properties create mode 100644 cas/cas-secured-app/src/main/resources/templates/auth/logout.ftl create mode 100644 cas/cas-secured-app/src/main/resources/templates/index.ftl create mode 100644 cas/cas-secured-app/src/main/resources/templates/secure/index.ftl create mode 100644 cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java create mode 100644 cas/cas-server/.gitignore create mode 100644 cas/cas-server/LICENSE.txt create mode 100644 cas/cas-server/README.md create mode 100644 cas/cas-server/build.cmd create mode 100644 cas/cas-server/build.sh create mode 100644 cas/cas-server/etc/cas/config/application.yml create mode 100644 cas/cas-server/etc/cas/config/cas.properties create mode 100644 cas/cas-server/etc/cas/config/log4j2.xml create mode 100644 cas/cas-server/etc/cas/thekeystore create mode 100644 cas/cas-server/etc/cas/thekeystore.crt create mode 100644 cas/cas-server/maven/maven-wrapper.properties create mode 100644 cas/cas-server/mvnw create mode 100644 cas/cas-server/mvnw.bat create mode 100644 cas/cas-server/pom.xml create mode 100644 cas/cas-server/src/main/resources/application.properties create mode 100644 cas/cas-server/src/main/resources/cas.properties create mode 100644 cas/cas-server/src/main/resources/services/casSecuredApp.json diff --git a/cas/cas-secured-app/.gitignore b/cas/cas-secured-app/.gitignore new file mode 100644 index 0000000000..2af7cefb0a --- /dev/null +++ b/cas/cas-secured-app/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.jar b/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..9cc84ea9b4d95453115d0c26488d6a78694e0bc6 GIT binary patch literal 47610 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 literal 0 HcmV?d00001 diff --git a/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.properties b/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..c315043703 --- /dev/null +++ b/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/cas/cas-secured-app/mvnw b/cas/cas-secured-app/mvnw new file mode 100644 index 0000000000..5bf251c077 --- /dev/null +++ b/cas/cas-secured-app/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/cas/cas-secured-app/mvnw.cmd b/cas/cas-secured-app/mvnw.cmd new file mode 100644 index 0000000000..019bd74d76 --- /dev/null +++ b/cas/cas-secured-app/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/cas/cas-secured-app/pom.xml b/cas/cas-secured-app/pom.xml new file mode 100644 index 0000000000..f66d54ae67 --- /dev/null +++ b/cas/cas-secured-app/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.baeldung + cas-secured-app + 0.0.1-SNAPSHOT + jar + + cas-secured-app + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.0.0.BUILD-SNAPSHOT + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.security + spring-security-cas + + + org.springframework.boot + spring-boot-starter-freemarker + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java new file mode 100644 index 0000000000..fc05e3b38f --- /dev/null +++ b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java @@ -0,0 +1,91 @@ +package com.baeldung.cassecuredapp; + +import org.jasig.cas.client.session.SingleSignOutFilter; +import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; +import org.jasig.cas.client.validation.Cas30ServiceTicketValidator; +import org.jasig.cas.client.validation.TicketValidator; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; +import org.springframework.context.event.EventListener; +import org.springframework.security.cas.ServiceProperties; +import org.springframework.security.cas.authentication.CasAuthenticationProvider; +import org.springframework.security.cas.web.CasAuthenticationEntryPoint; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.logout.LogoutFilter; +import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; + +import javax.servlet.http.HttpSessionEvent; + +@SpringBootApplication +public class CasSecuredAppApplication { + + public static void main(String[] args) { + SpringApplication.run(CasSecuredAppApplication.class, args); + } + + @Bean + public ServiceProperties serviceProperties() { + ServiceProperties serviceProperties = new ServiceProperties(); + serviceProperties.setService("http://localhost:9000/login/cas"); + serviceProperties.setSendRenew(false); + return serviceProperties; + } + + @Bean + @Primary + public AuthenticationEntryPoint authenticationEntryPoint(ServiceProperties sP) { + CasAuthenticationEntryPoint entryPoint = new CasAuthenticationEntryPoint(); + entryPoint.setLoginUrl("https://localhost:8443/cas/login"); + entryPoint.setServiceProperties(sP); + return entryPoint; + } + + @Bean + public TicketValidator ticketValidator() { + return new Cas30ServiceTicketValidator("https://localhost:8443/cas"); + } + + @Bean + public CasAuthenticationProvider casAuthenticationProvider() { + CasAuthenticationProvider provider = new CasAuthenticationProvider(); + provider.setServiceProperties(serviceProperties()); + provider.setTicketValidator(ticketValidator()); + provider.setUserDetailsService((s) -> new User("test@test.com", "smatt", + true, true, true, true, + AuthorityUtils.createAuthorityList("ROLE_ADMIN"))); + provider.setKey("CAS_PROVIDER_LOCALHOST_9000"); + return provider; + } + + + @Bean + public SecurityContextLogoutHandler securityContextLogoutHandler() { + return new SecurityContextLogoutHandler(); + } + + @Bean + public LogoutFilter logoutFilter() { + LogoutFilter logoutFilter = new LogoutFilter( + "https://localhost:8443/cas/logout", securityContextLogoutHandler()); + logoutFilter.setFilterProcessesUrl("/logout/cas"); + return logoutFilter; + } + + @Bean + public SingleSignOutFilter singleSignOutFilter() { + SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter(); + singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443/cas"); + singleSignOutFilter.setIgnoreInitConfiguration(true); + return singleSignOutFilter; + } + + @EventListener + public SingleSignOutHttpSessionListener singleSignOutHttpSessionListener(HttpSessionEvent event) { + return new SingleSignOutHttpSessionListener(); + } +} diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java new file mode 100644 index 0000000000..2eabed49e1 --- /dev/null +++ b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java @@ -0,0 +1,83 @@ +package com.baeldung.cassecuredapp.config; + +import org.jasig.cas.client.session.SingleSignOutFilter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.ProviderManager; +import org.springframework.security.cas.ServiceProperties; +import org.springframework.security.cas.authentication.CasAuthenticationProvider; +import org.springframework.security.cas.web.CasAuthenticationFilter; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.logout.LogoutFilter; + +import java.util.Arrays; + +@EnableWebSecurity +@Configuration +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + private AuthenticationProvider authenticationProvider; + private AuthenticationEntryPoint authenticationEntryPoint; + private SingleSignOutFilter singleSignOutFilter; + private LogoutFilter logoutFilter; + + @Autowired + public SecurityConfig(CasAuthenticationProvider casAuthenticationProvider, AuthenticationEntryPoint eP, + LogoutFilter lF + , SingleSignOutFilter ssF + ) { + this.authenticationProvider = casAuthenticationProvider; + this.authenticationEntryPoint = eP; + + this.logoutFilter = lF; + this.singleSignOutFilter = ssF; + + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http + .authorizeRequests() + .regexMatchers("/secured.*", "/login") + .authenticated() + .and() + .authorizeRequests() + .regexMatchers("/") + .permitAll() + .and() + .httpBasic() + .authenticationEntryPoint(authenticationEntryPoint) + .and() + .logout().logoutSuccessUrl("/logout") + .and() + .addFilterBefore(singleSignOutFilter, CasAuthenticationFilter.class) + .addFilterBefore(logoutFilter, LogoutFilter.class); + + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.authenticationProvider(authenticationProvider); + } + + @Override + protected AuthenticationManager authenticationManager() throws Exception { + return new ProviderManager(Arrays.asList(authenticationProvider)); + } + + @Bean + public CasAuthenticationFilter casAuthenticationFilter(ServiceProperties sP) throws Exception { + CasAuthenticationFilter filter = new CasAuthenticationFilter(); + filter.setServiceProperties(sP); + filter.setAuthenticationManager(authenticationManager()); + return filter; + } + +} diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java new file mode 100644 index 0000000000..703e6abf7a --- /dev/null +++ b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java @@ -0,0 +1,35 @@ +package com.baeldung.cassecuredapp.controllers; + +import org.apache.log4j.Logger; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.logout.CookieClearingLogoutHandler; +import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; +import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Controller +public class AuthController { + + private Logger logger = Logger.getLogger(AuthController.class); + + @GetMapping("/logout") + public String logout( + HttpServletRequest request, HttpServletResponse response, SecurityContextLogoutHandler logoutHandler) { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + logoutHandler.logout(request, response, auth ); + new CookieClearingLogoutHandler(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY).logout(request, response, auth); + return "auth/logout"; + } + + + @GetMapping("/login") + public String login() { + return "redirect:/secured"; + } + +} diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java new file mode 100644 index 0000000000..75956cf493 --- /dev/null +++ b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java @@ -0,0 +1,15 @@ +package com.baeldung.cassecuredapp.controllers; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + + +@Controller +public class IndexController { + + @GetMapping("/") + public String index() { + return "index"; + } +} diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java new file mode 100644 index 0000000000..9a872d1f40 --- /dev/null +++ b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java @@ -0,0 +1,24 @@ +package com.baeldung.cassecuredapp.controllers; + +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping(value = "/secured") +public class SecuredPageController { + + @GetMapping + public String index(ModelMap modelMap) { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + if( auth != null && auth.getPrincipal() != null + && auth.getPrincipal() instanceof UserDetails) { + modelMap.put("username", ((UserDetails) auth.getPrincipal()).getUsername()); + } + return "secure/index"; + } +} diff --git a/cas/cas-secured-app/src/main/resources/application.properties b/cas/cas-secured-app/src/main/resources/application.properties new file mode 100644 index 0000000000..99802c632f --- /dev/null +++ b/cas/cas-secured-app/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=9000 \ No newline at end of file diff --git a/cas/cas-secured-app/src/main/resources/templates/auth/logout.ftl b/cas/cas-secured-app/src/main/resources/templates/auth/logout.ftl new file mode 100644 index 0000000000..eac345ec33 --- /dev/null +++ b/cas/cas-secured-app/src/main/resources/templates/auth/logout.ftl @@ -0,0 +1,10 @@ + + + Cas Secured App - Logout + + +

    You have logged out of Cas Secured Spring Boot App Successfully

    +
    +Log out of all other Services + + \ No newline at end of file diff --git a/cas/cas-secured-app/src/main/resources/templates/index.ftl b/cas/cas-secured-app/src/main/resources/templates/index.ftl new file mode 100644 index 0000000000..d407756044 --- /dev/null +++ b/cas/cas-secured-app/src/main/resources/templates/index.ftl @@ -0,0 +1,11 @@ + + + Cas Secured App - Index + + +

    Welcome to Cas Secured Spring Boot App

    +

    This is a Public Page

    +
    +Login + + \ No newline at end of file diff --git a/cas/cas-secured-app/src/main/resources/templates/secure/index.ftl b/cas/cas-secured-app/src/main/resources/templates/secure/index.ftl new file mode 100644 index 0000000000..210ebecc7b --- /dev/null +++ b/cas/cas-secured-app/src/main/resources/templates/secure/index.ftl @@ -0,0 +1,12 @@ + + + Cas Secured App - Secured + + +

    Welcome to Cas Secured Spring Boot App

    +

    This is a Secured Page

    +

    Welcome home ${username!""}

    +
    +Logout + + \ No newline at end of file diff --git a/cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java b/cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java new file mode 100644 index 0000000000..09dbaf0c61 --- /dev/null +++ b/cas/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationTests.java @@ -0,0 +1,16 @@ +package com.baeldung.cassecuredapp; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class CasSecuredAppApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/cas/cas-server/.gitignore b/cas/cas-server/.gitignore new file mode 100644 index 0000000000..5304519922 --- /dev/null +++ b/cas/cas-server/.gitignore @@ -0,0 +1,14 @@ +.classpath +!/.project +.project +.settings +target/ +.idea/ +.DS_Store +.idea +overlays/ +.gradle/ +build/ +bin/ +*.iml +*.log diff --git a/cas/cas-server/LICENSE.txt b/cas/cas-server/LICENSE.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/cas/cas-server/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/cas/cas-server/README.md b/cas/cas-server/README.md new file mode 100644 index 0000000000..bae8b648e5 --- /dev/null +++ b/cas/cas-server/README.md @@ -0,0 +1,88 @@ +CAS Overlay Template +============================ + +Generic CAS WAR overlay to exercise the latest versions of CAS. This overlay could be freely used as a starting template for local CAS war overlays. The CAS services management overlay is available [here](https://github.com/apereo/cas-services-management-overlay). + +# Versions + +```xml +5.1.x +``` + +# Requirements +* JDK 1.8+ + +# Configuration + +The `etc` directory contains the configuration files and directories that need to be copied to `/etc/cas/config`. + +# Build + +To see what commands are available to the build script, run: + +```bash +./build.sh help +``` + +To package the final web application, run: + +```bash +./build.sh package +``` + +To update `SNAPSHOT` versions run: + +```bash +./build.sh package -U +``` + +# Deployment + +- Create a keystore file `thekeystore` under `/etc/cas`. Use the password `changeit` for both the keystore and the key/certificate entries. +- Ensure the keystore is loaded up with keys and certificates of the server. + +On a successful deployment via the following methods, CAS will be available at: + +* `http://cas.server.name:8080/cas` +* `https://cas.server.name:8443/cas` + +## Executable WAR + +Run the CAS web application as an executable WAR. + +```bash +./build.sh run +``` + +## Spring Boot + +Run the CAS web application as an executable WAR via Spring Boot. This is most useful during development and testing. + +```bash +./build.sh bootrun +``` + +### Warning! + +Be careful with this method of deployment. `bootRun` is not designed to work with already executable WAR artifacts such that CAS server web application. YMMV. Today, uses of this mode ONLY work when there is **NO OTHER** dependency added to the build script and the `cas-server-webapp` is the only present module. See [this issue](https://github.com/apereo/cas/issues/2334) and [this issue](https://github.com/spring-projects/spring-boot/issues/8320) for more info. + + +## Spring Boot App Server Selection +There is an app.server property in the pom.xml that can be used to select a spring boot application server. +It defaults to "-tomcat" but "-jetty" and "-undertow" are supported. +It can also be set to an empty value (nothing) if you want to deploy CAS to an external application server of your choice and you don't want the spring boot libraries included. + +```xml +-tomcat +``` + +## Windows Build +If you are building on windows, try build.cmd instead of build.sh. Arguments are similar but for usage, run: + +``` +build.cmd help +``` + +## External + +Deploy resultant `target/cas.war` to a servlet container of choice. diff --git a/cas/cas-server/build.cmd b/cas/cas-server/build.cmd new file mode 100644 index 0000000000..f907dcb388 --- /dev/null +++ b/cas/cas-server/build.cmd @@ -0,0 +1,82 @@ +@echo off + +@set JAVA_ARGS=-Xms500m -Xmx1g +@set CAS_DIR=\etc\cas +@set CONFIG_DIR=\etc\cas\config + +@rem Call this script with DNAME and CERT_SUBJ_ALT_NAMES already set to override +@if "%DNAME%" == "" set DNAME=CN=cas.example.org,OU=Example,OU=Org,C=US +@rem List other host names or ip addresses you want in your certificate, may help with host name verification, +@rem if client apps make https connection for ticket validation and compare name in cert (include sub. alt. names) +@rem to name used to access CAS +@if "%CERT_SUBJ_ALT_NAMES%" == "" set CERT_SUBJ_ALT_NAMES=dns:example.org,dns:localhost,dns:%COMPUTERNAME%,ip:127.0.0.1 + +@rem Check for mvn in path, use it if found, otherwise use maven wrapper +@set MAVEN_CMD=mvn +@where /q mvn +@if %ERRORLEVEL% neq 0 set MAVEN_CMD=.\mvnw.bat + +@if "%1" == "" call:help +@if "%1" == "copy" call:copy +@if "%1" == "clean" call:clean %2 %3 %4 +@if "%1" == "package" call:package %2 %3 %4 +@if "%1" == "bootrun" call:bootrun %2 %3 %4 +@if "%1" == "debug" call:debug %2 %3 %4 +@if "%1" == "run" call:run %2 %3 %4 +@if "%1" == "help" call:help +@if "%1" == "gencert" call:gencert + +@rem function section starts here +@goto:eof + +:copy + @echo "Creating configuration directory under %CONFIG_DIR%" + if not exist %CONFIG_DIR% mkdir %CONFIG_DIR% + + @echo "Copying configuration files from etc/cas to /etc/cas" + xcopy /S /Y etc\cas\* \etc\cas +@goto:eof + +:help + @echo "Usage: build.bat [copy|clean|package|run|debug|bootrun|gencert] [optional extra args for maven]" + @echo "To get started on a clean system, run "build.bat copy" and "build.bat gencert", then "build.bat run" + @echo "Note that using the copy or gencert arguments will create and/or overwrite the %CAS_DIR% which is outside this project" +@goto:eof + +:clean + call %MAVEN_CMD% clean %1 %2 %3 + exit /B %ERRORLEVEL% +@goto:eof + +:package + call %MAVEN_CMD% clean package -T 5 %1 %2 %3 + exit /B %ERRORLEVEL% +@goto:eof + +:bootrun + call %MAVEN_CMD% clean package spring-boot:run -T 5 %1 %2 %3 + exit /B %ERRORLEVEL% +@goto:eof + +:debug + call:package %1 %2 %3 & java %JAVA_ARGS% -Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n -jar target/cas.war +@goto:eof + +:run + call:package %1 %2 %3 & java %JAVA_ARGS% -jar target/cas.war +@goto:eof + +:gencert + where /q keytool + if ERRORLEVEL 1 ( + @echo Java keytool.exe not found in path. + exit /b 1 + ) else ( + if not exist %CAS_DIR% mkdir %CAS_DIR% + @echo on + @echo Generating self-signed SSL cert for %DNAME% in %CAS_DIR%\thekeystore + keytool -genkeypair -alias cas -keyalg RSA -keypass changeit -storepass changeit -keystore %CAS_DIR%\thekeystore -dname %DNAME% -ext SAN=%CERT_SUBJ_ALT_NAMES% + @echo Exporting cert for use in trust store (used by cas clients) + keytool -exportcert -alias cas -storepass changeit -keystore %CAS_DIR%\thekeystore -file %CAS_DIR%\cas.cer + ) +@goto:eof diff --git a/cas/cas-server/build.sh b/cas/cas-server/build.sh new file mode 100644 index 0000000000..e33f7de854 --- /dev/null +++ b/cas/cas-server/build.sh @@ -0,0 +1,97 @@ +#!/bin/bash + + +function copy() { + echo -e "Creating configuration directory under /etc/cas" + mkdir -p /etc/cas/config + + echo -e "Copying configuration files from etc/cas to /etc/cas" + cp -rfv etc/cas/* /etc/cas +} + +function help() { + echo "Usage: build.sh [copy|clean|package|run|debug|bootrun|gencert]" + echo " copy: Copy config from ./etc/cas/config to /etc/cas/config" + echo " clean: Clean Maven build directory" + echo " package: Clean and build CAS war, also call copy" + echo " run: Build and run CAS.war via spring boot (java -jar target/cas.war)" + echo " debug: Run CAS.war and listen for Java debugger on port 5000" + echo " bootrun: Run with maven spring boot plugin, doesn't work with multiple dependencies" + echo " gencert: Create keystore with SSL certificate in location where CAS looks by default" +} + +function clean() { + ./mvnw clean "$@" +} + +function package() { + ./mvnw clean package -T 5 "$@" + copy +} + +function bootrun() { + ./mvnw clean package spring-boot:run -T 5 "$@" +} + +function debug() { + package && java -Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n -jar target/cas.war +} + +function run() { + package && java -jar target/cas.war +} + +function gencert() { + if [[ ! -d /etc/cas ]] ; then + copy + fi + which keytool + if [[ $? -ne 0 ]] ; then + echo Error: Java JDK \'keytool\' is not installed or is not in the path + exit 1 + fi + # override DNAME and CERT_SUBJ_ALT_NAMES before calling or use dummy values + DNAME="${DNAME:-CN=cas.example.org,OU=Example,OU=Org,C=US}" + CERT_SUBJ_ALT_NAMES="${CERT_SUBJ_ALT_NAMES:-dns:example.org,dns:localhost,ip:127.0.0.1}" + echo "Generating keystore for CAS with DN ${DNAME}" + keytool -genkeypair -alias cas -keyalg RSA -keypass changeit -storepass changeit -keystore /etc/cas/thekeystore -dname ${DNAME} -ext SAN=${CERT_SUBJ_ALT_NAMES} + keytool -exportcert -alias cas -storepass changeit -keystore /etc/cas/thekeystore -file /etc/cas/cas.cer +} + +if [ $# -eq 0 ]; then + echo -e "No commands provided. Defaulting to [run]\n" + run + exit 0 +fi + + +case "$1" in +"copy") + copy + ;; +"clean") + shift + clean "$@" + ;; +"package") + shift + package "$@" + ;; +"bootrun") + shift + bootrun "$@" + ;; +"debug") + debug "$@" + ;; +"run") + run "$@" + ;; +"gencert") + gencert "$@" + ;; +*) + help + ;; +esac + diff --git a/cas/cas-server/etc/cas/config/application.yml b/cas/cas-server/etc/cas/config/application.yml new file mode 100644 index 0000000000..be1f7c3edd --- /dev/null +++ b/cas/cas-server/etc/cas/config/application.yml @@ -0,0 +1,2 @@ +info: + description: CAS Configuration \ No newline at end of file diff --git a/cas/cas-server/etc/cas/config/cas.properties b/cas/cas-server/etc/cas/config/cas.properties new file mode 100644 index 0000000000..47a1477308 --- /dev/null +++ b/cas/cas-server/etc/cas/config/cas.properties @@ -0,0 +1,7 @@ +cas.server.name: https://cas.example.org:8443 +cas.server.prefix: https://cas.example.org:8443/cas + +cas.adminPagesSecurity.ip=127\.0\.0\.1 + +logging.config: file:/etc/cas/config/log4j2.xml +# cas.serviceRegistry.config.location: classpath:/services diff --git a/cas/cas-server/etc/cas/config/log4j2.xml b/cas/cas-server/etc/cas/config/log4j2.xml new file mode 100644 index 0000000000..53b30b4228 --- /dev/null +++ b/cas/cas-server/etc/cas/config/log4j2.xml @@ -0,0 +1,117 @@ + + + + + + . + + warn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cas/cas-server/etc/cas/thekeystore b/cas/cas-server/etc/cas/thekeystore new file mode 100644 index 0000000000000000000000000000000000000000..15f9af2dae6366804459009361140e8526f811b9 GIT binary patch literal 2225 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 Lt(?_lzc& literal 0 HcmV?d00001 diff --git a/cas/cas-server/maven/maven-wrapper.properties b/cas/cas-server/maven/maven-wrapper.properties new file mode 100644 index 0000000000..b368e4609a --- /dev/null +++ b/cas/cas-server/maven/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https\://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/cas/cas-server/mvnw b/cas/cas-server/mvnw new file mode 100644 index 0000000000..2275ac7647 --- /dev/null +++ b/cas/cas-server/mvnw @@ -0,0 +1,234 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + wdir=$(cd "$wdir/.."; pwd) + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER="org.apache.maven.wrapper.MavenWrapperMain" + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + -classpath \ +"$MAVEN_PROJECTBASEDIR/maven/maven-wrapper.jar" \ + ${WRAPPER_LAUNCHER} "$@" diff --git a/cas/cas-server/mvnw.bat b/cas/cas-server/mvnw.bat new file mode 100644 index 0000000000..d391151aa7 --- /dev/null +++ b/cas/cas-server/mvnw.bat @@ -0,0 +1,174 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:chkMHome +if not "%M2_HOME%"=="" goto valMHome + +SET "M2_HOME=%~dp0.." +if not "%M2_HOME%"=="" goto valMHome + +echo. +echo Error: M2_HOME not found in your environment. >&2 +echo Please set the M2_HOME variable in your environment to match the >&2 +echo location of the Maven installation. >&2 +echo. +goto error + +:valMHome + +:stripMHome +if not "_%M2_HOME:~-1%"=="_\" goto checkMCmd +set "M2_HOME=%M2_HOME:~0,-1%" +goto stripMHome + +:checkMCmd +if exist "%M2_HOME%\bin\mvn.cmd" goto init + +echo. +echo Error: M2_HOME is set to an invalid directory. >&2 +echo M2_HOME = "%M2_HOME%" >&2 +echo Please set the M2_HOME variable in your environment to match the >&2 +echo location of the Maven installation >&2 +echo. +goto error +@REM ==== END VALIDATION ==== + +:init + +set MAVEN_CMD_LINE_ARGS=%* + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\maven\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% + +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/cas/cas-server/pom.xml b/cas/cas-server/pom.xml new file mode 100644 index 0000000000..e8625b48f7 --- /dev/null +++ b/cas/cas-server/pom.xml @@ -0,0 +1,158 @@ + + + 4.0.0 + com.baeldung + cas-server + war + 1.0 + + + + + com.rimerosolutions.maven.plugins + wrapper-maven-plugin + 0.0.4 + + true + MD5 + + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + org.springframework.boot.loader.WarLauncher + true + + + + org.apache.maven.plugins + maven-war-plugin + 2.6 + + cas + false + false + + false + ${project.build.directory}/war/work/org.apereo.cas/cas-server-webapp${app.server}/META-INF/MANIFEST.MF + + + + + org.apereo.cas + cas-server-webapp${app.server} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.3 + + + cas + + + + + org.apereo.cas + cas-server-webapp${app.server} + ${cas.version} + war + runtime + + + org.apereo.cas + cas-server-support-json-service-registry + ${cas.version} + + + org.apereo.cas + cas-server-support-jdbc + ${cas.version} + + + org.apereo.cas + cas-server-support-jdbc-drivers + ${cas.version} + + + + + 5.1.4 + 1.5.3.RELEASE + + -tomcat + 1.8 + 1.8 + UTF-8 + + + + + sonatype-releases + http://oss.sonatype.org/content/repositories/releases/ + + false + + + true + + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + true + + + false + + + + shibboleth-releases + https://build.shibboleth.net/nexus/content/repositories/releases + + + spring-milestones + https://repo.spring.io/milestone + + + + + + + false + + pgp + + + + com.github.s4u.plugins + pgpverify-maven-plugin + 1.1.0 + + + + check + + + + + hkp://pool.sks-keyservers.net + ${settings.localRepository}/pgpkeys-cache + test + true + false + + + + + + + diff --git a/cas/cas-server/src/main/resources/application.properties b/cas/cas-server/src/main/resources/application.properties new file mode 100644 index 0000000000..2d5e9a7277 --- /dev/null +++ b/cas/cas-server/src/main/resources/application.properties @@ -0,0 +1,126 @@ +## +# CAS Server Context Configuration +# +server.context-path=/cas +server.port=8443 + +server.ssl.key-store=file:/etc/cas/thekeystore +server.ssl.key-store-password=changeit +server.ssl.key-password=changeit +# server.ssl.ciphers= +# server.ssl.client-auth= +# server.ssl.enabled= +# server.ssl.key-alias= +# server.ssl.key-store-provider= +# server.ssl.key-store-type= +# server.ssl.protocol= +# server.ssl.trust-store= +# server.ssl.trust-store-password= +# server.ssl.trust-store-provider= +# server.ssl.trust-store-type= + +server.max-http-header-size=2097152 +server.use-forward-headers=true +server.connection-timeout=20000 +server.error.include-stacktrace=NEVER + +server.tomcat.max-http-post-size=2097152 +server.tomcat.basedir=build/tomcat +server.tomcat.accesslog.enabled=true +server.tomcat.accesslog.pattern=%t %a "%r" %s (%D ms) +server.tomcat.accesslog.suffix=.log +server.tomcat.max-threads=10 +server.tomcat.port-header=X-Forwarded-Port +server.tomcat.protocol-header=X-Forwarded-Proto +server.tomcat.protocol-header-https-value=https +server.tomcat.remote-ip-header=X-FORWARDED-FOR +server.tomcat.uri-encoding=UTF-8 + +spring.http.encoding.charset=UTF-8 +spring.http.encoding.enabled=true +spring.http.encoding.force=true + +## +# CAS Cloud Bus Configuration +# +spring.cloud.bus.enabled=false +# spring.cloud.bus.refresh.enabled=true +# spring.cloud.bus.env.enabled=true +# spring.cloud.bus.destination=CasCloudBus +# spring.cloud.bus.ack.enabled=true + +endpoints.enabled=false +endpoints.sensitive=true + +endpoints.restart.enabled=false +endpoints.shutdown.enabled=false + +management.security.enabled=true +management.security.roles=ACTUATOR,ADMIN +management.security.sessions=if_required +management.context-path=/status +management.add-application-context-header=false + +security.basic.authorize-mode=role +security.basic.enabled=false +security.basic.path=/cas/status/** + +## +# CAS Web Application Session Configuration +# +server.session.timeout=300 +server.session.cookie.http-only=true +server.session.tracking-modes=COOKIE + +## +# CAS Thymeleaf View Configuration +# +spring.thymeleaf.encoding=UTF-8 +spring.thymeleaf.cache=true +spring.thymeleaf.mode=HTML +## +# CAS Log4j Configuration +# +# logging.config=file:/etc/cas/log4j2.xml +server.context-parameters.isLog4jAutoInitializationDisabled=true + +## +# CAS AspectJ Configuration +# +spring.aop.auto=true +spring.aop.proxy-target-class=true + +## +# CAS Authentication Credentials +# +#cas.authn.accept.users=casuser::Mellon +cas.authn.accept.users= +cas.authn.accept.name= + +#CAS Database Authentication Property +cas.authn.jdbc.query[0].sql=SELECT * FROM users WHERE email = ? +cas.authn.jdbc.query[0].url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC +cas.authn.jdbc.query[0].dialect=org.hibernate.dialect.MySQLDialect +cas.authn.jdbc.query[0].user=root +cas.authn.jdbc.query[0].password= +cas.authn.jdbc.query[0].ddlAuto=none +cas.authn.jdbc.query[0].driverClass=com.mysql.jdbc.Driver +cas.authn.jdbc.query[0].fieldPassword=password +cas.authn.jdbc.query[0].passwordEncoder.type=BCRYPT + + +## +# CAS Delegated Authentication +# +cas.authn.pac4j.bitbucket.clientName=Bitbucket +cas.authn.pac4j.dropbox.clientName=Dropbox +cas.authn.pac4j.facebook.clientName=Facebook +cas.authn.pac4j.foursquare.clientName=Foursquare +cas.authn.pac4j.github.clientName=Github +cas.authn.pac4j.google.clientName=Google +cas.authn.pac4j.linkedIn.clientName=LinkedIn +cas.authn.pac4j.paypal.clientName=PayPal +cas.authn.pac4j.twitter.clientName=Twitter +cas.authn.pac4j.yahoo.clientName=Yahoo +cas.authn.pac4j.windowsLive.clientName=Windows Live +cas.authn.pac4j.wordpress.clientName=WordPress diff --git a/cas/cas-server/src/main/resources/cas.properties b/cas/cas-server/src/main/resources/cas.properties new file mode 100644 index 0000000000..be2babcd14 --- /dev/null +++ b/cas/cas-server/src/main/resources/cas.properties @@ -0,0 +1,41 @@ +cas.server.name: https://localhost:8443 +cas.server.prefix: https://localhost:8443/cas + +cas.adminPagesSecurity.ip=127\.0\.0\.1 + +logging.config: file:/etc/cas/config/log4j2.xml + +cas.serviceRegistry.initFromJson=true +cas.serviceRegistry.config.location=classpath:/services + +cas.authn.accept.users= +cas.authn.accept.name= + +#CAS Database Authentication Property + +# cas.authn.jdbc.query[0].healthQuery= +# cas.authn.jdbc.query[0].isolateInternalQueries=false +# cas.authn.jdbc.query[0].failFast=true +# cas.authn.jdbc.query[0].isolationLevelName=ISOLATION_READ_COMMITTED +# cas.authn.jdbc.query[0].leakThreshold=10 +# cas.authn.jdbc.query[0].propagationBehaviorName=PROPAGATION_REQUIRED +# cas.authn.jdbc.query[0].batchSize=1 +# cas.authn.jdbc.query[0].maxAgeDays=180 +# cas.authn.jdbc.query[0].autocommit=false +# cas.authn.jdbc.query[0].idleTimeout=5000 +# cas.authn.jdbc.query[0].credentialCriteria= +# cas.authn.jdbc.query[0].name= +# cas.authn.jdbc.query[0].order=0 +# cas.authn.jdbc.query[0].dataSourceName= +# cas.authn.jdbc.query[0].dataSourceProxy=false +# cas.authn.jdbc.query[0].fieldExpired= +# cas.authn.jdbc.query[0].fieldDisabled= +# cas.authn.jdbc.query[0].principalAttributeList=sn,cn:commonName,givenName +# cas.authn.jdbc.query[0].passwordEncoder.type=NONE|DEFAULT|STANDARD|BCRYPT|SCRYPT|PBKDF2|com.example.CustomPasswordEncoder +# cas.authn.jdbc.query[0].passwordEncoder.characterEncoding= +# cas.authn.jdbc.query[0].passwordEncoder.encodingAlgorithm= +# cas.authn.jdbc.query[0].passwordEncoder.secret= +# cas.authn.jdbc.query[0].passwordEncoder.strength=16 +# cas.authn.jdbc.query[0].principalTransformation.suffix= +# cas.authn.jdbc.query[0].principalTransformation.caseConversion=NONE|UPPERCASE|LOWERCASE +# cas.authn.jdbc.query[0].principalTransformation.prefix= \ No newline at end of file diff --git a/cas/cas-server/src/main/resources/services/casSecuredApp.json b/cas/cas-server/src/main/resources/services/casSecuredApp.json new file mode 100644 index 0000000000..336007e484 --- /dev/null +++ b/cas/cas-server/src/main/resources/services/casSecuredApp.json @@ -0,0 +1,8 @@ +{ + "@class" : "org.apereo.cas.services.RegexRegisteredService", + "serviceId" : "^http://localhost:9000/login/cas", + "name" : "CAS Spring Secured App", + "description": "This is a Spring App that usses the CAS Server for it's authentication", + "id" : 19991, + "evaluationOrder" : 1 +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 033fca3d03..1f7a7996bf 100644 --- a/pom.xml +++ b/pom.xml @@ -49,8 +49,8 @@ core-java-8 core-java-concurrency couchbase - cas-server - cas-secured-app + cas/cas-server + cas/cas-secured-app deltaspike dozer From a193fbb53ff9583774d0a96d8963bfeeb511ecdf Mon Sep 17 00:00:00 2001 From: Mohamed Sanaulla Date: Mon, 30 Oct 2017 19:52:49 +0300 Subject: [PATCH 162/197] Updated tests for BAEL-1262 (#2917) * updating test code for BAEL-1262 * some small change --- .../runnable/RunnableVsThreadTest.java | 56 ++++++++++++++----- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java index d0f4460f51..4bd4848905 100644 --- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java +++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/runnable/RunnableVsThreadTest.java @@ -8,7 +8,9 @@ import java.util.concurrent.Future; import org.apache.commons.lang3.RandomUtils; import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,22 +20,34 @@ public class RunnableVsThreadTest { private static Logger log = LoggerFactory.getLogger(RunnableVsThreadTest.class); + private static ExecutorService executorService; + + @BeforeClass + public static void setup() { + executorService = Executors.newCachedThreadPool(); + } + @Test public void givenARunnable_whenRunIt_thenResult() throws Exception{ Thread thread = new Thread(new SimpleRunnable( "SimpleRunnable executed using Thread")); thread.start(); thread.join(); - - ExecutorService executorService = - Executors.newCachedThreadPool(); + } + + @Test + public void givenARunnable_whenSubmitToES_thenResult() throws Exception{ executorService.submit(new SimpleRunnable( "SimpleRunnable executed using ExecutorService")).get(); + } + + @Test + public void givenARunnableLambda_whenSubmitToES_thenResult() + throws Exception{ executorService.submit(()-> log.info("Lambda runnable executed!!!")).get(); - executorService.shutdown(); } @Test @@ -42,26 +56,39 @@ public class RunnableVsThreadTest { "SimpleThread executed using Thread"); thread.start(); thread.join(); + } + + @Test + public void givenAThread_whenSubmitToES_thenResult() throws Exception{ - ExecutorService executorService = - Executors.newCachedThreadPool(); executorService.submit(new SimpleThread( "SimpleThread executed using ExecutorService")).get(); } @Test - public void givenACallable_whenRunIt_thenResult() throws Exception { - ExecutorService executorService = - Executors.newCachedThreadPool(); + public void givenACallable_whenSubmitToES_thenResult() throws Exception { - Future future = executorService.submit(new SimpleCallable()); + Future future = executorService.submit( + new SimpleCallable()); log.info("Result from callable: {}", future.get()); + } + + @Test + public void givenACallableAsLambda_whenSubmitToES_thenResult() + throws Exception { - future = executorService.submit(() -> { + Future future = executorService.submit(() -> { return RandomUtils.nextInt(0, 100); - }); + }); + log.info("Result from callable: {}", future.get()); - + } + + @AfterClass + public static void tearDown() { + if ( executorService != null && !executorService.isShutdown()) { + executorService.shutdown(); + } } } @@ -107,4 +134,5 @@ class SimpleCallable implements Callable { return RandomUtils.nextInt(0, 100); } -} \ No newline at end of file +} + From e22b3824271d8687a0544f12f759c8f0c633e715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mitja=20Jeseni=C4=8Dnik=20Kotnik?= Date: Mon, 30 Oct 2017 22:55:20 +0100 Subject: [PATCH 163/197] wildfly h2 database (#2889) --- .../src/main/resources/META-INF/persistence.xml | 8 +++++++- ejb/wildfly/wildfly-jpa/src/main/resources/data.sql | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ejb/wildfly/wildfly-jpa/src/main/resources/data.sql diff --git a/ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml b/ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml index 1a3fc32381..2aa6bc2cd7 100644 --- a/ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml +++ b/ejb/wildfly/wildfly-jpa/src/main/resources/META-INF/persistence.xml @@ -3,7 +3,13 @@ xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd"> - java:/PostgresDS + java:/H2DS model.User + + + + + + diff --git a/ejb/wildfly/wildfly-jpa/src/main/resources/data.sql b/ejb/wildfly/wildfly-jpa/src/main/resources/data.sql new file mode 100644 index 0000000000..03eafa534e --- /dev/null +++ b/ejb/wildfly/wildfly-jpa/src/main/resources/data.sql @@ -0,0 +1 @@ +INSERT INTO users (username, email, postal_number) VALUES ('user1', 'user1@baeldung.com', 1000), ('user2', 'user2@baeldung.com', 2); \ No newline at end of file From 00faa99afc3e8dff5cb437643dbdb10268a31be9 Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Mon, 30 Oct 2017 19:15:07 -0300 Subject: [PATCH 164/197] Initial Commit (#2896) --- .../application/Application.java | 18 +++ .../templatemethodpattern/model/Computer.java | 34 +++++ .../model/HighEndComputer.java | 34 +++++ .../model/StandardComputer.java | 34 +++++ .../TemplateMethodPatternTest.java | 120 ++++++++++++++++++ 5 files changed, 240 insertions(+) create mode 100644 core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/application/Application.java create mode 100644 core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java create mode 100644 core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java create mode 100644 core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java create mode 100644 core-java/templatemethodpattern/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java diff --git a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/application/Application.java b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/application/Application.java new file mode 100644 index 0000000000..581c774f52 --- /dev/null +++ b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/application/Application.java @@ -0,0 +1,18 @@ +package com.baeldung.templatemethodpattern.application; + +import com.baeldung.templatemethodpattern.model.Computer; +import com.baeldung.templatemethodpattern.model.HighEndComputer; +import com.baeldung.templatemethodpattern.model.StandardComputer; + +public class Application { + + public static void main(String[] args) { + Computer standardComputer = new StandardComputer(); + standardComputer.buildComputer(); + standardComputer.getComputerParts().forEach((k, v) -> System.out.println("Part : " + k + " Value : " + v)); + + Computer highEndComputer = new HighEndComputer(); + highEndComputer.buildComputer(); + highEndComputer.getComputerParts().forEach((k, v) -> System.out.println("Part : " + k + " Value : " + v)); + } +} diff --git a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java new file mode 100644 index 0000000000..e2561089bd --- /dev/null +++ b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java @@ -0,0 +1,34 @@ +package com.baeldung.templatemethodpattern.model; + +import java.util.HashMap; +import java.util.Map; + +public abstract class Computer { + + protected Map computerParts = new HashMap<>(); + + public final void buildComputer() { + addProcessor(); + addMotherboard(); + addMemory(); + addHardDrive(); + addGraphicCard(); + addSoundCard(); + } + + public abstract void addProcessor(); + + public abstract void addMotherboard(); + + public abstract void addMemory(); + + public abstract void addHardDrive(); + + public abstract void addGraphicCard(); + + public abstract void addSoundCard(); + + public Map getComputerParts() { + return computerParts; + } +} diff --git a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java new file mode 100644 index 0000000000..11baeca6f7 --- /dev/null +++ b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java @@ -0,0 +1,34 @@ +package com.baeldung.templatemethodpattern.model; + +public class HighEndComputer extends Computer { + + @Override + public void addProcessor() { + computerParts.put("Processor", "High End Processor"); + } + + @Override + public void addMotherboard() { + computerParts.put("Motherboard", "High End Motherboard"); + } + + @Override + public void addMemory() { + computerParts.put("Memory", "16GB"); + } + + @Override + public void addHardDrive() { + computerParts.put("Hard Drive", "2TB Hard Drive"); + } + + @Override + public void addGraphicCard() { + computerParts.put("Graphic Card", "High End Graphic Card"); + } + + @Override + public void addSoundCard() { + computerParts.put("Sound Card", "High End Sound Card"); + } +} diff --git a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java new file mode 100644 index 0000000000..22ff370203 --- /dev/null +++ b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java @@ -0,0 +1,34 @@ +package com.baeldung.templatemethodpattern.model; + +public class StandardComputer extends Computer { + + @Override + public void addProcessor() { + computerParts.put("Processor", "Standard Processor"); + } + + @Override + public void addMotherboard() { + computerParts.put("Motherboard", "Standard Motherboard"); + } + + @Override + public void addMemory() { + computerParts.put("Memory", "8GB"); + } + + @Override + public void addHardDrive() { + computerParts.put("Hard Drive", "1TB Hard Drive"); + } + + @Override + public void addGraphicCard() { + computerParts.put("Graphic Card", "Standard Graphic Card"); + } + + @Override + public void addSoundCard() { + computerParts.put("Sound Card", "Standard Sound Card"); + } +} diff --git a/core-java/templatemethodpattern/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/core-java/templatemethodpattern/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java new file mode 100644 index 0000000000..afe66883ac --- /dev/null +++ b/core-java/templatemethodpattern/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java @@ -0,0 +1,120 @@ +package com.baeldung.templatemethodpatterntest; + +import com.baeldung.templatemethodpattern.model.HighEndComputer; +import com.baeldung.templatemethodpattern.model.StandardComputer; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +public class TemplateMethodPatternTest { + + private static StandardComputer standardComputer; + private static HighEndComputer highEndComputer; + + @BeforeClass + public static void setUpStandardComputerInstance() { + standardComputer = new StandardComputer(); + } + + @BeforeClass + public static void setUpHighEndComputerInstance() { + highEndComputer = new HighEndComputer(); + } + + @Test + public void givenStandardProcessor_whenAddingProcessor_thenEqualAssertion() { + standardComputer.addProcessor(); + Assert.assertEquals("Standard Processor", standardComputer + .getComputerParts().get("Processor")); + } + + @Test + public void givenStandardMotherBoard_whenAddingMotherBoard_thenEqualAssertion() { + standardComputer.addMotherboard(); + Assert.assertEquals("Standard Motherboard", standardComputer + .getComputerParts().get("Motherboard")); + } + + @Test + public void givenStandardMemory_whenAddingMemory_thenEqualAssertion() { + standardComputer.addMemory(); + Assert.assertEquals("8GB", standardComputer + .getComputerParts().get("Memory")); + } + + @Test + public void givenStandardHardDrive_whenAddingHardDrive_thenEqualAssertion() { + standardComputer.addHardDrive(); + Assert.assertEquals("1TB Hard Drive", standardComputer + .getComputerParts().get("Hard Drive")); + } + + @Test + public void givenStandardGraphicaCard_whenAddingGraphicCard_thenEqualAssertion() { + standardComputer.addGraphicCard(); + Assert.assertEquals("Standard Graphic Card", standardComputer + .getComputerParts().get("Graphic Card")); + } + + @Test + public void givenStandardSoundCard_whenAddingSoundCard_thenEqualAssertion() { + standardComputer.addSoundCard(); + Assert.assertEquals("Standard Sound Card", standardComputer + .getComputerParts().get("Sound Card")); + } + + @Test + public void givenAllStandardParts_whenBuildingComputer_thenSixParts() { + standardComputer.buildComputer(); + Assert.assertEquals(6, standardComputer + .getComputerParts().size()); + } + + @Test + public void givenHightEndProcessor_whenAddingProcessor_thenEqualAssertion() { + highEndComputer.addProcessor(); + Assert.assertEquals("High End Processor", highEndComputer + .getComputerParts().get("Processor")); + } + + @Test + public void givenHighEnddMotherBoard_whenAddingMotherBoard_thenEqualAssertion() { + highEndComputer.addMotherboard(); + Assert.assertEquals("High End Motherboard", highEndComputer + .getComputerParts().get("Motherboard")); + } + + @Test + public void givenHighEndMemory_whenAddingMemory_thenEqualAssertion() { + highEndComputer.addMemory(); + Assert.assertEquals("16GB", highEndComputer + .getComputerParts().get("Memory")); + } + + @Test + public void givenHighEndHardDrive_whenAddingHardDrive_thenEqualAssertion() { + highEndComputer.addHardDrive(); + Assert.assertEquals("2TB Hard Drive", highEndComputer + .getComputerParts().get("Hard Drive")); + } + + @Test + public void givenHighEndGraphicCard_whenAddingGraphicCard_thenEqualAssertion() { + highEndComputer.addGraphicCard(); + Assert.assertEquals("High End Graphic Card", highEndComputer + .getComputerParts().get("Graphic Card")); + } + + @Test + public void givenHighEndSoundCard_whenAddingSoundCard_thenEqualAssertion() { + highEndComputer.addSoundCard(); + Assert.assertEquals("High End Sound Card", highEndComputer + .getComputerParts().get("Sound Card")); + } + + @Test + public void givenAllHighEndParts_whenBuildingComputer_thenSixParts() { + highEndComputer.buildComputer(); + Assert.assertEquals(6, highEndComputer.getComputerParts().size()); + } +} From a6485c4326c07348e5a05f2789d66087ee62e6f6 Mon Sep 17 00:00:00 2001 From: adamd1985 Date: Tue, 31 Oct 2017 08:36:31 +0100 Subject: [PATCH 165/197] Revert "Initial Commit (#2896)" (#2920) This reverts commit 00faa99afc3e8dff5cb437643dbdb10268a31be9. --- .../application/Application.java | 18 --- .../templatemethodpattern/model/Computer.java | 34 ----- .../model/HighEndComputer.java | 34 ----- .../model/StandardComputer.java | 34 ----- .../TemplateMethodPatternTest.java | 120 ------------------ 5 files changed, 240 deletions(-) delete mode 100644 core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/application/Application.java delete mode 100644 core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java delete mode 100644 core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java delete mode 100644 core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java delete mode 100644 core-java/templatemethodpattern/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java diff --git a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/application/Application.java b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/application/Application.java deleted file mode 100644 index 581c774f52..0000000000 --- a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/application/Application.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baeldung.templatemethodpattern.application; - -import com.baeldung.templatemethodpattern.model.Computer; -import com.baeldung.templatemethodpattern.model.HighEndComputer; -import com.baeldung.templatemethodpattern.model.StandardComputer; - -public class Application { - - public static void main(String[] args) { - Computer standardComputer = new StandardComputer(); - standardComputer.buildComputer(); - standardComputer.getComputerParts().forEach((k, v) -> System.out.println("Part : " + k + " Value : " + v)); - - Computer highEndComputer = new HighEndComputer(); - highEndComputer.buildComputer(); - highEndComputer.getComputerParts().forEach((k, v) -> System.out.println("Part : " + k + " Value : " + v)); - } -} diff --git a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java deleted file mode 100644 index e2561089bd..0000000000 --- a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baeldung.templatemethodpattern.model; - -import java.util.HashMap; -import java.util.Map; - -public abstract class Computer { - - protected Map computerParts = new HashMap<>(); - - public final void buildComputer() { - addProcessor(); - addMotherboard(); - addMemory(); - addHardDrive(); - addGraphicCard(); - addSoundCard(); - } - - public abstract void addProcessor(); - - public abstract void addMotherboard(); - - public abstract void addMemory(); - - public abstract void addHardDrive(); - - public abstract void addGraphicCard(); - - public abstract void addSoundCard(); - - public Map getComputerParts() { - return computerParts; - } -} diff --git a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java deleted file mode 100644 index 11baeca6f7..0000000000 --- a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baeldung.templatemethodpattern.model; - -public class HighEndComputer extends Computer { - - @Override - public void addProcessor() { - computerParts.put("Processor", "High End Processor"); - } - - @Override - public void addMotherboard() { - computerParts.put("Motherboard", "High End Motherboard"); - } - - @Override - public void addMemory() { - computerParts.put("Memory", "16GB"); - } - - @Override - public void addHardDrive() { - computerParts.put("Hard Drive", "2TB Hard Drive"); - } - - @Override - public void addGraphicCard() { - computerParts.put("Graphic Card", "High End Graphic Card"); - } - - @Override - public void addSoundCard() { - computerParts.put("Sound Card", "High End Sound Card"); - } -} diff --git a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java b/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java deleted file mode 100644 index 22ff370203..0000000000 --- a/core-java/templatemethodpattern/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.baeldung.templatemethodpattern.model; - -public class StandardComputer extends Computer { - - @Override - public void addProcessor() { - computerParts.put("Processor", "Standard Processor"); - } - - @Override - public void addMotherboard() { - computerParts.put("Motherboard", "Standard Motherboard"); - } - - @Override - public void addMemory() { - computerParts.put("Memory", "8GB"); - } - - @Override - public void addHardDrive() { - computerParts.put("Hard Drive", "1TB Hard Drive"); - } - - @Override - public void addGraphicCard() { - computerParts.put("Graphic Card", "Standard Graphic Card"); - } - - @Override - public void addSoundCard() { - computerParts.put("Sound Card", "Standard Sound Card"); - } -} diff --git a/core-java/templatemethodpattern/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/core-java/templatemethodpattern/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java deleted file mode 100644 index afe66883ac..0000000000 --- a/core-java/templatemethodpattern/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.baeldung.templatemethodpatterntest; - -import com.baeldung.templatemethodpattern.model.HighEndComputer; -import com.baeldung.templatemethodpattern.model.StandardComputer; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class TemplateMethodPatternTest { - - private static StandardComputer standardComputer; - private static HighEndComputer highEndComputer; - - @BeforeClass - public static void setUpStandardComputerInstance() { - standardComputer = new StandardComputer(); - } - - @BeforeClass - public static void setUpHighEndComputerInstance() { - highEndComputer = new HighEndComputer(); - } - - @Test - public void givenStandardProcessor_whenAddingProcessor_thenEqualAssertion() { - standardComputer.addProcessor(); - Assert.assertEquals("Standard Processor", standardComputer - .getComputerParts().get("Processor")); - } - - @Test - public void givenStandardMotherBoard_whenAddingMotherBoard_thenEqualAssertion() { - standardComputer.addMotherboard(); - Assert.assertEquals("Standard Motherboard", standardComputer - .getComputerParts().get("Motherboard")); - } - - @Test - public void givenStandardMemory_whenAddingMemory_thenEqualAssertion() { - standardComputer.addMemory(); - Assert.assertEquals("8GB", standardComputer - .getComputerParts().get("Memory")); - } - - @Test - public void givenStandardHardDrive_whenAddingHardDrive_thenEqualAssertion() { - standardComputer.addHardDrive(); - Assert.assertEquals("1TB Hard Drive", standardComputer - .getComputerParts().get("Hard Drive")); - } - - @Test - public void givenStandardGraphicaCard_whenAddingGraphicCard_thenEqualAssertion() { - standardComputer.addGraphicCard(); - Assert.assertEquals("Standard Graphic Card", standardComputer - .getComputerParts().get("Graphic Card")); - } - - @Test - public void givenStandardSoundCard_whenAddingSoundCard_thenEqualAssertion() { - standardComputer.addSoundCard(); - Assert.assertEquals("Standard Sound Card", standardComputer - .getComputerParts().get("Sound Card")); - } - - @Test - public void givenAllStandardParts_whenBuildingComputer_thenSixParts() { - standardComputer.buildComputer(); - Assert.assertEquals(6, standardComputer - .getComputerParts().size()); - } - - @Test - public void givenHightEndProcessor_whenAddingProcessor_thenEqualAssertion() { - highEndComputer.addProcessor(); - Assert.assertEquals("High End Processor", highEndComputer - .getComputerParts().get("Processor")); - } - - @Test - public void givenHighEnddMotherBoard_whenAddingMotherBoard_thenEqualAssertion() { - highEndComputer.addMotherboard(); - Assert.assertEquals("High End Motherboard", highEndComputer - .getComputerParts().get("Motherboard")); - } - - @Test - public void givenHighEndMemory_whenAddingMemory_thenEqualAssertion() { - highEndComputer.addMemory(); - Assert.assertEquals("16GB", highEndComputer - .getComputerParts().get("Memory")); - } - - @Test - public void givenHighEndHardDrive_whenAddingHardDrive_thenEqualAssertion() { - highEndComputer.addHardDrive(); - Assert.assertEquals("2TB Hard Drive", highEndComputer - .getComputerParts().get("Hard Drive")); - } - - @Test - public void givenHighEndGraphicCard_whenAddingGraphicCard_thenEqualAssertion() { - highEndComputer.addGraphicCard(); - Assert.assertEquals("High End Graphic Card", highEndComputer - .getComputerParts().get("Graphic Card")); - } - - @Test - public void givenHighEndSoundCard_whenAddingSoundCard_thenEqualAssertion() { - highEndComputer.addSoundCard(); - Assert.assertEquals("High End Sound Card", highEndComputer - .getComputerParts().get("Sound Card")); - } - - @Test - public void givenAllHighEndParts_whenBuildingComputer_thenSixParts() { - highEndComputer.buildComputer(); - Assert.assertEquals(6, highEndComputer.getComputerParts().size()); - } -} From fdf2afaa1f0dc48dab4b55144d92aa70c56541a7 Mon Sep 17 00:00:00 2001 From: sybraimah Date: Tue, 31 Oct 2017 13:05:17 +0000 Subject: [PATCH 166/197] BAEL-1098: Testing a REST API with Karate (#2855) * BAEL-318: updated activation page * BAEL-1098: Testing a REST API with Karate * BAEL-1098: updated classpath on CucumberOptions * BAEL-1098: updated KarateTest to KarateUnitTest * BAEL-1098: reverting changes to activation.jsp on spring-webflow * BAEL-1098: reverting changes to activation.jsp on spring-webflow * BAEL-1098: updated karate version --- rest-testing/pom.xml | 14 ++++++ .../{Feature => karate}/cucumber.feature | 0 .../baeldung/rest/karate/KarateUnitTest.java | 44 +++++++++++++++++++ .../src/test/resources/karate/user.feature | 42 ++++++++++++++++++ 4 files changed, 100 insertions(+) rename rest-testing/src/main/resources/{Feature => karate}/cucumber.feature (100%) create mode 100644 rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java create mode 100644 rest-testing/src/test/resources/karate/user.feature diff --git a/rest-testing/pom.xml b/rest-testing/pom.xml index b99dfac571..74ea5760c4 100644 --- a/rest-testing/pom.xml +++ b/rest-testing/pom.xml @@ -88,6 +88,19 @@ ${jbehave.version} test     + + + com.intuit.karate + karate-apache + ${karate.version} + + + + com.intuit.karate + karate-junit4 + ${karate.version} + test + @@ -150,6 +163,7 @@ 2.9.0 1.2.5 2.4.1 + 0.6.1 4.4.5 4.5.2 diff --git a/rest-testing/src/main/resources/Feature/cucumber.feature b/rest-testing/src/main/resources/karate/cucumber.feature similarity index 100% rename from rest-testing/src/main/resources/Feature/cucumber.feature rename to rest-testing/src/main/resources/karate/cucumber.feature diff --git a/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java b/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java new file mode 100644 index 0000000000..f942721504 --- /dev/null +++ b/rest-testing/src/test/java/com/baeldung/rest/karate/KarateUnitTest.java @@ -0,0 +1,44 @@ +package com.baeldung.rest.karate; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.intuit.karate.junit4.Karate; +import cucumber.api.CucumberOptions; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; + +import static com.github.tomakehurst.wiremock.client.WireMock.*; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; + +@RunWith(Karate.class) +@CucumberOptions(features = "classpath:karate") +public class KarateUnitTest { + + private static final WireMockServer wireMockServer = new WireMockServer(); + + @BeforeClass + public static void setUp() throws Exception { + wireMockServer.start(); + + configureFor("localhost", 8080); + stubFor(get(urlEqualTo("/user/get")) + .willReturn(aResponse() + .withStatus(200) + .withHeader("Content-Type", "application/json") + .withBody("{ \"id\": \"1234\", name: \"John Smith\" }"))); + stubFor(post(urlEqualTo("/user/create")) + .withHeader("content-type", equalTo("application/json")) + .withRequestBody(containing("id")) + .willReturn(aResponse() + .withStatus(200) + .withHeader("Content-Type", "application/json") + .withBody("{ \"id\": \"1234\", name: \"John Smith\" }"))); + + } + + @AfterClass + public static void tearDown() throws Exception { + wireMockServer.stop(); + } + +} diff --git a/rest-testing/src/test/resources/karate/user.feature b/rest-testing/src/test/resources/karate/user.feature new file mode 100644 index 0000000000..d9f0f12a9c --- /dev/null +++ b/rest-testing/src/test/resources/karate/user.feature @@ -0,0 +1,42 @@ +Feature: Testing a REST API with Karate + +Scenario: Testing valid GET endpoint + Given url 'http://localhost:8080/user/get' + When method GET + Then status 200 + +Scenario: Testing an invalid GET endpoint - 404 + Given url 'http://localhost:8080/user/wrong' + When method GET + Then status 404 + +Scenario: Testing the exact response of a GET endpoint + Given url 'http://localhost:8080/user/get' + When method GET + Then status 200 + And match $ == {id:"1234",name:"John Smith"} + +Scenario: Testing the exact response field value of a GET endpoint + Given url 'http://localhost:8080/user/get' + When method GET + Then status 200 + And match $.id == "1234" + +Scenario: Testing that GET response contains specific field + Given url 'http://localhost:8080/user/get' + When method GET + Then status 200 + And match $ contains {id:"1234"} + +Scenario: Test GET response using markers + Given url 'http://localhost:8080/user/get' + When method GET + Then status 200 + And match $ == {id:"#notnull",name:"John Smith"} + +Scenario: Testing a POST endpoint with request body + Given url 'http://localhost:8080/user/create' + And request { id: '1234' , name: 'John Smith'} + When method POST + Then status 200 + And match $ contains {id:"#notnull"} From f9ee21c1905f8edf744e39497e5b903f8590eb8c Mon Sep 17 00:00:00 2001 From: Seun Matt Date: Tue, 31 Oct 2017 15:28:14 +0100 Subject: [PATCH 167/197] Clean up the files for CAS module (#2927) * added updated example codes * updated example code StringToCharStream * deleted StringToCharStream.java locally * removed redundant file * added code for apache commons collection SetUtils * refactored example code * added example code for bytebuddy * added example code for PCollections * update pom * refactored tests for PCollections * spring security xml config * spring security xml config * remove redundant comment * example code for apache-shiro * updated example code for Vavr Collections * updated Vavr's Collection example * updated Vavr Collection file * updated example code for Apache Shiro * updated Vavr Collections example * added example code for N1QL * update example code for N1QL * added integration test for N1QL * update N1QL Example code * update the N1QL example Code * rename module to couchbase * rename module to couchbase * change module name in parent module and pom * added cas-server module * added cas secured app for Spring SSO with CAS * refactor cas modules into cas folder * updated files * removed redundant files --- cas-secured-app/.gitignore | 24 -- .../.mvn/wrapper/maven-wrapper.jar | Bin 47610 -> 0 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 - cas-secured-app/README.md | 1 - cas-secured-app/mvnw | 225 ----------------- cas-secured-app/mvnw.cmd | 143 ----------- cas-secured-app/pom.xml | 180 -------------- .../CasSecuredAppApplication.java | 91 ------- .../cassecuredapp/config/SecurityConfig.java | 83 ------- .../controllers/AuthController.java | 35 --- .../controllers/IndexController.java | 15 -- .../controllers/SecuredPageController.java | 24 -- .../src/main/resources/application.properties | 1 - .../main/resources/templates/auth/logout.ftl | 10 - .../src/main/resources/templates/index.ftl | 11 - .../main/resources/templates/secure/index.ftl | 12 - ...sSecuredAppApplicationIntegrationTest.java | 16 -- cas-server/.gitignore | 14 -- cas-server/LICENSE.txt | 202 --------------- cas-server/README.md | 88 ------- cas-server/build.cmd | 82 ------ cas-server/build.sh | 97 -------- cas-server/etc/cas/config/application.yml | 2 - cas-server/etc/cas/config/cas.properties | 7 - cas-server/etc/cas/config/log4j2.xml | 117 --------- cas-server/etc/cas/thekeystore | Bin 2225 -> 0 bytes cas-server/etc/cas/thekeystore.crt | Bin 808 -> 0 bytes cas-server/maven/maven-wrapper.properties | 1 - cas-server/mvnw | 234 ------------------ cas-server/mvnw.bat | 174 ------------- cas-server/pom.xml | 158 ------------ .../src/main/resources/application.properties | 126 ---------- cas-server/src/main/resources/cas.properties | 41 --- .../resources/services/casSecuredApp.json | 8 - cas/cas-secured-app/.gitignore | 5 +- .../.mvn/wrapper/maven-wrapper.jar | Bin 47610 -> 0 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 - cas/cas-secured-app/mvnw | 225 ----------------- cas/cas-secured-app/mvnw.cmd | 143 ----------- 39 files changed, 4 insertions(+), 2593 deletions(-) delete mode 100644 cas-secured-app/.gitignore delete mode 100644 cas-secured-app/.mvn/wrapper/maven-wrapper.jar delete mode 100644 cas-secured-app/.mvn/wrapper/maven-wrapper.properties delete mode 100644 cas-secured-app/README.md delete mode 100644 cas-secured-app/mvnw delete mode 100644 cas-secured-app/mvnw.cmd delete mode 100644 cas-secured-app/pom.xml delete mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java delete mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java delete mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java delete mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java delete mode 100644 cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java delete mode 100644 cas-secured-app/src/main/resources/application.properties delete mode 100644 cas-secured-app/src/main/resources/templates/auth/logout.ftl delete mode 100644 cas-secured-app/src/main/resources/templates/index.ftl delete mode 100644 cas-secured-app/src/main/resources/templates/secure/index.ftl delete mode 100644 cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java delete mode 100644 cas-server/.gitignore delete mode 100644 cas-server/LICENSE.txt delete mode 100644 cas-server/README.md delete mode 100644 cas-server/build.cmd delete mode 100644 cas-server/build.sh delete mode 100644 cas-server/etc/cas/config/application.yml delete mode 100644 cas-server/etc/cas/config/cas.properties delete mode 100644 cas-server/etc/cas/config/log4j2.xml delete mode 100644 cas-server/etc/cas/thekeystore delete mode 100644 cas-server/etc/cas/thekeystore.crt delete mode 100644 cas-server/maven/maven-wrapper.properties delete mode 100644 cas-server/mvnw delete mode 100644 cas-server/mvnw.bat delete mode 100644 cas-server/pom.xml delete mode 100644 cas-server/src/main/resources/application.properties delete mode 100644 cas-server/src/main/resources/cas.properties delete mode 100644 cas-server/src/main/resources/services/casSecuredApp.json delete mode 100644 cas/cas-secured-app/.mvn/wrapper/maven-wrapper.jar delete mode 100644 cas/cas-secured-app/.mvn/wrapper/maven-wrapper.properties delete mode 100644 cas/cas-secured-app/mvnw delete mode 100644 cas/cas-secured-app/mvnw.cmd diff --git a/cas-secured-app/.gitignore b/cas-secured-app/.gitignore deleted file mode 100644 index 2af7cefb0a..0000000000 --- a/cas-secured-app/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file diff --git a/cas-secured-app/.mvn/wrapper/maven-wrapper.jar b/cas-secured-app/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea9b4d95453115d0c26488d6a78694e0bc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47610 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 diff --git a/cas-secured-app/.mvn/wrapper/maven-wrapper.properties b/cas-secured-app/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index c315043703..0000000000 --- a/cas-secured-app/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/cas-secured-app/README.md b/cas-secured-app/README.md deleted file mode 100644 index ff12555376..0000000000 --- a/cas-secured-app/README.md +++ /dev/null @@ -1 +0,0 @@ -## Relevant articles: diff --git a/cas-secured-app/mvnw b/cas-secured-app/mvnw deleted file mode 100644 index 5bf251c077..0000000000 --- a/cas-secured-app/mvnw +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/cas-secured-app/mvnw.cmd b/cas-secured-app/mvnw.cmd deleted file mode 100644 index 019bd74d76..0000000000 --- a/cas-secured-app/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/cas-secured-app/pom.xml b/cas-secured-app/pom.xml deleted file mode 100644 index 0548e0c315..0000000000 --- a/cas-secured-app/pom.xml +++ /dev/null @@ -1,180 +0,0 @@ - - - 4.0.0 - - com.baeldung - cas-secured-app - 0.0.1-SNAPSHOT - jar - - cas-secured-app - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 2.0.0.BUILD-SNAPSHOT - - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.security - spring-security-cas - - - org.springframework.boot - spring-boot-starter-freemarker - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-devtools - runtime - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - **/AutoconfigurationTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - - autoconfiguration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - **/*IntegrationTest.java - - - **/AutoconfigurationTest.java - - - - - - - json - - - - - - - - - - - diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java deleted file mode 100644 index fc05e3b38f..0000000000 --- a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.baeldung.cassecuredapp; - -import org.jasig.cas.client.session.SingleSignOutFilter; -import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; -import org.jasig.cas.client.validation.Cas30ServiceTicketValidator; -import org.jasig.cas.client.validation.TicketValidator; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; -import org.springframework.context.event.EventListener; -import org.springframework.security.cas.ServiceProperties; -import org.springframework.security.cas.authentication.CasAuthenticationProvider; -import org.springframework.security.cas.web.CasAuthenticationEntryPoint; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.security.web.authentication.logout.LogoutFilter; -import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; - -import javax.servlet.http.HttpSessionEvent; - -@SpringBootApplication -public class CasSecuredAppApplication { - - public static void main(String[] args) { - SpringApplication.run(CasSecuredAppApplication.class, args); - } - - @Bean - public ServiceProperties serviceProperties() { - ServiceProperties serviceProperties = new ServiceProperties(); - serviceProperties.setService("http://localhost:9000/login/cas"); - serviceProperties.setSendRenew(false); - return serviceProperties; - } - - @Bean - @Primary - public AuthenticationEntryPoint authenticationEntryPoint(ServiceProperties sP) { - CasAuthenticationEntryPoint entryPoint = new CasAuthenticationEntryPoint(); - entryPoint.setLoginUrl("https://localhost:8443/cas/login"); - entryPoint.setServiceProperties(sP); - return entryPoint; - } - - @Bean - public TicketValidator ticketValidator() { - return new Cas30ServiceTicketValidator("https://localhost:8443/cas"); - } - - @Bean - public CasAuthenticationProvider casAuthenticationProvider() { - CasAuthenticationProvider provider = new CasAuthenticationProvider(); - provider.setServiceProperties(serviceProperties()); - provider.setTicketValidator(ticketValidator()); - provider.setUserDetailsService((s) -> new User("test@test.com", "smatt", - true, true, true, true, - AuthorityUtils.createAuthorityList("ROLE_ADMIN"))); - provider.setKey("CAS_PROVIDER_LOCALHOST_9000"); - return provider; - } - - - @Bean - public SecurityContextLogoutHandler securityContextLogoutHandler() { - return new SecurityContextLogoutHandler(); - } - - @Bean - public LogoutFilter logoutFilter() { - LogoutFilter logoutFilter = new LogoutFilter( - "https://localhost:8443/cas/logout", securityContextLogoutHandler()); - logoutFilter.setFilterProcessesUrl("/logout/cas"); - return logoutFilter; - } - - @Bean - public SingleSignOutFilter singleSignOutFilter() { - SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter(); - singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443/cas"); - singleSignOutFilter.setIgnoreInitConfiguration(true); - return singleSignOutFilter; - } - - @EventListener - public SingleSignOutHttpSessionListener singleSignOutHttpSessionListener(HttpSessionEvent event) { - return new SingleSignOutHttpSessionListener(); - } -} diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java deleted file mode 100644 index 2eabed49e1..0000000000 --- a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/config/SecurityConfig.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.baeldung.cassecuredapp.config; - -import org.jasig.cas.client.session.SingleSignOutFilter; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.AuthenticationProvider; -import org.springframework.security.authentication.ProviderManager; -import org.springframework.security.cas.ServiceProperties; -import org.springframework.security.cas.authentication.CasAuthenticationProvider; -import org.springframework.security.cas.web.CasAuthenticationFilter; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.security.web.authentication.logout.LogoutFilter; - -import java.util.Arrays; - -@EnableWebSecurity -@Configuration -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - private AuthenticationProvider authenticationProvider; - private AuthenticationEntryPoint authenticationEntryPoint; - private SingleSignOutFilter singleSignOutFilter; - private LogoutFilter logoutFilter; - - @Autowired - public SecurityConfig(CasAuthenticationProvider casAuthenticationProvider, AuthenticationEntryPoint eP, - LogoutFilter lF - , SingleSignOutFilter ssF - ) { - this.authenticationProvider = casAuthenticationProvider; - this.authenticationEntryPoint = eP; - - this.logoutFilter = lF; - this.singleSignOutFilter = ssF; - - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http - .authorizeRequests() - .regexMatchers("/secured.*", "/login") - .authenticated() - .and() - .authorizeRequests() - .regexMatchers("/") - .permitAll() - .and() - .httpBasic() - .authenticationEntryPoint(authenticationEntryPoint) - .and() - .logout().logoutSuccessUrl("/logout") - .and() - .addFilterBefore(singleSignOutFilter, CasAuthenticationFilter.class) - .addFilterBefore(logoutFilter, LogoutFilter.class); - - } - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.authenticationProvider(authenticationProvider); - } - - @Override - protected AuthenticationManager authenticationManager() throws Exception { - return new ProviderManager(Arrays.asList(authenticationProvider)); - } - - @Bean - public CasAuthenticationFilter casAuthenticationFilter(ServiceProperties sP) throws Exception { - CasAuthenticationFilter filter = new CasAuthenticationFilter(); - filter.setServiceProperties(sP); - filter.setAuthenticationManager(authenticationManager()); - return filter; - } - -} diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java deleted file mode 100644 index 703e6abf7a..0000000000 --- a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/AuthController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.baeldung.cassecuredapp.controllers; - -import org.apache.log4j.Logger; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.web.authentication.logout.CookieClearingLogoutHandler; -import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; -import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@Controller -public class AuthController { - - private Logger logger = Logger.getLogger(AuthController.class); - - @GetMapping("/logout") - public String logout( - HttpServletRequest request, HttpServletResponse response, SecurityContextLogoutHandler logoutHandler) { - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - logoutHandler.logout(request, response, auth ); - new CookieClearingLogoutHandler(AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY).logout(request, response, auth); - return "auth/logout"; - } - - - @GetMapping("/login") - public String login() { - return "redirect:/secured"; - } - -} diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java deleted file mode 100644 index 75956cf493..0000000000 --- a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/IndexController.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.cassecuredapp.controllers; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - - -@Controller -public class IndexController { - - @GetMapping("/") - public String index() { - return "index"; - } -} diff --git a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java b/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java deleted file mode 100644 index 9a872d1f40..0000000000 --- a/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/controllers/SecuredPageController.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.baeldung.cassecuredapp.controllers; - -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -@Controller -@RequestMapping(value = "/secured") -public class SecuredPageController { - - @GetMapping - public String index(ModelMap modelMap) { - Authentication auth = SecurityContextHolder.getContext().getAuthentication(); - if( auth != null && auth.getPrincipal() != null - && auth.getPrincipal() instanceof UserDetails) { - modelMap.put("username", ((UserDetails) auth.getPrincipal()).getUsername()); - } - return "secure/index"; - } -} diff --git a/cas-secured-app/src/main/resources/application.properties b/cas-secured-app/src/main/resources/application.properties deleted file mode 100644 index 99802c632f..0000000000 --- a/cas-secured-app/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -server.port=9000 \ No newline at end of file diff --git a/cas-secured-app/src/main/resources/templates/auth/logout.ftl b/cas-secured-app/src/main/resources/templates/auth/logout.ftl deleted file mode 100644 index eac345ec33..0000000000 --- a/cas-secured-app/src/main/resources/templates/auth/logout.ftl +++ /dev/null @@ -1,10 +0,0 @@ - - - Cas Secured App - Logout - - -

    You have logged out of Cas Secured Spring Boot App Successfully

    -
    -Log out of all other Services - - \ No newline at end of file diff --git a/cas-secured-app/src/main/resources/templates/index.ftl b/cas-secured-app/src/main/resources/templates/index.ftl deleted file mode 100644 index d407756044..0000000000 --- a/cas-secured-app/src/main/resources/templates/index.ftl +++ /dev/null @@ -1,11 +0,0 @@ - - - Cas Secured App - Index - - -

    Welcome to Cas Secured Spring Boot App

    -

    This is a Public Page

    -
    -Login - - \ No newline at end of file diff --git a/cas-secured-app/src/main/resources/templates/secure/index.ftl b/cas-secured-app/src/main/resources/templates/secure/index.ftl deleted file mode 100644 index 210ebecc7b..0000000000 --- a/cas-secured-app/src/main/resources/templates/secure/index.ftl +++ /dev/null @@ -1,12 +0,0 @@ - - - Cas Secured App - Secured - - -

    Welcome to Cas Secured Spring Boot App

    -

    This is a Secured Page

    -

    Welcome home ${username!""}

    -
    -Logout - - \ No newline at end of file diff --git a/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java b/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java deleted file mode 100644 index 2f2644e2ea..0000000000 --- a/cas-secured-app/src/test/java/com/baeldung/cassecuredapp/CasSecuredAppApplicationIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.cassecuredapp; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class CasSecuredAppApplicationIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/cas-server/.gitignore b/cas-server/.gitignore deleted file mode 100644 index 5304519922..0000000000 --- a/cas-server/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -.classpath -!/.project -.project -.settings -target/ -.idea/ -.DS_Store -.idea -overlays/ -.gradle/ -build/ -bin/ -*.iml -*.log diff --git a/cas-server/LICENSE.txt b/cas-server/LICENSE.txt deleted file mode 100644 index d645695673..0000000000 --- a/cas-server/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/cas-server/README.md b/cas-server/README.md deleted file mode 100644 index bae8b648e5..0000000000 --- a/cas-server/README.md +++ /dev/null @@ -1,88 +0,0 @@ -CAS Overlay Template -============================ - -Generic CAS WAR overlay to exercise the latest versions of CAS. This overlay could be freely used as a starting template for local CAS war overlays. The CAS services management overlay is available [here](https://github.com/apereo/cas-services-management-overlay). - -# Versions - -```xml -5.1.x -``` - -# Requirements -* JDK 1.8+ - -# Configuration - -The `etc` directory contains the configuration files and directories that need to be copied to `/etc/cas/config`. - -# Build - -To see what commands are available to the build script, run: - -```bash -./build.sh help -``` - -To package the final web application, run: - -```bash -./build.sh package -``` - -To update `SNAPSHOT` versions run: - -```bash -./build.sh package -U -``` - -# Deployment - -- Create a keystore file `thekeystore` under `/etc/cas`. Use the password `changeit` for both the keystore and the key/certificate entries. -- Ensure the keystore is loaded up with keys and certificates of the server. - -On a successful deployment via the following methods, CAS will be available at: - -* `http://cas.server.name:8080/cas` -* `https://cas.server.name:8443/cas` - -## Executable WAR - -Run the CAS web application as an executable WAR. - -```bash -./build.sh run -``` - -## Spring Boot - -Run the CAS web application as an executable WAR via Spring Boot. This is most useful during development and testing. - -```bash -./build.sh bootrun -``` - -### Warning! - -Be careful with this method of deployment. `bootRun` is not designed to work with already executable WAR artifacts such that CAS server web application. YMMV. Today, uses of this mode ONLY work when there is **NO OTHER** dependency added to the build script and the `cas-server-webapp` is the only present module. See [this issue](https://github.com/apereo/cas/issues/2334) and [this issue](https://github.com/spring-projects/spring-boot/issues/8320) for more info. - - -## Spring Boot App Server Selection -There is an app.server property in the pom.xml that can be used to select a spring boot application server. -It defaults to "-tomcat" but "-jetty" and "-undertow" are supported. -It can also be set to an empty value (nothing) if you want to deploy CAS to an external application server of your choice and you don't want the spring boot libraries included. - -```xml --tomcat -``` - -## Windows Build -If you are building on windows, try build.cmd instead of build.sh. Arguments are similar but for usage, run: - -``` -build.cmd help -``` - -## External - -Deploy resultant `target/cas.war` to a servlet container of choice. diff --git a/cas-server/build.cmd b/cas-server/build.cmd deleted file mode 100644 index f907dcb388..0000000000 --- a/cas-server/build.cmd +++ /dev/null @@ -1,82 +0,0 @@ -@echo off - -@set JAVA_ARGS=-Xms500m -Xmx1g -@set CAS_DIR=\etc\cas -@set CONFIG_DIR=\etc\cas\config - -@rem Call this script with DNAME and CERT_SUBJ_ALT_NAMES already set to override -@if "%DNAME%" == "" set DNAME=CN=cas.example.org,OU=Example,OU=Org,C=US -@rem List other host names or ip addresses you want in your certificate, may help with host name verification, -@rem if client apps make https connection for ticket validation and compare name in cert (include sub. alt. names) -@rem to name used to access CAS -@if "%CERT_SUBJ_ALT_NAMES%" == "" set CERT_SUBJ_ALT_NAMES=dns:example.org,dns:localhost,dns:%COMPUTERNAME%,ip:127.0.0.1 - -@rem Check for mvn in path, use it if found, otherwise use maven wrapper -@set MAVEN_CMD=mvn -@where /q mvn -@if %ERRORLEVEL% neq 0 set MAVEN_CMD=.\mvnw.bat - -@if "%1" == "" call:help -@if "%1" == "copy" call:copy -@if "%1" == "clean" call:clean %2 %3 %4 -@if "%1" == "package" call:package %2 %3 %4 -@if "%1" == "bootrun" call:bootrun %2 %3 %4 -@if "%1" == "debug" call:debug %2 %3 %4 -@if "%1" == "run" call:run %2 %3 %4 -@if "%1" == "help" call:help -@if "%1" == "gencert" call:gencert - -@rem function section starts here -@goto:eof - -:copy - @echo "Creating configuration directory under %CONFIG_DIR%" - if not exist %CONFIG_DIR% mkdir %CONFIG_DIR% - - @echo "Copying configuration files from etc/cas to /etc/cas" - xcopy /S /Y etc\cas\* \etc\cas -@goto:eof - -:help - @echo "Usage: build.bat [copy|clean|package|run|debug|bootrun|gencert] [optional extra args for maven]" - @echo "To get started on a clean system, run "build.bat copy" and "build.bat gencert", then "build.bat run" - @echo "Note that using the copy or gencert arguments will create and/or overwrite the %CAS_DIR% which is outside this project" -@goto:eof - -:clean - call %MAVEN_CMD% clean %1 %2 %3 - exit /B %ERRORLEVEL% -@goto:eof - -:package - call %MAVEN_CMD% clean package -T 5 %1 %2 %3 - exit /B %ERRORLEVEL% -@goto:eof - -:bootrun - call %MAVEN_CMD% clean package spring-boot:run -T 5 %1 %2 %3 - exit /B %ERRORLEVEL% -@goto:eof - -:debug - call:package %1 %2 %3 & java %JAVA_ARGS% -Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n -jar target/cas.war -@goto:eof - -:run - call:package %1 %2 %3 & java %JAVA_ARGS% -jar target/cas.war -@goto:eof - -:gencert - where /q keytool - if ERRORLEVEL 1 ( - @echo Java keytool.exe not found in path. - exit /b 1 - ) else ( - if not exist %CAS_DIR% mkdir %CAS_DIR% - @echo on - @echo Generating self-signed SSL cert for %DNAME% in %CAS_DIR%\thekeystore - keytool -genkeypair -alias cas -keyalg RSA -keypass changeit -storepass changeit -keystore %CAS_DIR%\thekeystore -dname %DNAME% -ext SAN=%CERT_SUBJ_ALT_NAMES% - @echo Exporting cert for use in trust store (used by cas clients) - keytool -exportcert -alias cas -storepass changeit -keystore %CAS_DIR%\thekeystore -file %CAS_DIR%\cas.cer - ) -@goto:eof diff --git a/cas-server/build.sh b/cas-server/build.sh deleted file mode 100644 index e33f7de854..0000000000 --- a/cas-server/build.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - - -function copy() { - echo -e "Creating configuration directory under /etc/cas" - mkdir -p /etc/cas/config - - echo -e "Copying configuration files from etc/cas to /etc/cas" - cp -rfv etc/cas/* /etc/cas -} - -function help() { - echo "Usage: build.sh [copy|clean|package|run|debug|bootrun|gencert]" - echo " copy: Copy config from ./etc/cas/config to /etc/cas/config" - echo " clean: Clean Maven build directory" - echo " package: Clean and build CAS war, also call copy" - echo " run: Build and run CAS.war via spring boot (java -jar target/cas.war)" - echo " debug: Run CAS.war and listen for Java debugger on port 5000" - echo " bootrun: Run with maven spring boot plugin, doesn't work with multiple dependencies" - echo " gencert: Create keystore with SSL certificate in location where CAS looks by default" -} - -function clean() { - ./mvnw clean "$@" -} - -function package() { - ./mvnw clean package -T 5 "$@" - copy -} - -function bootrun() { - ./mvnw clean package spring-boot:run -T 5 "$@" -} - -function debug() { - package && java -Xdebug -Xrunjdwp:transport=dt_socket,address=5000,server=y,suspend=n -jar target/cas.war -} - -function run() { - package && java -jar target/cas.war -} - -function gencert() { - if [[ ! -d /etc/cas ]] ; then - copy - fi - which keytool - if [[ $? -ne 0 ]] ; then - echo Error: Java JDK \'keytool\' is not installed or is not in the path - exit 1 - fi - # override DNAME and CERT_SUBJ_ALT_NAMES before calling or use dummy values - DNAME="${DNAME:-CN=cas.example.org,OU=Example,OU=Org,C=US}" - CERT_SUBJ_ALT_NAMES="${CERT_SUBJ_ALT_NAMES:-dns:example.org,dns:localhost,ip:127.0.0.1}" - echo "Generating keystore for CAS with DN ${DNAME}" - keytool -genkeypair -alias cas -keyalg RSA -keypass changeit -storepass changeit -keystore /etc/cas/thekeystore -dname ${DNAME} -ext SAN=${CERT_SUBJ_ALT_NAMES} - keytool -exportcert -alias cas -storepass changeit -keystore /etc/cas/thekeystore -file /etc/cas/cas.cer -} - -if [ $# -eq 0 ]; then - echo -e "No commands provided. Defaulting to [run]\n" - run - exit 0 -fi - - -case "$1" in -"copy") - copy - ;; -"clean") - shift - clean "$@" - ;; -"package") - shift - package "$@" - ;; -"bootrun") - shift - bootrun "$@" - ;; -"debug") - debug "$@" - ;; -"run") - run "$@" - ;; -"gencert") - gencert "$@" - ;; -*) - help - ;; -esac - diff --git a/cas-server/etc/cas/config/application.yml b/cas-server/etc/cas/config/application.yml deleted file mode 100644 index be1f7c3edd..0000000000 --- a/cas-server/etc/cas/config/application.yml +++ /dev/null @@ -1,2 +0,0 @@ -info: - description: CAS Configuration \ No newline at end of file diff --git a/cas-server/etc/cas/config/cas.properties b/cas-server/etc/cas/config/cas.properties deleted file mode 100644 index 47a1477308..0000000000 --- a/cas-server/etc/cas/config/cas.properties +++ /dev/null @@ -1,7 +0,0 @@ -cas.server.name: https://cas.example.org:8443 -cas.server.prefix: https://cas.example.org:8443/cas - -cas.adminPagesSecurity.ip=127\.0\.0\.1 - -logging.config: file:/etc/cas/config/log4j2.xml -# cas.serviceRegistry.config.location: classpath:/services diff --git a/cas-server/etc/cas/config/log4j2.xml b/cas-server/etc/cas/config/log4j2.xml deleted file mode 100644 index 53b30b4228..0000000000 --- a/cas-server/etc/cas/config/log4j2.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - . - - warn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cas-server/etc/cas/thekeystore b/cas-server/etc/cas/thekeystore deleted file mode 100644 index 15f9af2dae6366804459009361140e8526f811b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2225 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 Lt(?_lzc& diff --git a/cas-server/maven/maven-wrapper.properties b/cas-server/maven/maven-wrapper.properties deleted file mode 100644 index b368e4609a..0000000000 --- a/cas-server/maven/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https\://repository.apache.org/content/repositories/releases/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/cas-server/mvnw b/cas-server/mvnw deleted file mode 100644 index 2275ac7647..0000000000 --- a/cas-server/mvnw +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # - # Look for the Apple JDKs first to preserve the existing behaviour, and then look - # for the new JDKs provided by Oracle. - # - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then - # - # Apple JDKs - # - export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then - # - # Oracle JDKs - # - export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home - fi - - if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then - # - # Apple JDKs - # - export JAVA_HOME=`/usr/libexec/java_home` - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - local basedir=$(pwd) - local wdir=$(pwd) - while [ "$wdir" != '/' ] ; do - wdir=$(cd "$wdir/.."; pwd) - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER="org.apache.maven.wrapper.MavenWrapperMain" - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - -classpath \ -"$MAVEN_PROJECTBASEDIR/maven/maven-wrapper.jar" \ - ${WRAPPER_LAUNCHER} "$@" diff --git a/cas-server/mvnw.bat b/cas-server/mvnw.bat deleted file mode 100644 index d391151aa7..0000000000 --- a/cas-server/mvnw.bat +++ /dev/null @@ -1,174 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:chkMHome -if not "%M2_HOME%"=="" goto valMHome - -SET "M2_HOME=%~dp0.." -if not "%M2_HOME%"=="" goto valMHome - -echo. -echo Error: M2_HOME not found in your environment. >&2 -echo Please set the M2_HOME variable in your environment to match the >&2 -echo location of the Maven installation. >&2 -echo. -goto error - -:valMHome - -:stripMHome -if not "_%M2_HOME:~-1%"=="_\" goto checkMCmd -set "M2_HOME=%M2_HOME:~0,-1%" -goto stripMHome - -:checkMCmd -if exist "%M2_HOME%\bin\mvn.cmd" goto init - -echo. -echo Error: M2_HOME is set to an invalid directory. >&2 -echo M2_HOME = "%M2_HOME%" >&2 -echo Please set the M2_HOME variable in your environment to match the >&2 -echo location of the Maven installation >&2 -echo. -goto error -@REM ==== END VALIDATION ==== - -:init - -set MAVEN_CMD_LINE_ARGS=%* - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\maven\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% - -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/cas-server/pom.xml b/cas-server/pom.xml deleted file mode 100644 index e8625b48f7..0000000000 --- a/cas-server/pom.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - 4.0.0 - com.baeldung - cas-server - war - 1.0 - - - - - com.rimerosolutions.maven.plugins - wrapper-maven-plugin - 0.0.4 - - true - MD5 - - - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - - org.springframework.boot.loader.WarLauncher - true - - - - org.apache.maven.plugins - maven-war-plugin - 2.6 - - cas - false - false - - false - ${project.build.directory}/war/work/org.apereo.cas/cas-server-webapp${app.server}/META-INF/MANIFEST.MF - - - - - org.apereo.cas - cas-server-webapp${app.server} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - - cas - - - - - org.apereo.cas - cas-server-webapp${app.server} - ${cas.version} - war - runtime - - - org.apereo.cas - cas-server-support-json-service-registry - ${cas.version} - - - org.apereo.cas - cas-server-support-jdbc - ${cas.version} - - - org.apereo.cas - cas-server-support-jdbc-drivers - ${cas.version} - - - - - 5.1.4 - 1.5.3.RELEASE - - -tomcat - 1.8 - 1.8 - UTF-8 - - - - - sonatype-releases - http://oss.sonatype.org/content/repositories/releases/ - - false - - - true - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - false - - - - shibboleth-releases - https://build.shibboleth.net/nexus/content/repositories/releases - - - spring-milestones - https://repo.spring.io/milestone - - - - - - - false - - pgp - - - - com.github.s4u.plugins - pgpverify-maven-plugin - 1.1.0 - - - - check - - - - - hkp://pool.sks-keyservers.net - ${settings.localRepository}/pgpkeys-cache - test - true - false - - - - - - - diff --git a/cas-server/src/main/resources/application.properties b/cas-server/src/main/resources/application.properties deleted file mode 100644 index 2d5e9a7277..0000000000 --- a/cas-server/src/main/resources/application.properties +++ /dev/null @@ -1,126 +0,0 @@ -## -# CAS Server Context Configuration -# -server.context-path=/cas -server.port=8443 - -server.ssl.key-store=file:/etc/cas/thekeystore -server.ssl.key-store-password=changeit -server.ssl.key-password=changeit -# server.ssl.ciphers= -# server.ssl.client-auth= -# server.ssl.enabled= -# server.ssl.key-alias= -# server.ssl.key-store-provider= -# server.ssl.key-store-type= -# server.ssl.protocol= -# server.ssl.trust-store= -# server.ssl.trust-store-password= -# server.ssl.trust-store-provider= -# server.ssl.trust-store-type= - -server.max-http-header-size=2097152 -server.use-forward-headers=true -server.connection-timeout=20000 -server.error.include-stacktrace=NEVER - -server.tomcat.max-http-post-size=2097152 -server.tomcat.basedir=build/tomcat -server.tomcat.accesslog.enabled=true -server.tomcat.accesslog.pattern=%t %a "%r" %s (%D ms) -server.tomcat.accesslog.suffix=.log -server.tomcat.max-threads=10 -server.tomcat.port-header=X-Forwarded-Port -server.tomcat.protocol-header=X-Forwarded-Proto -server.tomcat.protocol-header-https-value=https -server.tomcat.remote-ip-header=X-FORWARDED-FOR -server.tomcat.uri-encoding=UTF-8 - -spring.http.encoding.charset=UTF-8 -spring.http.encoding.enabled=true -spring.http.encoding.force=true - -## -# CAS Cloud Bus Configuration -# -spring.cloud.bus.enabled=false -# spring.cloud.bus.refresh.enabled=true -# spring.cloud.bus.env.enabled=true -# spring.cloud.bus.destination=CasCloudBus -# spring.cloud.bus.ack.enabled=true - -endpoints.enabled=false -endpoints.sensitive=true - -endpoints.restart.enabled=false -endpoints.shutdown.enabled=false - -management.security.enabled=true -management.security.roles=ACTUATOR,ADMIN -management.security.sessions=if_required -management.context-path=/status -management.add-application-context-header=false - -security.basic.authorize-mode=role -security.basic.enabled=false -security.basic.path=/cas/status/** - -## -# CAS Web Application Session Configuration -# -server.session.timeout=300 -server.session.cookie.http-only=true -server.session.tracking-modes=COOKIE - -## -# CAS Thymeleaf View Configuration -# -spring.thymeleaf.encoding=UTF-8 -spring.thymeleaf.cache=true -spring.thymeleaf.mode=HTML -## -# CAS Log4j Configuration -# -# logging.config=file:/etc/cas/log4j2.xml -server.context-parameters.isLog4jAutoInitializationDisabled=true - -## -# CAS AspectJ Configuration -# -spring.aop.auto=true -spring.aop.proxy-target-class=true - -## -# CAS Authentication Credentials -# -#cas.authn.accept.users=casuser::Mellon -cas.authn.accept.users= -cas.authn.accept.name= - -#CAS Database Authentication Property -cas.authn.jdbc.query[0].sql=SELECT * FROM users WHERE email = ? -cas.authn.jdbc.query[0].url=jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC -cas.authn.jdbc.query[0].dialect=org.hibernate.dialect.MySQLDialect -cas.authn.jdbc.query[0].user=root -cas.authn.jdbc.query[0].password= -cas.authn.jdbc.query[0].ddlAuto=none -cas.authn.jdbc.query[0].driverClass=com.mysql.jdbc.Driver -cas.authn.jdbc.query[0].fieldPassword=password -cas.authn.jdbc.query[0].passwordEncoder.type=BCRYPT - - -## -# CAS Delegated Authentication -# -cas.authn.pac4j.bitbucket.clientName=Bitbucket -cas.authn.pac4j.dropbox.clientName=Dropbox -cas.authn.pac4j.facebook.clientName=Facebook -cas.authn.pac4j.foursquare.clientName=Foursquare -cas.authn.pac4j.github.clientName=Github -cas.authn.pac4j.google.clientName=Google -cas.authn.pac4j.linkedIn.clientName=LinkedIn -cas.authn.pac4j.paypal.clientName=PayPal -cas.authn.pac4j.twitter.clientName=Twitter -cas.authn.pac4j.yahoo.clientName=Yahoo -cas.authn.pac4j.windowsLive.clientName=Windows Live -cas.authn.pac4j.wordpress.clientName=WordPress diff --git a/cas-server/src/main/resources/cas.properties b/cas-server/src/main/resources/cas.properties deleted file mode 100644 index be2babcd14..0000000000 --- a/cas-server/src/main/resources/cas.properties +++ /dev/null @@ -1,41 +0,0 @@ -cas.server.name: https://localhost:8443 -cas.server.prefix: https://localhost:8443/cas - -cas.adminPagesSecurity.ip=127\.0\.0\.1 - -logging.config: file:/etc/cas/config/log4j2.xml - -cas.serviceRegistry.initFromJson=true -cas.serviceRegistry.config.location=classpath:/services - -cas.authn.accept.users= -cas.authn.accept.name= - -#CAS Database Authentication Property - -# cas.authn.jdbc.query[0].healthQuery= -# cas.authn.jdbc.query[0].isolateInternalQueries=false -# cas.authn.jdbc.query[0].failFast=true -# cas.authn.jdbc.query[0].isolationLevelName=ISOLATION_READ_COMMITTED -# cas.authn.jdbc.query[0].leakThreshold=10 -# cas.authn.jdbc.query[0].propagationBehaviorName=PROPAGATION_REQUIRED -# cas.authn.jdbc.query[0].batchSize=1 -# cas.authn.jdbc.query[0].maxAgeDays=180 -# cas.authn.jdbc.query[0].autocommit=false -# cas.authn.jdbc.query[0].idleTimeout=5000 -# cas.authn.jdbc.query[0].credentialCriteria= -# cas.authn.jdbc.query[0].name= -# cas.authn.jdbc.query[0].order=0 -# cas.authn.jdbc.query[0].dataSourceName= -# cas.authn.jdbc.query[0].dataSourceProxy=false -# cas.authn.jdbc.query[0].fieldExpired= -# cas.authn.jdbc.query[0].fieldDisabled= -# cas.authn.jdbc.query[0].principalAttributeList=sn,cn:commonName,givenName -# cas.authn.jdbc.query[0].passwordEncoder.type=NONE|DEFAULT|STANDARD|BCRYPT|SCRYPT|PBKDF2|com.example.CustomPasswordEncoder -# cas.authn.jdbc.query[0].passwordEncoder.characterEncoding= -# cas.authn.jdbc.query[0].passwordEncoder.encodingAlgorithm= -# cas.authn.jdbc.query[0].passwordEncoder.secret= -# cas.authn.jdbc.query[0].passwordEncoder.strength=16 -# cas.authn.jdbc.query[0].principalTransformation.suffix= -# cas.authn.jdbc.query[0].principalTransformation.caseConversion=NONE|UPPERCASE|LOWERCASE -# cas.authn.jdbc.query[0].principalTransformation.prefix= \ No newline at end of file diff --git a/cas-server/src/main/resources/services/casSecuredApp.json b/cas-server/src/main/resources/services/casSecuredApp.json deleted file mode 100644 index 336007e484..0000000000 --- a/cas-server/src/main/resources/services/casSecuredApp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "@class" : "org.apereo.cas.services.RegexRegisteredService", - "serviceId" : "^http://localhost:9000/login/cas", - "name" : "CAS Spring Secured App", - "description": "This is a Spring App that usses the CAS Server for it's authentication", - "id" : 19991, - "evaluationOrder" : 1 -} \ No newline at end of file diff --git a/cas/cas-secured-app/.gitignore b/cas/cas-secured-app/.gitignore index 2af7cefb0a..cd4878159f 100644 --- a/cas/cas-secured-app/.gitignore +++ b/cas/cas-secured-app/.gitignore @@ -21,4 +21,7 @@ build/ nbbuild/ dist/ nbdist/ -.nb-gradle/ \ No newline at end of file +.nb-gradle/ +/.mvn/ +/mvnw +/mvnw.cmd \ No newline at end of file diff --git a/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.jar b/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea9b4d95453115d0c26488d6a78694e0bc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 47610 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 diff --git a/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.properties b/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index c315043703..0000000000 --- a/cas/cas-secured-app/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/cas/cas-secured-app/mvnw b/cas/cas-secured-app/mvnw deleted file mode 100644 index 5bf251c077..0000000000 --- a/cas/cas-secured-app/mvnw +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/cas/cas-secured-app/mvnw.cmd b/cas/cas-secured-app/mvnw.cmd deleted file mode 100644 index 019bd74d76..0000000000 --- a/cas/cas-secured-app/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% From 65111a4666734f77d9b5ad8d1b20ac41e8766006 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 31 Oct 2017 18:23:31 +0200 Subject: [PATCH 168/197] spring-rest-shell (#2928) * code snippets for the `Java 9 Stream API improvements` article * code snippets for the `Java 9 Stream API improvements` article [2 attempt] * removed the first attempt * the Spring 5 WebClient * delted stream features test * HttpMediaTypeNotAcceptableExceptionExampleController [0] * reactive web client service was removed * new WebClient * new WebClient [2] * spring-rest-shell init * pom added * readme added --- .../reactive/client/WebClientController.java | 3 +- spring-rest-shell/README.md | 5 ++ spring-rest-shell/pom.xml | 60 +++++++++++++++++++ .../main/java/com/baeldung/Application.java | 13 ++++ .../java/com/baeldung/acticle/Article.java | 40 +++++++++++++ .../baeldung/acticle/ArticleRepository.java | 18 ++++++ 6 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 spring-rest-shell/README.md create mode 100644 spring-rest-shell/pom.xml create mode 100644 spring-rest-shell/src/main/java/com/baeldung/Application.java create mode 100644 spring-rest-shell/src/main/java/com/baeldung/acticle/Article.java create mode 100644 spring-rest-shell/src/main/java/com/baeldung/acticle/ArticleRepository.java diff --git a/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java b/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java index 7bab288bab..a218c6b7cf 100644 --- a/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java +++ b/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java @@ -43,7 +43,8 @@ public class WebClientController { WebClient.RequestHeadersSpec requestSpec2 = uri2.body(BodyInserters.fromObject("data")); // inserters - BodyInserter, ReactiveHttpOutputMessage> inserter1 = BodyInserters.fromPublisher(Subscriber::onComplete, String.class); + BodyInserter, ReactiveHttpOutputMessage> inserter1 = BodyInserters + .fromPublisher(Subscriber::onComplete, String.class); LinkedMultiValueMap map = new LinkedMultiValueMap<>(); map.add("key1", "value1"); diff --git a/spring-rest-shell/README.md b/spring-rest-shell/README.md new file mode 100644 index 0000000000..06e18450c6 --- /dev/null +++ b/spring-rest-shell/README.md @@ -0,0 +1,5 @@ +## Spring REST Shell Project + +### Relevant Articles + +- [Spring REST Shell](http://www.baeldung.com/) \ No newline at end of file diff --git a/spring-rest-shell/pom.xml b/spring-rest-shell/pom.xml new file mode 100644 index 0000000000..fe255b397f --- /dev/null +++ b/spring-rest-shell/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + com.baeldung + spring-rest-shell + 0.0.1-SNAPSHOT + jar + + spring-rest-shell + A simple project to demonstrate Spring REST Shell features. + + + org.springframework.boot + spring-boot-starter-parent + 1.5.8.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-data-rest + + + + + com.h2database + h2 + runtime + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-rest-shell/src/main/java/com/baeldung/Application.java b/spring-rest-shell/src/main/java/com/baeldung/Application.java new file mode 100644 index 0000000000..37dbe7dab8 --- /dev/null +++ b/spring-rest-shell/src/main/java/com/baeldung/Application.java @@ -0,0 +1,13 @@ +package com.baeldung; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/spring-rest-shell/src/main/java/com/baeldung/acticle/Article.java b/spring-rest-shell/src/main/java/com/baeldung/acticle/Article.java new file mode 100644 index 0000000000..6a55517f9f --- /dev/null +++ b/spring-rest-shell/src/main/java/com/baeldung/acticle/Article.java @@ -0,0 +1,40 @@ +package com.baeldung.acticle; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +@Entity +public final class Article { + + @Id + @GeneratedValue + private Long id; + private String title; + private String content; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + +} diff --git a/spring-rest-shell/src/main/java/com/baeldung/acticle/ArticleRepository.java b/spring-rest-shell/src/main/java/com/baeldung/acticle/ArticleRepository.java new file mode 100644 index 0000000000..83daf819f0 --- /dev/null +++ b/spring-rest-shell/src/main/java/com/baeldung/acticle/ArticleRepository.java @@ -0,0 +1,18 @@ +package com.baeldung.acticle; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; + +import java.util.Optional; + +@RepositoryRestResource( + path = "articles", + collectionResourceRel = "articles", + itemResourceRel = "article" +) +public interface ArticleRepository extends CrudRepository { + + Optional
    findByTitle(@Param("title") String title); + +} From f896e02d6e0af00528fe756f3f05c30e1e1898e4 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 1 Nov 2017 11:18:27 +0100 Subject: [PATCH 169/197] Refactor EchoServer (#2934) --- .../java/nio/selector/EchoServer.java | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/core-java/src/main/java/com/baeldung/java/nio/selector/EchoServer.java b/core-java/src/main/java/com/baeldung/java/nio/selector/EchoServer.java index 2ed9a27c4c..7c1e291646 100644 --- a/core-java/src/main/java/com/baeldung/java/nio/selector/EchoServer.java +++ b/core-java/src/main/java/com/baeldung/java/nio/selector/EchoServer.java @@ -13,6 +13,8 @@ import java.util.Set; public class EchoServer { + private static final String POISON_PILL = "POISON_PILL"; + public static void main(String[] args) throws IOException { Selector selector = Selector.open(); ServerSocketChannel serverSocket = ServerSocketChannel.open(); @@ -30,23 +32,36 @@ public class EchoServer { SelectionKey key = iter.next(); if (key.isAcceptable()) { - SocketChannel client = serverSocket.accept(); - client.configureBlocking(false); - client.register(selector, SelectionKey.OP_READ); + register(selector, serverSocket); } if (key.isReadable()) { - SocketChannel client = (SocketChannel) key.channel(); - client.read(buffer); - buffer.flip(); - client.write(buffer); - buffer.clear(); + answerWithEcho(buffer, key); } iter.remove(); } } } + private static void answerWithEcho(ByteBuffer buffer, SelectionKey key) throws IOException { + SocketChannel client = (SocketChannel) key.channel(); + client.read(buffer); + if (new String(buffer.array()).trim().equals(POISON_PILL)) { + client.close(); + System.out.println("Not accepting client messages anymore"); + } + + buffer.flip(); + client.write(buffer); + buffer.clear(); + } + + private static void register(Selector selector, ServerSocketChannel serverSocket) throws IOException { + SocketChannel client = serverSocket.accept(); + client.configureBlocking(false); + client.register(selector, SelectionKey.OP_READ); + } + public static Process start() throws IOException, InterruptedException { String javaHome = System.getProperty("java.home"); String javaBin = javaHome + File.separator + "bin" + File.separator + "java"; From 7769cde1c624a870e67fc619d1f3ba6f430bb010 Mon Sep 17 00:00:00 2001 From: Marcos Date: Wed, 1 Nov 2017 15:18:13 +0100 Subject: [PATCH 170/197] @RunWith in JUnit5 --- .../baeldung/junit5/mockito/Greetings.java | 9 +++++++++ .../test/java/com/baeldung/GreetingsTest.java | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java create mode 100644 junit5/src/test/java/com/baeldung/GreetingsTest.java diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java b/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java new file mode 100644 index 0000000000..5391cbbc00 --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java @@ -0,0 +1,9 @@ +package com.baeldung.junit5.mockito; + +public class Greetings { + + public static String sayHello() { + return "Hello"; + } + +} diff --git a/junit5/src/test/java/com/baeldung/GreetingsTest.java b/junit5/src/test/java/com/baeldung/GreetingsTest.java new file mode 100644 index 0000000000..820bdf1e15 --- /dev/null +++ b/junit5/src/test/java/com/baeldung/GreetingsTest.java @@ -0,0 +1,19 @@ +package com.baeldung; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; + +import com.baeldung.junit5.mockito.Greetings; + +@RunWith(JUnitPlatform.class) +public class GreetingsTest { + + @Test + void whenCallingSayHello_thenReturnHello() { + assertTrue("Hello".equals(Greetings.sayHello())); + } + +} From 7c12965a4543183d1774b10c2b5583ebbc5bf8ab Mon Sep 17 00:00:00 2001 From: tamasradu Date: Wed, 1 Nov 2017 17:46:36 +0200 Subject: [PATCH 171/197] Radutamas/bael 1265 wait for threads to finish (#2933) * BAEL-1265: Adding jUnits for the article Wait for Threads in an ExecutorService to Finish * Fix for BAEL-1263 Daemon Threads in Java (commit: dbeb5f8ba461cfb12309b0cf2d9e6ad816de8297) * Ignored jUnits with daemon threads --- .../baeldung/concurrent/daemon/NewThread.java | 16 +- .../executorservice/DelayedCallable.java | 26 ++++ .../concurrent/daemon/DaemonThreadTest.java | 3 + .../WaitingForThreadsToFinishTest.java | 147 ++++++++++++++++++ 4 files changed, 189 insertions(+), 3 deletions(-) create mode 100644 core-java-concurrency/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java create mode 100644 core-java-concurrency/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishTest.java diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/daemon/NewThread.java b/core-java-concurrency/src/main/java/com/baeldung/concurrent/daemon/NewThread.java index 6ddcb954a1..d742d3a55f 100644 --- a/core-java-concurrency/src/main/java/com/baeldung/concurrent/daemon/NewThread.java +++ b/core-java-concurrency/src/main/java/com/baeldung/concurrent/daemon/NewThread.java @@ -3,8 +3,18 @@ package com.baeldung.concurrent.daemon; public class NewThread extends Thread { public void run() { - while (true) - for (int i = 0; i < 10; i++) - System.out.println("New Thread is running..."); + + long startTime = System.currentTimeMillis(); + while (true) { + for (int i = 0; i < 10; i++) { + System.out.println("New Thread is running..." + i); + } + + // prevent the Thread to run forever. It will finish it's execution after 2 seconds + if (System.currentTimeMillis() - startTime > 2000) { + Thread.currentThread().interrupt(); + break; + } + } } } diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java b/core-java-concurrency/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java new file mode 100644 index 0000000000..2f0796b491 --- /dev/null +++ b/core-java-concurrency/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java @@ -0,0 +1,26 @@ +package com.baeldung.concurrent.executorservice; + +import java.util.concurrent.Callable; + +public class DelayedCallable implements Callable { + + private String name; + private long period; + + public DelayedCallable(String name, long period) { + this.name = name; + this.period = period; + } + + public String call() { + + try { + Thread.sleep(period); + } catch (InterruptedException ex) { + // handle exception + ex.printStackTrace(); + } + + return name; + } +} diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java index 2c4eeb63d6..3ca69d8847 100644 --- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java +++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/daemon/DaemonThreadTest.java @@ -3,11 +3,13 @@ package com.baeldung.concurrent.daemon; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Ignore; import org.junit.Test; public class DaemonThreadTest { @Test + @Ignore public void whenCallIsDaemon_thenCorrect() { NewThread daemonThread = new NewThread(); NewThread userThread = new NewThread(); @@ -20,6 +22,7 @@ public class DaemonThreadTest { } @Test(expected = IllegalThreadStateException.class) + @Ignore public void givenUserThread_whenSetDaemonWhileRunning_thenIllegalThreadStateException() { NewThread daemonThread = new NewThread(); daemonThread.start(); diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishTest.java new file mode 100644 index 0000000000..0f461909ea --- /dev/null +++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishTest.java @@ -0,0 +1,147 @@ +package com.baeldung.concurrent.executorservice; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.*; + +import static junit.framework.TestCase.assertTrue; + +public class WaitingForThreadsToFinishTest { + + private static final Logger LOG = LoggerFactory.getLogger(WaitingForThreadsToFinishTest.class); + private final static ExecutorService WORKER_THREAD_POOL = Executors.newFixedThreadPool(10); + + @Test + public void givenMultipleThreads_whenInvokeAll_thenMainThreadShouldWaitForAllToFinish() { + + ExecutorService WORKER_THREAD_POOL = Executors.newFixedThreadPool(10); + + List> callables = Arrays.asList(new DelayedCallable("fast thread", 100), new DelayedCallable("slow thread", 3000)); + + try { + long startProcessingTime = System.currentTimeMillis(); + List> futures = WORKER_THREAD_POOL.invokeAll(callables); + + long totalProcessingTime = System.currentTimeMillis() - startProcessingTime; + assertTrue(totalProcessingTime >= 3000); + + String firstThreadResponse = futures.get(0) + .get(); + assertTrue("First response should be from the fast thread", "fast thread".equals(firstThreadResponse)); + + String secondThreadResponse = futures.get(1) + .get(); + assertTrue("Last response should be from the slow thread", "slow thread".equals(secondThreadResponse)); + + } catch (ExecutionException | InterruptedException ex) { + ex.printStackTrace(); + } + + WORKER_THREAD_POOL.shutdown(); + } + + @Test + public void givenMultipleThreads_whenUsingCompletionService_thenMainThreadShouldWaitForAllToFinish() { + + CompletionService service = new ExecutorCompletionService<>(WORKER_THREAD_POOL); + + List> callables = Arrays.asList(new DelayedCallable("fast thread", 100), new DelayedCallable("slow thread", 3000)); + + for (Callable callable : callables) { + service.submit(callable); + } + + WORKER_THREAD_POOL.shutdown(); + + try { + + long startProcessingTime = System.currentTimeMillis(); + + Future future = service.take(); + String firstThreadResponse = future.get(); + long totalProcessingTime = System.currentTimeMillis() - startProcessingTime; + + assertTrue("First response should be from the fast thread", "fast thread".equals(firstThreadResponse)); + assertTrue(totalProcessingTime >= 100 && totalProcessingTime < 1000); + LOG.debug("Thread finished after: " + totalProcessingTime + " milliseconds"); + + future = service.take(); + String secondThreadResponse = future.get(); + totalProcessingTime = System.currentTimeMillis() - startProcessingTime; + + assertTrue("Last response should be from the slow thread", "slow thread".equals(secondThreadResponse)); + assertTrue(totalProcessingTime >= 3000 && totalProcessingTime < 4000); + LOG.debug("Thread finished after: " + totalProcessingTime + " milliseconds"); + + } catch (ExecutionException | InterruptedException ex) { + ex.printStackTrace(); + } + + } + + @Test + public void givenMultipleThreads_whenUsingCompletableFutures_thenMainThreadShouldWaitForAllToFinish() { + + CompletableFuture future1 = CompletableFuture.supplyAsync(() -> { + + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + return "Hello"; + }); + + CompletableFuture future2 = CompletableFuture.supplyAsync(() -> { + + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + return "Beautiful"; + }); + + CompletableFuture future3 = CompletableFuture.supplyAsync(() -> { + + try { + Thread.sleep(3000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + return "World"; + }); + + long startProcessingTime = System.currentTimeMillis(); + CompletableFuture combinedFuture = CompletableFuture.allOf(future1, future2, future3); + combinedFuture.join(); + + long totalProcessingTime = System.currentTimeMillis() - startProcessingTime; + assertTrue(totalProcessingTime >= 5000 && totalProcessingTime < 6000); + + LOG.debug("Responses from all threads are available after " + totalProcessingTime + " milliseconds"); + + try { + String thread1Response = future1.get(); + assertTrue(thread1Response.equals("Hello")); + + String thread2Response = future2.get(); + assertTrue(thread2Response.equals("Beautiful")); + + String thread3Response = future3.get(); + assertTrue(thread3Response.equals("World")); + + } catch (InterruptedException | ExecutionException e) { + e.printStackTrace(); + } + + WORKER_THREAD_POOL.shutdown(); + } +} From d6cbbbedb48ba9c17589ffe956a79fde53cf92a7 Mon Sep 17 00:00:00 2001 From: eugenp Date: Thu, 2 Nov 2017 00:35:08 +0200 Subject: [PATCH 172/197] making the base package aligned with the site --- guest/spring-mvc/pom.xml | 2 +- .../guest/springmvc/Spring5Application.java | 4 ++-- .../guest/springmvc/model/LoginData.java | 2 +- .../guest/springmvc/web/InternalsController.java | 5 +++-- .../guest/springmvc/web/MyInputResource.java | 2 +- .../guest/springmvc/web/MyOutputResource.java | 2 +- .../guest/springmvc/web/RestfulWebServiceController.java | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) rename guest/spring-mvc/src/main/java/com/{forketyfork => stackify}/guest/springmvc/Spring5Application.java (76%) rename guest/spring-mvc/src/main/java/com/{forketyfork => stackify}/guest/springmvc/model/LoginData.java (89%) rename guest/spring-mvc/src/main/java/com/{forketyfork => stackify}/guest/springmvc/web/InternalsController.java (92%) rename guest/spring-mvc/src/main/java/com/{forketyfork => stackify}/guest/springmvc/web/MyInputResource.java (85%) rename guest/spring-mvc/src/main/java/com/{forketyfork => stackify}/guest/springmvc/web/MyOutputResource.java (85%) rename guest/spring-mvc/src/main/java/com/{forketyfork => stackify}/guest/springmvc/web/RestfulWebServiceController.java (87%) diff --git a/guest/spring-mvc/pom.xml b/guest/spring-mvc/pom.xml index 9974a76e8a..1f695a75a7 100644 --- a/guest/spring-mvc/pom.xml +++ b/guest/spring-mvc/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.forketyfork.guest + com.stackify.guest spring-mvc 0.0.1-SNAPSHOT jar diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/Spring5Application.java b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/Spring5Application.java similarity index 76% rename from guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/Spring5Application.java rename to guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/Spring5Application.java index d9af7c8ac9..42d40fa02d 100644 --- a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/Spring5Application.java +++ b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/Spring5Application.java @@ -1,11 +1,11 @@ -package com.forketyfork.guest.springmvc; +package com.stackify.guest.springmvc; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.boot.SpringApplication; @SpringBootApplication -@ComponentScan(basePackages = {"com.forketyfork.guest.springmvc"}) +@ComponentScan(basePackages = {"com.stackify.guest.springmvc"}) public class Spring5Application { public static void main(String[] args) { diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/model/LoginData.java b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/model/LoginData.java similarity index 89% rename from guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/model/LoginData.java rename to guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/model/LoginData.java index a9140da4f9..b1a0e86ef4 100644 --- a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/model/LoginData.java +++ b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/model/LoginData.java @@ -1,4 +1,4 @@ -package com.forketyfork.guest.springmvc.model; +package com.stackify.guest.springmvc.model; public class LoginData { diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/InternalsController.java similarity index 92% rename from guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java rename to guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/InternalsController.java index 04adb9211e..0bd8570eed 100644 --- a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/InternalsController.java +++ b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/InternalsController.java @@ -1,6 +1,5 @@ -package com.forketyfork.guest.springmvc.web; +package com.stackify.guest.springmvc.web; -import com.forketyfork.guest.springmvc.model.LoginData; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -8,6 +7,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import com.stackify.guest.springmvc.model.LoginData; + import java.util.Collections; @Controller diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyInputResource.java b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/MyInputResource.java similarity index 85% rename from guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyInputResource.java rename to guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/MyInputResource.java index 4c30cfb842..cf5815840a 100644 --- a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyInputResource.java +++ b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/MyInputResource.java @@ -1,4 +1,4 @@ -package com.forketyfork.guest.springmvc.web; +package com.stackify.guest.springmvc.web; public class MyInputResource { diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyOutputResource.java b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/MyOutputResource.java similarity index 85% rename from guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyOutputResource.java rename to guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/MyOutputResource.java index bcb76056a4..2d0e174243 100644 --- a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/MyOutputResource.java +++ b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/MyOutputResource.java @@ -1,4 +1,4 @@ -package com.forketyfork.guest.springmvc.web; +package com.stackify.guest.springmvc.web; public class MyOutputResource { diff --git a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/RestfulWebServiceController.java b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/RestfulWebServiceController.java similarity index 87% rename from guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/RestfulWebServiceController.java rename to guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/RestfulWebServiceController.java index 820c80db7a..edb35e6ecf 100644 --- a/guest/spring-mvc/src/main/java/com/forketyfork/guest/springmvc/web/RestfulWebServiceController.java +++ b/guest/spring-mvc/src/main/java/com/stackify/guest/springmvc/web/RestfulWebServiceController.java @@ -1,4 +1,4 @@ -package com.forketyfork.guest.springmvc.web; +package com.stackify.guest.springmvc.web; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; From 22f07214b12f7b95e0f8b3487ecb5f0a2ca79338 Mon Sep 17 00:00:00 2001 From: Muhammed Almas Date: Thu, 2 Nov 2017 13:14:45 +0530 Subject: [PATCH 173/197] BAEL-1247 Spring XML injection. (#2901) --- .../java/com/baeldung/di/spring/IService.java | 5 +++ .../java/com/baeldung/di/spring/IndexApp.java | 19 ++++++++ .../com/baeldung/di/spring/IndexService.java | 10 +++++ .../di/spring/InstanceServiceFactory.java | 14 ++++++ .../com/baeldung/di/spring/MessageApp.java | 14 ++++++ .../baeldung/di/spring/MessageService.java | 16 +++++++ .../di/spring/StaticServiceFactory.java | 14 ++++++ .../com.baeldung.di.spring.properties | 1 + .../main/resources/com.baeldung.di.spring.xml | 43 ++++++++++++++++++ .../baeldung/di/spring/BeanInjectionTest.java | 45 +++++++++++++++++++ 10 files changed, 181 insertions(+) create mode 100644 spring-core/src/main/java/com/baeldung/di/spring/IService.java create mode 100644 spring-core/src/main/java/com/baeldung/di/spring/IndexApp.java create mode 100644 spring-core/src/main/java/com/baeldung/di/spring/IndexService.java create mode 100644 spring-core/src/main/java/com/baeldung/di/spring/InstanceServiceFactory.java create mode 100644 spring-core/src/main/java/com/baeldung/di/spring/MessageApp.java create mode 100644 spring-core/src/main/java/com/baeldung/di/spring/MessageService.java create mode 100644 spring-core/src/main/java/com/baeldung/di/spring/StaticServiceFactory.java create mode 100644 spring-core/src/main/resources/com.baeldung.di.spring.properties create mode 100644 spring-core/src/main/resources/com.baeldung.di.spring.xml create mode 100644 spring-core/src/test/java/com/baeldung/di/spring/BeanInjectionTest.java diff --git a/spring-core/src/main/java/com/baeldung/di/spring/IService.java b/spring-core/src/main/java/com/baeldung/di/spring/IService.java new file mode 100644 index 0000000000..478eea0657 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/spring/IService.java @@ -0,0 +1,5 @@ +package com.baeldung.di.spring; + +public interface IService { + public String serve(); +} diff --git a/spring-core/src/main/java/com/baeldung/di/spring/IndexApp.java b/spring-core/src/main/java/com/baeldung/di/spring/IndexApp.java new file mode 100644 index 0000000000..a45970d6b2 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/spring/IndexApp.java @@ -0,0 +1,19 @@ +package com.baeldung.di.spring; + +public class IndexApp { + + private IService service; + + public String getServiceValue() { + return service.serve(); + } + + public IService getService() { + return service; + } + + public void setService(IService service) { + this.service = service; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/spring/IndexService.java b/spring-core/src/main/java/com/baeldung/di/spring/IndexService.java new file mode 100644 index 0000000000..ad241f5200 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/spring/IndexService.java @@ -0,0 +1,10 @@ +package com.baeldung.di.spring; + +public class IndexService implements IService { + + @Override + public String serve() { + return "Hello World"; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/spring/InstanceServiceFactory.java b/spring-core/src/main/java/com/baeldung/di/spring/InstanceServiceFactory.java new file mode 100644 index 0000000000..f083504e8f --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/spring/InstanceServiceFactory.java @@ -0,0 +1,14 @@ +package com.baeldung.di.spring; + +public class InstanceServiceFactory { + public IService getService(int number) { + switch (number) { + case 1: + return new MessageService("Foo"); + case 0: + return new IndexService(); + default: + throw new IllegalArgumentException("Unknown parameter " + number); + } + } +} diff --git a/spring-core/src/main/java/com/baeldung/di/spring/MessageApp.java b/spring-core/src/main/java/com/baeldung/di/spring/MessageApp.java new file mode 100644 index 0000000000..1bf6c20b28 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/spring/MessageApp.java @@ -0,0 +1,14 @@ +package com.baeldung.di.spring; + +public class MessageApp { + + private IService iService; + + public MessageApp(IService iService) { + this.iService = iService; + } + + public String getServiceValue() { + return iService.serve(); + } +} diff --git a/spring-core/src/main/java/com/baeldung/di/spring/MessageService.java b/spring-core/src/main/java/com/baeldung/di/spring/MessageService.java new file mode 100644 index 0000000000..9b6efaab2a --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/spring/MessageService.java @@ -0,0 +1,16 @@ +package com.baeldung.di.spring; + +public class MessageService implements IService { + + private String message; + + public MessageService(String message) { + this.message = message; + } + + @Override + public String serve() { + return message; + } + +} diff --git a/spring-core/src/main/java/com/baeldung/di/spring/StaticServiceFactory.java b/spring-core/src/main/java/com/baeldung/di/spring/StaticServiceFactory.java new file mode 100644 index 0000000000..bd70898faf --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/di/spring/StaticServiceFactory.java @@ -0,0 +1,14 @@ +package com.baeldung.di.spring; + +public class StaticServiceFactory { + public static IService getService(int number) { + switch (number) { + case 1: + return new MessageService("Foo"); + case 0: + return new IndexService(); + default: + throw new IllegalArgumentException("Unknown parameter " + number); + } + } +} diff --git a/spring-core/src/main/resources/com.baeldung.di.spring.properties b/spring-core/src/main/resources/com.baeldung.di.spring.properties new file mode 100644 index 0000000000..8b8b5b85c2 --- /dev/null +++ b/spring-core/src/main/resources/com.baeldung.di.spring.properties @@ -0,0 +1 @@ +message.value=Hello World \ No newline at end of file diff --git a/spring-core/src/main/resources/com.baeldung.di.spring.xml b/spring-core/src/main/resources/com.baeldung.di.spring.xml new file mode 100644 index 0000000000..9c44d911d1 --- /dev/null +++ b/spring-core/src/main/resources/com.baeldung.di.spring.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/test/java/com/baeldung/di/spring/BeanInjectionTest.java b/spring-core/src/test/java/com/baeldung/di/spring/BeanInjectionTest.java new file mode 100644 index 0000000000..1d133faf63 --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/di/spring/BeanInjectionTest.java @@ -0,0 +1,45 @@ +package com.baeldung.di.spring; + +import static org.junit.Assert.*; +import org.junit.Before; +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class BeanInjectionTest { + + private ApplicationContext applicationContext; + + @Before + public void setUp() throws Exception { + applicationContext = new ClassPathXmlApplicationContext("com.baeldung.di.spring.xml"); + } + + @Test + public void protoBean_getBean_returnsMultipleInstance() { + final MessageApp messageApp1 = applicationContext.getBean("messageWorldApp", MessageApp.class); + final MessageApp messageApp2 = applicationContext.getBean("messageWorldApp", MessageApp.class); + assertNotEquals(messageApp1, messageApp2); + } + + @Test + public void protoFactoryMethod_getBean_returnsMultipleInstance() { + final IndexApp indexApp1 = applicationContext.getBean("indexAppWithFactoryMethod", IndexApp.class); + final IndexApp indexApp2 = applicationContext.getBean("indexAppWithFactoryMethod", IndexApp.class); + assertNotEquals(indexApp1, indexApp2); + } + + @Test + public void protoStaticFactory_getBean_returnsMultipleInstance() { + final IndexApp indexApp1 = applicationContext.getBean("indexAppWithStaticFactory", IndexApp.class); + final IndexApp indexApp2 = applicationContext.getBean("indexAppWithStaticFactory", IndexApp.class); + assertNotEquals(indexApp1, indexApp2); + } + + @Test + public void singletonBean_getBean_returnsSingleInstance() { + final IndexApp indexApp1 = applicationContext.getBean("indexApp", IndexApp.class); + final IndexApp indexApp2 = applicationContext.getBean("indexApp", IndexApp.class); + assertEquals(indexApp1, indexApp2); + } +} From cd53b3e3d7452f588e8edbccb1a9241b0a1543cd Mon Sep 17 00:00:00 2001 From: lor6 Date: Thu, 2 Nov 2017 10:12:05 +0200 Subject: [PATCH 174/197] Update README.md --- hibernate5/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hibernate5/README.md b/hibernate5/README.md index ff12555376..9ef170a134 100644 --- a/hibernate5/README.md +++ b/hibernate5/README.md @@ -1 +1,3 @@ ## Relevant articles: + +- [Dynamic Mapping with Hibernate](http://www.baeldung.com/hibernate-dynamic-mapping) From a77a10a42a7cff7e8d3a56157a58b3032bd0a3cb Mon Sep 17 00:00:00 2001 From: Marcos Lopez Gonzalez Date: Thu, 2 Nov 2017 11:59:23 +0100 Subject: [PATCH 175/197] Greetings class moved to com.baeldung.junit5 package --- .../main/java/com/baeldung/junit5/{mockito => }/Greetings.java | 2 +- junit5/src/test/java/com/baeldung/GreetingsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename junit5/src/main/java/com/baeldung/junit5/{mockito => }/Greetings.java (72%) diff --git a/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java b/junit5/src/main/java/com/baeldung/junit5/Greetings.java similarity index 72% rename from junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java rename to junit5/src/main/java/com/baeldung/junit5/Greetings.java index 5391cbbc00..f43269f646 100644 --- a/junit5/src/main/java/com/baeldung/junit5/mockito/Greetings.java +++ b/junit5/src/main/java/com/baeldung/junit5/Greetings.java @@ -1,4 +1,4 @@ -package com.baeldung.junit5.mockito; +package com.baeldung.junit5; public class Greetings { diff --git a/junit5/src/test/java/com/baeldung/GreetingsTest.java b/junit5/src/test/java/com/baeldung/GreetingsTest.java index 820bdf1e15..e894d5857c 100644 --- a/junit5/src/test/java/com/baeldung/GreetingsTest.java +++ b/junit5/src/test/java/com/baeldung/GreetingsTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.junit.platform.runner.JUnitPlatform; import org.junit.runner.RunWith; -import com.baeldung.junit5.mockito.Greetings; +import com.baeldung.junit5.Greetings; @RunWith(JUnitPlatform.class) public class GreetingsTest { From 45997664ad890769dcb8a3118a58db69417d888c Mon Sep 17 00:00:00 2001 From: Bogdan Stoean <4540392+BogdanStoean@users.noreply.github.com> Date: Thu, 2 Nov 2017 17:44:01 +0200 Subject: [PATCH 176/197] Bael 1271 (#2907) * BAEL-1271 - initial commit * BAEL-1271 - created an admin server and a client app that registers to * BAEL-1271 - added security on admin server/on client actuator endpoints * BAEL-1271 - configured mail notifications * added unit test coverage * added unit test coverage * hipchat configuration --- spring-boot-admin/README.md | 1 + .../spring-boot-admin-client/.gitignore | 24 +++++ .../spring-boot-admin-client/pom.xml | 71 ++++++++++++++ .../SpringBootAdminClientApplication.java | 12 +++ .../src/main/resources/application.properties | 16 ++++ .../src/main/resources/logback.xml | 13 +++ ...SpringBootAdminClientApplicationTests.java | 55 +++++++++++ .../spring-boot-admin-server/.gitignore | 24 +++++ .../spring-boot-admin-server/pom.xml | 95 +++++++++++++++++++ .../SpringBootAdminServerApplication.java | 14 +++ .../configs/HazelcastConfig.java | 24 +++++ .../configs/NotifierConfiguration.java | 42 ++++++++ .../configs/WebSecurityConfig.java | 33 +++++++ .../src/main/resources/application.properties | 28 ++++++ .../src/main/resources/logback.xml | 13 +++ .../HazelcastConfigTest.java | 24 +++++ .../NotifierConfigurationTest.java | 41 ++++++++ .../WebSecurityConfigTest.java | 71 ++++++++++++++ 18 files changed, 601 insertions(+) create mode 100644 spring-boot-admin/README.md create mode 100644 spring-boot-admin/spring-boot-admin-client/.gitignore create mode 100644 spring-boot-admin/spring-boot-admin-client/pom.xml create mode 100644 spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java create mode 100644 spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties create mode 100644 spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml create mode 100644 spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationTests.java create mode 100644 spring-boot-admin/spring-boot-admin-server/.gitignore create mode 100644 spring-boot-admin/spring-boot-admin-server/pom.xml create mode 100644 spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java create mode 100644 spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java create mode 100644 spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java create mode 100644 spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java create mode 100644 spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties create mode 100644 spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml create mode 100644 spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigTest.java create mode 100644 spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationTest.java create mode 100644 spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigTest.java diff --git a/spring-boot-admin/README.md b/spring-boot-admin/README.md new file mode 100644 index 0000000000..4cea3f0611 --- /dev/null +++ b/spring-boot-admin/README.md @@ -0,0 +1 @@ +Spring Boot Admin \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-client/.gitignore b/spring-boot-admin/spring-boot-admin-client/.gitignore new file mode 100644 index 0000000000..2af7cefb0a --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-client/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-client/pom.xml b/spring-boot-admin/spring-boot-admin-client/pom.xml new file mode 100644 index 0000000000..ecb6c3f8b6 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-client/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + com.baeldung + spring-boot-admin-client + 0.0.1-SNAPSHOT + jar + + spring-boot-admin-client + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.5.8.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + 1.5.4 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-security + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin-starter-client.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + build-info + + + + + + + + + diff --git a/spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java b/spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java new file mode 100644 index 0000000000..596da131a6 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java @@ -0,0 +1,12 @@ +package com.baeldung.springbootadminclient; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringBootAdminClientApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringBootAdminClientApplication.class, args); + } +} diff --git a/spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties b/spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties new file mode 100644 index 0000000000..58c178ecd9 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties @@ -0,0 +1,16 @@ +#basic auth creddentials +security.user.name=client +security.user.password=client + +#configs to connect to a secured server +spring.boot.admin.url=http://localhost:8080 +spring.boot.admin.username=admin +spring.boot.admin.password=admin + +#configs to give secured server info +spring.boot.admin.client.metadata.user.name=${security.user.name} +spring.boot.admin.client.metadata.user.password=${security.user.password} + +#app config +spring.application.name=spring-boot-admin-client +server.port=8081 \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml b/spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml new file mode 100644 index 0000000000..ff96acae79 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + + %date [%thread] %-5level %logger{25} - %msg%n + + + + + + + \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationTests.java b/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationTests.java new file mode 100644 index 0000000000..d70fb1c7cf --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationTests.java @@ -0,0 +1,55 @@ +package com.baeldung.springbootadminclient; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.core.env.Environment; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import static org.junit.Assert.assertEquals; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = RANDOM_PORT) +public class SpringBootAdminClientApplicationTests { + + @Autowired Environment environment; + + @Autowired WebApplicationContext wac; + + private MockMvc mockMvc; + + @Before + public void setup() { + mockMvc = MockMvcBuilders + .webAppContextSetup(wac) + .build(); + } + + @Test + public void whenEnvironmentAvailable_ThenAdminServerPropertiesExist() { + assertEquals(environment.getProperty("spring.boot.admin.url"), "http://localhost:8080"); + assertEquals(environment.getProperty("spring.boot.admin.username"), "admin"); + assertEquals(environment.getProperty("spring.boot.admin.password"), "admin"); + } + + @Test + public void whenHttpBasicAttempted_ThenSuccess() throws Exception { + mockMvc.perform(get("/env").with(httpBasic("client", "client"))); + } + + @Test + public void whenInvalidHttpBasicAttempted_ThenUnauthorized() throws Exception { + mockMvc + .perform(get("/env").with(httpBasic("client", "invalid"))) + .andExpect(status().isUnauthorized()); + } +} diff --git a/spring-boot-admin/spring-boot-admin-server/.gitignore b/spring-boot-admin/spring-boot-admin-server/.gitignore new file mode 100644 index 0000000000..2af7cefb0a --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-server/pom.xml b/spring-boot-admin/spring-boot-admin-server/pom.xml new file mode 100644 index 0000000000..b199e63b31 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/pom.xml @@ -0,0 +1,95 @@ + + + 4.0.0 + + com.baeldung + spring-boot-admin-server + 0.0.1-SNAPSHOT + jar + + spring-boot-admin-server + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 1.5.8.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + 1.5.4 + 1.5.4 + + + + + org.springframework.boot + spring-boot-starter + + + + + de.codecentric + spring-boot-admin-server + ${spring-boot-admin-server.version} + + + de.codecentric + spring-boot-admin-server-ui + ${spring-boot-admin-server.version} + + + + + de.codecentric + spring-boot-admin-server-ui-login + ${spring-boot-admin-server.version} + + + org.springframework.boot + spring-boot-starter-security + + + com.hazelcast + hazelcast + + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin-starter-client.version} + + + + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java b/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java new file mode 100644 index 0000000000..d1fb4e769b --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java @@ -0,0 +1,14 @@ +package com.baeldung.springbootadminserver; + +import de.codecentric.boot.admin.config.EnableAdminServer; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@EnableAdminServer +@SpringBootApplication +public class SpringBootAdminServerApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringBootAdminServerApplication.class, args); + } +} diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java b/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java new file mode 100644 index 0000000000..b19b7820af --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java @@ -0,0 +1,24 @@ +package com.baeldung.springbootadminserver.configs; + +import com.hazelcast.config.Config; +import com.hazelcast.config.EvictionPolicy; +import com.hazelcast.config.ListConfig; +import com.hazelcast.config.MapConfig; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class HazelcastConfig { + + @Bean + public Config hazelcast() { + return new Config() + .setProperty("hazelcast.jmx", "true") + .addMapConfig(new MapConfig("spring-boot-admin-application-store") + .setBackupCount(1) + .setEvictionPolicy(EvictionPolicy.NONE)) + .addListConfig(new ListConfig("spring-boot-admin-event-store") + .setBackupCount(1) + .setMaxSize(1000)); + } +} diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java b/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java new file mode 100644 index 0000000000..10a31464ab --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java @@ -0,0 +1,42 @@ +package com.baeldung.springbootadminserver.configs; + +import de.codecentric.boot.admin.notify.LoggingNotifier; +import de.codecentric.boot.admin.notify.RemindingNotifier; +import de.codecentric.boot.admin.notify.filter.FilteringNotifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; + +import java.util.concurrent.TimeUnit; + +@Configuration +@EnableScheduling +public class NotifierConfiguration { + + // @Autowired private Notifier notifier; + + @Bean + public LoggingNotifier notifier() { + return new LoggingNotifier(); + } + + @Bean + public FilteringNotifier filteringNotifier() { + return new FilteringNotifier(notifier()); + } + + @Bean + @Primary + public RemindingNotifier remindingNotifier() { + RemindingNotifier remindingNotifier = new RemindingNotifier(filteringNotifier()); + remindingNotifier.setReminderPeriod(TimeUnit.MINUTES.toMillis(5)); + return remindingNotifier; + } + + @Scheduled(fixedRate = 60_000L) + public void remind() { + remindingNotifier().sendReminders(); + } +} diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java b/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java new file mode 100644 index 0000000000..4a7c8330b7 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java @@ -0,0 +1,33 @@ +package com.baeldung.springbootadminserver.configs; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@Configuration +public class WebSecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(HttpSecurity http) throws Exception { + http + .formLogin() + .loginPage("/login.html") + .loginProcessingUrl("/login") + .permitAll(); + http + .logout() + .logoutUrl("/logout"); + http + .csrf() + .disable(); + http + .authorizeRequests() + .antMatchers("/login.html", "/**/*.css", "/img/**", "/third-party/**") + .permitAll(); + http + .authorizeRequests() + .antMatchers("/**") + .authenticated(); + http.httpBasic(); + } +} diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties b/spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties new file mode 100644 index 0000000000..362f6428e8 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties @@ -0,0 +1,28 @@ +spring.application.name=spring-boot-admin-server + +security.user.name=admin +security.user.password=admin + +#configs to connect to self register the admin server as a client +spring.boot.admin.url=http://localhost:8080 +spring.boot.admin.username=${security.user.name} +spring.boot.admin.password=${security.user.password} + +#configs to give secured server info +spring.boot.admin.client.metadata.user.name=${security.user.name} +spring.boot.admin.client.metadata.user.password=${security.user.password} + +#mail notifications +#spring.mail.host=smtp.gmail.com +#spring.mail.username=test@gmail.com +#spring.mail.password=password +#spring.mail.port=587 +#spring.mail.properties.mail.smtp.auth=true +#spring.mail.properties.mail.smtp.starttls.enable=true + +#spring.boot.admin.notify.mail.to=test@gmail.com + +#hipchat notifications +#spring.boot.admin.notify.hipchat.auth-token= +#spring.boot.admin.notify.hipchat.room-id= +#spring.boot.admin.notify.hipchat.url=https://youcompany.hipchat.com/v2/ \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml b/spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml new file mode 100644 index 0000000000..ff96acae79 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + + %date [%thread] %-5level %logger{25} - %msg%n + + + + + + + \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigTest.java b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigTest.java new file mode 100644 index 0000000000..8ca50a6f75 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigTest.java @@ -0,0 +1,24 @@ +package com.baeldung.springbootadminserver; + +import com.baeldung.springbootadminserver.configs.HazelcastConfig; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.junit.Assert.assertNotEquals; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = { HazelcastConfig.class }, webEnvironment = NONE) +public class HazelcastConfigTest { + + @Autowired private ApplicationContext applicationContext; + + @Test + public void whenApplicationContextStarts_HazelcastConfigBeanExists() { + assertNotEquals(applicationContext.getBean("hazelcast"), null); + } +} diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationTest.java b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationTest.java new file mode 100644 index 0000000000..85f6b374a4 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationTest.java @@ -0,0 +1,41 @@ +package com.baeldung.springbootadminserver; + +import com.baeldung.springbootadminserver.configs.NotifierConfiguration; +import de.codecentric.boot.admin.notify.Notifier; +import de.codecentric.boot.admin.notify.RemindingNotifier; +import de.codecentric.boot.admin.notify.filter.FilteringNotifier; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.junit.Assert.assertNotEquals; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = { NotifierConfiguration.class }, webEnvironment = NONE) +public class NotifierConfigurationTest { + + @Autowired private ApplicationContext applicationContext; + + @Test + public void whenApplicationContextStart_ThenNotifierBeanExists() { + Notifier notifier = (Notifier) applicationContext.getBean("notifier"); + assertNotEquals(notifier, null); + } + + @Test + public void whenApplicationContextStart_ThenFilteringNotifierBeanExists() { + FilteringNotifier filteringNotifier = (FilteringNotifier) applicationContext.getBean("filteringNotifier"); + assertNotEquals(filteringNotifier, null); + } + + @Test + public void whenApplicationContextStart_ThenRemindingNotifierBeanExists() { + RemindingNotifier remindingNotifier = (RemindingNotifier) applicationContext.getBean("remindingNotifier"); + assertNotEquals(remindingNotifier, null); + } + +} diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigTest.java b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigTest.java new file mode 100644 index 0000000000..40611f00f6 --- /dev/null +++ b/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigTest.java @@ -0,0 +1,71 @@ +package com.baeldung.springbootadminserver; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public class WebSecurityConfigTest { + + @Autowired WebApplicationContext wac; + + private MockMvc mockMvc; + + @Before + public void setup() { + mockMvc = MockMvcBuilders + .webAppContextSetup(wac) + .build(); + } + + @Test + public void whenApplicationStarts_ThenGetLoginPageWithSuccess() throws Exception { + mockMvc + .perform(get("/login.html")) + .andExpect(status().is2xxSuccessful()); + } + + @Test + public void whenFormLoginAttempted_ThenSuccess() throws Exception { + mockMvc.perform(formLogin("/login") + .user("admin") + .password("admin")); + } + + @Test + public void whenFormLoginWithSuccess_ThenApiEndpointsAreAccessible() throws Exception { + mockMvc.perform(formLogin("/login") + .user("admin") + .password("admin")); + + mockMvc + .perform(get("/api/applications/")) + .andExpect(status().is2xxSuccessful()); + + } + + @Test + public void whenHttpBasicAttempted_ThenSuccess() throws Exception { + mockMvc.perform(get("/env").with(httpBasic("admin", "admin"))); + } + + @Test + public void whenInvalidHttpBasicAttempted_ThenUnauthorized() throws Exception { + mockMvc + .perform(get("/env").with(httpBasic("admin", "invalid"))) + .andExpect(status().isUnauthorized()); + } + +} From 52eb1380b62d19d5c1af706031f9a0111cf64f8c Mon Sep 17 00:00:00 2001 From: felipeazv Date: Thu, 2 Nov 2017 22:35:03 +0100 Subject: [PATCH 177/197] BAEL-803: Backward Chaining with Drools - new example (#2921) * spring beans DI examples * fix-1: shortening examples * List of Rules Engines in Java * BAEL-812: Openl-Tablets example added * BAEL-812: artifacts names changed * BAEL-812: moving rule-engines examples to rule-engines folder * BAEL-812: removing evaluation article files * BAEL-812: folder renamed * BAEL-812: folder renamed * BAEL-812: pom.xml - parent added * BAEL-1027: Introduction to GraphQL - initial commit * BAEL-781: Explore the new Spring Cloud Gateway * BAEL-781: Fix UserService.java * BAEL-781: Fix user-service pom.xml * BAEL-781: remove eureka-server from the example * BAEL-781: modifying example * BAEL-803: Backward Chaining wih Drools * BAEL-803: pom.xml * BAEL-803: Backward Chaining with Drools - new example --- .../com/baeldung/drools/BackwardChaining.java | 33 +++++++++ .../java/com/baeldung/drools/model/Fact.java | 69 +++++++++++++++++++ .../com/baeldung/drools/model/Result.java | 31 +++++++++ .../resources/META-INF/maven/pom.properties | 3 + .../resources/backward_chaining/rules.drl | 34 +++++++++ .../baeldung/test/BackwardChainingTest.java | 57 +++++++++++++++ 6 files changed, 227 insertions(+) create mode 100644 drools/backward-chaining/src/main/java/com/baeldung/drools/BackwardChaining.java create mode 100644 drools/backward-chaining/src/main/java/com/baeldung/drools/model/Fact.java create mode 100644 drools/backward-chaining/src/main/java/com/baeldung/drools/model/Result.java create mode 100644 drools/backward-chaining/src/main/resources/META-INF/maven/pom.properties create mode 100644 drools/backward-chaining/src/main/resources/backward_chaining/rules.drl create mode 100644 drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java diff --git a/drools/backward-chaining/src/main/java/com/baeldung/drools/BackwardChaining.java b/drools/backward-chaining/src/main/java/com/baeldung/drools/BackwardChaining.java new file mode 100644 index 0000000000..1c1d258b47 --- /dev/null +++ b/drools/backward-chaining/src/main/java/com/baeldung/drools/BackwardChaining.java @@ -0,0 +1,33 @@ +package com.baeldung.drools; + +import org.kie.api.KieServices; +import org.kie.api.runtime.KieContainer; +import org.kie.api.runtime.KieSession; + +import com.baeldung.drools.model.Fact; +import com.baeldung.drools.model.Result; + +public class BackwardChaining { + public static void main(String[] args) { + Result result = new BackwardChaining().backwardChaining(); + System.out.println(result.getValue()); + result.getFacts().stream().forEach(System.out::println); + } + + public Result backwardChaining() { + Result result = new Result(); + KieServices ks = KieServices.Factory.get(); + KieContainer kContainer = ks.getKieClasspathContainer(); + KieSession ksession = kContainer.newKieSession("ksession-backward-chaining"); + ksession.setGlobal("result", result); + ksession.insert(new Fact("Asia", "Planet Earth")); +// ksession.insert(new Fact("China", "Asia")); + ksession.insert(new Fact("Great Wall of China", "China")); + + ksession.fireAllRules(); + + return result; + + } + +} \ No newline at end of file diff --git a/drools/backward-chaining/src/main/java/com/baeldung/drools/model/Fact.java b/drools/backward-chaining/src/main/java/com/baeldung/drools/model/Fact.java new file mode 100644 index 0000000000..62b44b9d92 --- /dev/null +++ b/drools/backward-chaining/src/main/java/com/baeldung/drools/model/Fact.java @@ -0,0 +1,69 @@ +package com.baeldung.drools.model; + +import org.kie.api.definition.type.Position; + +public class Fact { + + @Position(0) + private String element; + + @Position(1) + private String place; + + public Fact(String element, String place) { + this.element = element; + this.place = place; + } + + public String getElement() { + return element; + } + + public void setElement(String element) { + this.element = element; + } + + public String getPlace() { + return place; + } + + public void setPlace(String place) { + this.place = place; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((element == null) ? 0 : element.hashCode()); + result = prime * result + ((place == null) ? 0 : place.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Fact other = (Fact) obj; + if (element == null) { + if (other.element != null) + return false; + } else if (!element.equals(other.element)) + return false; + if (place == null) { + if (other.place != null) + return false; + } else if (!place.equals(other.place)) + return false; + return true; + } + + @Override + public String toString() { + return "Fact{" + "element='" + element + '\'' + ", place='" + place + '\'' + '}'; + } +} \ No newline at end of file diff --git a/drools/backward-chaining/src/main/java/com/baeldung/drools/model/Result.java b/drools/backward-chaining/src/main/java/com/baeldung/drools/model/Result.java new file mode 100644 index 0000000000..b22557832b --- /dev/null +++ b/drools/backward-chaining/src/main/java/com/baeldung/drools/model/Result.java @@ -0,0 +1,31 @@ +package com.baeldung.drools.model; + +import java.util.ArrayList; +import java.util.List; + +public class Result { + private String value; + private List facts = new ArrayList<>(); + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public List getFacts() { + return facts; + } + + public void setFacts(List facts) { + this.facts = facts; + } + + public void addFact(String fact) { + this.facts.add(fact); + } + + +} diff --git a/drools/backward-chaining/src/main/resources/META-INF/maven/pom.properties b/drools/backward-chaining/src/main/resources/META-INF/maven/pom.properties new file mode 100644 index 0000000000..26d8331732 --- /dev/null +++ b/drools/backward-chaining/src/main/resources/META-INF/maven/pom.properties @@ -0,0 +1,3 @@ +groupId=com.baeldung.drools +artifactId=DroosBackwardChaining +version=1.0.0-SNAPSHOT diff --git a/drools/backward-chaining/src/main/resources/backward_chaining/rules.drl b/drools/backward-chaining/src/main/resources/backward_chaining/rules.drl new file mode 100644 index 0000000000..abcf95b9f1 --- /dev/null +++ b/drools/backward-chaining/src/main/resources/backward_chaining/rules.drl @@ -0,0 +1,34 @@ +package com.baeldung + +import com.baeldung.drools.model.Fact; + +global com.baeldung.drools.model.Result result; + +dialect "mvel" + +query belongsTo(String x, String y) + Fact(x, y;) + or + (Fact(z, y;) and belongsTo(x, z;)) +end + +rule "Great Wall of China BELONGS TO Planet Earth" +when + belongsTo("Great Wall of China", "Planet Earth";) +then + result.setValue("Decision one taken: Great Wall of China BELONGS TO Planet Earth"); +end + +rule "Great Wall of China DOES NOT BELONG TO of Planet Earth" +when + not belongsTo("Great Wall of China", "Planet Earth";) +then + result.setValue("Decision two taken: Great Wall of China DOES NOT BELONG TO Planet Earth"); +end + +rule "print all facts" +when + belongsTo(element, place;) +then + result.addFact(element + " IS ELEMENT OF " + place); +end diff --git a/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java b/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java new file mode 100644 index 0000000000..676e941950 --- /dev/null +++ b/drools/backward-chaining/src/test/java/com/baeldung/test/BackwardChainingTest.java @@ -0,0 +1,57 @@ +package com.baeldung.test; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.kie.api.KieServices; +import org.kie.api.runtime.KieContainer; +import org.kie.api.runtime.KieSession; + +import com.baeldung.drools.model.Fact; +import com.baeldung.drools.model.Result; + +import static junit.framework.TestCase.assertEquals; + +@RunWith(value = JUnit4.class) +public class BackwardChainingTest { + private Result result; + private KieServices ks; + private KieContainer kContainer; + private KieSession ksession; + + @Before + public void before() { + result = new Result(); + ks = KieServices.Factory.get(); + kContainer = ks.getKieClasspathContainer(); + ksession = kContainer.newKieSession("ksession-backward-chaining"); + ksession.setGlobal("result", result); + } + + @Test + public void whenWallOfChinaIsGiven_ThenItBelongsToPlanetEarth() { + + ksession.setGlobal("result", result); + ksession.insert(new Fact("Asia", "Planet Earth")); + ksession.insert(new Fact("China", "Asia")); + ksession.insert(new Fact("Great Wall of China", "China")); + + ksession.fireAllRules(); + + // Assert Decision one + assertEquals(result.getValue(), "Decision one taken: Great Wall of China BELONGS TO Planet Earth"); + } + + @Test + public void whenChinaIsNotGiven_ThenWallOfChinaDoesNotBelongToPlanetEarth() { + ksession.insert(new Fact("Asia", "Planet Earth")); + // ksession.insert(new Location("China", "Asia")); // not provided to force Decision two + ksession.insert(new Fact("Great Wall of China", "China")); + + ksession.fireAllRules(); + + // Assert Decision two + assertEquals(result.getValue(), "Decision two taken: Great Wall of China DOES NOT BELONG TO Planet Earth"); + } +} From 9414864a46c394c50f4183a0f969dd3958463986 Mon Sep 17 00:00:00 2001 From: Marcos Lopez Gonzalez Date: Thu, 2 Nov 2017 22:42:33 +0100 Subject: [PATCH 178/197] @RunWith in JUnit5 (#2935) * @RunWith in JUnit5 * Greetings class moved to com.baeldung.junit5 package --- .../java/com/baeldung/junit5/Greetings.java | 9 +++++++++ .../test/java/com/baeldung/GreetingsTest.java | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 junit5/src/main/java/com/baeldung/junit5/Greetings.java create mode 100644 junit5/src/test/java/com/baeldung/GreetingsTest.java diff --git a/junit5/src/main/java/com/baeldung/junit5/Greetings.java b/junit5/src/main/java/com/baeldung/junit5/Greetings.java new file mode 100644 index 0000000000..f43269f646 --- /dev/null +++ b/junit5/src/main/java/com/baeldung/junit5/Greetings.java @@ -0,0 +1,9 @@ +package com.baeldung.junit5; + +public class Greetings { + + public static String sayHello() { + return "Hello"; + } + +} diff --git a/junit5/src/test/java/com/baeldung/GreetingsTest.java b/junit5/src/test/java/com/baeldung/GreetingsTest.java new file mode 100644 index 0000000000..e894d5857c --- /dev/null +++ b/junit5/src/test/java/com/baeldung/GreetingsTest.java @@ -0,0 +1,19 @@ +package com.baeldung; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.junit.platform.runner.JUnitPlatform; +import org.junit.runner.RunWith; + +import com.baeldung.junit5.Greetings; + +@RunWith(JUnitPlatform.class) +public class GreetingsTest { + + @Test + void whenCallingSayHello_thenReturnHello() { + assertTrue("Hello".equals(Greetings.sayHello())); + } + +} From f98e86843ff589e151cf7f0046c74a7b6f70eb63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mitja=20Jeseni=C4=8Dnik=20Kotnik?= Date: Fri, 3 Nov 2017 00:37:35 +0100 Subject: [PATCH 179/197] list of users in servlet (#2930) --- .../src/main/java/TestEJBServlet.java | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java b/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java index 62feb6b4b9..e86f52ff56 100644 --- a/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java +++ b/ejb/wildfly/widlfly-web/src/main/java/TestEJBServlet.java @@ -1,5 +1,6 @@ import java.io.IOException; +import java.io.PrintWriter; import java.util.List; import javax.ejb.EJB; @@ -15,19 +16,32 @@ import wildfly.beans.UserBeanLocal; * Servlet implementation class TestEJBServlet */ public class TestEJBServlet extends HttpServlet { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - @EJB - private UserBeanLocal userBean; + @EJB + private UserBeanLocal userBean; - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - List users = userBean.getUsers(); + protected void doGet(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + List users = userBean.getUsers(); - response.getWriter() - .append("The number of users is: " + users.size()); - } + PrintWriter out = response.getWriter(); - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doGet(request, response); - } + out.println(""); + out.println("Users"); + out.println(""); + out.println("

    List of users:

    "); + out.println(""); + for (User user : users) { + out.println(""); + out.print(""); + out.print(""); + out.println(""); + } + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException { + doGet(request, response); + } } From 1f5b0a97494ecf1935704ae68a02a16259e59130 Mon Sep 17 00:00:00 2001 From: Alejandro Gervasio Date: Thu, 2 Nov 2017 20:50:15 -0300 Subject: [PATCH 180/197] Implementing the Template Method Pattern in Java - BAEL-1289 (#2923) * Initial Commit * Edit pom.xml * Changed ArtifactId --- patterns/template-method/pom.xml | 21 +++ .../application/Application.java | 18 +++ .../templatemethodpattern/model/Computer.java | 34 +++++ .../model/HighEndComputer.java | 34 +++++ .../model/StandardComputer.java | 34 +++++ .../TemplateMethodPatternTest.java | 120 ++++++++++++++++++ 6 files changed, 261 insertions(+) create mode 100644 patterns/template-method/pom.xml create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java create mode 100644 patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java create mode 100644 patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java diff --git a/patterns/template-method/pom.xml b/patterns/template-method/pom.xml new file mode 100644 index 0000000000..c3b6a084ac --- /dev/null +++ b/patterns/template-method/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + com.baeldung.templatemethodpattern + templatemethodpattern + 1.0 + jar + + UTF-8 + 1.8 + 1.8 + + + + junit + junit + 4.12 + test + + + \ No newline at end of file diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java new file mode 100644 index 0000000000..581c774f52 --- /dev/null +++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/application/Application.java @@ -0,0 +1,18 @@ +package com.baeldung.templatemethodpattern.application; + +import com.baeldung.templatemethodpattern.model.Computer; +import com.baeldung.templatemethodpattern.model.HighEndComputer; +import com.baeldung.templatemethodpattern.model.StandardComputer; + +public class Application { + + public static void main(String[] args) { + Computer standardComputer = new StandardComputer(); + standardComputer.buildComputer(); + standardComputer.getComputerParts().forEach((k, v) -> System.out.println("Part : " + k + " Value : " + v)); + + Computer highEndComputer = new HighEndComputer(); + highEndComputer.buildComputer(); + highEndComputer.getComputerParts().forEach((k, v) -> System.out.println("Part : " + k + " Value : " + v)); + } +} diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java new file mode 100644 index 0000000000..c5d1a2cde8 --- /dev/null +++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/Computer.java @@ -0,0 +1,34 @@ +package com.baeldung.templatemethodpattern.model; + +import java.util.HashMap; +import java.util.Map; + +public abstract class Computer { + + protected Map computerParts = new HashMap<>(); + + public final void buildComputer() { + addMotherboard(); + addProcessor(); + addMemory(); + addHardDrive(); + addGraphicCard(); + addSoundCard(); + } + + public abstract void addProcessor(); + + public abstract void addMotherboard(); + + public abstract void addMemory(); + + public abstract void addHardDrive(); + + public abstract void addGraphicCard(); + + public abstract void addSoundCard(); + + public Map getComputerParts() { + return computerParts; + } +} diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java new file mode 100644 index 0000000000..11baeca6f7 --- /dev/null +++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/HighEndComputer.java @@ -0,0 +1,34 @@ +package com.baeldung.templatemethodpattern.model; + +public class HighEndComputer extends Computer { + + @Override + public void addProcessor() { + computerParts.put("Processor", "High End Processor"); + } + + @Override + public void addMotherboard() { + computerParts.put("Motherboard", "High End Motherboard"); + } + + @Override + public void addMemory() { + computerParts.put("Memory", "16GB"); + } + + @Override + public void addHardDrive() { + computerParts.put("Hard Drive", "2TB Hard Drive"); + } + + @Override + public void addGraphicCard() { + computerParts.put("Graphic Card", "High End Graphic Card"); + } + + @Override + public void addSoundCard() { + computerParts.put("Sound Card", "High End Sound Card"); + } +} diff --git a/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java new file mode 100644 index 0000000000..22ff370203 --- /dev/null +++ b/patterns/template-method/src/main/java/com/baeldung/templatemethodpattern/model/StandardComputer.java @@ -0,0 +1,34 @@ +package com.baeldung.templatemethodpattern.model; + +public class StandardComputer extends Computer { + + @Override + public void addProcessor() { + computerParts.put("Processor", "Standard Processor"); + } + + @Override + public void addMotherboard() { + computerParts.put("Motherboard", "Standard Motherboard"); + } + + @Override + public void addMemory() { + computerParts.put("Memory", "8GB"); + } + + @Override + public void addHardDrive() { + computerParts.put("Hard Drive", "1TB Hard Drive"); + } + + @Override + public void addGraphicCard() { + computerParts.put("Graphic Card", "Standard Graphic Card"); + } + + @Override + public void addSoundCard() { + computerParts.put("Sound Card", "Standard Sound Card"); + } +} diff --git a/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java new file mode 100644 index 0000000000..afe66883ac --- /dev/null +++ b/patterns/template-method/src/test/java/com/baeldung/templatemethodpatterntest/TemplateMethodPatternTest.java @@ -0,0 +1,120 @@ +package com.baeldung.templatemethodpatterntest; + +import com.baeldung.templatemethodpattern.model.HighEndComputer; +import com.baeldung.templatemethodpattern.model.StandardComputer; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +public class TemplateMethodPatternTest { + + private static StandardComputer standardComputer; + private static HighEndComputer highEndComputer; + + @BeforeClass + public static void setUpStandardComputerInstance() { + standardComputer = new StandardComputer(); + } + + @BeforeClass + public static void setUpHighEndComputerInstance() { + highEndComputer = new HighEndComputer(); + } + + @Test + public void givenStandardProcessor_whenAddingProcessor_thenEqualAssertion() { + standardComputer.addProcessor(); + Assert.assertEquals("Standard Processor", standardComputer + .getComputerParts().get("Processor")); + } + + @Test + public void givenStandardMotherBoard_whenAddingMotherBoard_thenEqualAssertion() { + standardComputer.addMotherboard(); + Assert.assertEquals("Standard Motherboard", standardComputer + .getComputerParts().get("Motherboard")); + } + + @Test + public void givenStandardMemory_whenAddingMemory_thenEqualAssertion() { + standardComputer.addMemory(); + Assert.assertEquals("8GB", standardComputer + .getComputerParts().get("Memory")); + } + + @Test + public void givenStandardHardDrive_whenAddingHardDrive_thenEqualAssertion() { + standardComputer.addHardDrive(); + Assert.assertEquals("1TB Hard Drive", standardComputer + .getComputerParts().get("Hard Drive")); + } + + @Test + public void givenStandardGraphicaCard_whenAddingGraphicCard_thenEqualAssertion() { + standardComputer.addGraphicCard(); + Assert.assertEquals("Standard Graphic Card", standardComputer + .getComputerParts().get("Graphic Card")); + } + + @Test + public void givenStandardSoundCard_whenAddingSoundCard_thenEqualAssertion() { + standardComputer.addSoundCard(); + Assert.assertEquals("Standard Sound Card", standardComputer + .getComputerParts().get("Sound Card")); + } + + @Test + public void givenAllStandardParts_whenBuildingComputer_thenSixParts() { + standardComputer.buildComputer(); + Assert.assertEquals(6, standardComputer + .getComputerParts().size()); + } + + @Test + public void givenHightEndProcessor_whenAddingProcessor_thenEqualAssertion() { + highEndComputer.addProcessor(); + Assert.assertEquals("High End Processor", highEndComputer + .getComputerParts().get("Processor")); + } + + @Test + public void givenHighEnddMotherBoard_whenAddingMotherBoard_thenEqualAssertion() { + highEndComputer.addMotherboard(); + Assert.assertEquals("High End Motherboard", highEndComputer + .getComputerParts().get("Motherboard")); + } + + @Test + public void givenHighEndMemory_whenAddingMemory_thenEqualAssertion() { + highEndComputer.addMemory(); + Assert.assertEquals("16GB", highEndComputer + .getComputerParts().get("Memory")); + } + + @Test + public void givenHighEndHardDrive_whenAddingHardDrive_thenEqualAssertion() { + highEndComputer.addHardDrive(); + Assert.assertEquals("2TB Hard Drive", highEndComputer + .getComputerParts().get("Hard Drive")); + } + + @Test + public void givenHighEndGraphicCard_whenAddingGraphicCard_thenEqualAssertion() { + highEndComputer.addGraphicCard(); + Assert.assertEquals("High End Graphic Card", highEndComputer + .getComputerParts().get("Graphic Card")); + } + + @Test + public void givenHighEndSoundCard_whenAddingSoundCard_thenEqualAssertion() { + highEndComputer.addSoundCard(); + Assert.assertEquals("High End Sound Card", highEndComputer + .getComputerParts().get("Sound Card")); + } + + @Test + public void givenAllHighEndParts_whenBuildingComputer_thenSixParts() { + highEndComputer.buildComputer(); + Assert.assertEquals(6, highEndComputer.getComputerParts().size()); + } +} From 73ae3cfb1ab1e1039d1656a8bb9bacc509f527ba Mon Sep 17 00:00:00 2001 From: Michael C Good <31810784+michaelcgood@users.noreply.github.com> Date: Fri, 3 Nov 2017 10:09:31 -0400 Subject: [PATCH 181/197] BAEL-1238 (#2941) * michael.good703@gmail.com michael.good703@gmail.com * michael.good703@gmail.com michael.good703@gmail.com * michael.good703@gmail.com michael.good703@gmail.com * update * michael.good703@gmail.com Had to add @SpringBootApplication(exclude = MySQLAutoconfiguration.class) * Updated for 3.3.0.Final BAEL-1238 * Update pom.xml * BAEL-1238 Added new module spring-boot-keycloak and removed Keycloak code from spring-boot module * Minor changes to pom.xml * Update CustomConverterTest.java * Update StringToEmployeeConverter.java * Update GenericBigDecimalConverter.java * Update MyFeatures.java * Update .gitignore * Formatting changes * "Resolving conflicts" * Updated spring-boot to remove keycloak * Updated to see * Update * Updated * Found remnant file and deleted it --- spring-boot-keycloak/.gitignore | 24 ++ .../.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 47610 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + spring-boot-keycloak/mvnw | 225 ++++++++++++++++++ spring-boot-keycloak/mvnw.cmd | 143 +++++++++++ spring-boot-keycloak/pom.xml | 86 +++++++ .../java/com/baeldung/keycloak/Customer.java | 9 +- .../com/baeldung/keycloak/CustomerDAO.java | 0 .../com/baeldung/keycloak/SecurityConfig.java | 0 .../com/baeldung/keycloak/SpringBoot.java | 7 +- .../com/baeldung/keycloak/WebController.java | 0 .../src/main/resources/application.properties | 6 + .../main/resources/templates/customers.html | 33 +++ .../main/resources/templates/external.html | 31 +++ .../src/main/resources/templates/layout.html | 18 ++ .../keycloak/KeycloakConfigurationTest.java | 1 - spring-boot/pom.xml | 3 +- .../converter/GenericBigDecimalConverter.java | 2 +- .../converter/StringToEmployeeConverter.java | 2 +- .../src/main/resources/application.properties | 7 - .../converter/CustomConverterTest.java | 2 +- 21 files changed, 581 insertions(+), 19 deletions(-) create mode 100644 spring-boot-keycloak/.gitignore create mode 100644 spring-boot-keycloak/.mvn/wrapper/maven-wrapper.jar create mode 100644 spring-boot-keycloak/.mvn/wrapper/maven-wrapper.properties create mode 100755 spring-boot-keycloak/mvnw create mode 100644 spring-boot-keycloak/mvnw.cmd create mode 100644 spring-boot-keycloak/pom.xml rename {spring-boot => spring-boot-keycloak}/src/main/java/com/baeldung/keycloak/Customer.java (99%) rename {spring-boot => spring-boot-keycloak}/src/main/java/com/baeldung/keycloak/CustomerDAO.java (100%) rename {spring-boot => spring-boot-keycloak}/src/main/java/com/baeldung/keycloak/SecurityConfig.java (100%) rename {spring-boot => spring-boot-keycloak}/src/main/java/com/baeldung/keycloak/SpringBoot.java (68%) rename {spring-boot => spring-boot-keycloak}/src/main/java/com/baeldung/keycloak/WebController.java (100%) create mode 100644 spring-boot-keycloak/src/main/resources/application.properties create mode 100644 spring-boot-keycloak/src/main/resources/templates/customers.html create mode 100644 spring-boot-keycloak/src/main/resources/templates/external.html create mode 100644 spring-boot-keycloak/src/main/resources/templates/layout.html rename {spring-boot => spring-boot-keycloak}/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java (99%) diff --git a/spring-boot-keycloak/.gitignore b/spring-boot-keycloak/.gitignore new file mode 100644 index 0000000000..2af7cefb0a --- /dev/null +++ b/spring-boot-keycloak/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.jar b/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..9cc84ea9b4d95453115d0c26488d6a78694e0bc6 GIT binary patch literal 47610 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 literal 0 HcmV?d00001 diff --git a/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.properties b/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..9dda3b659b --- /dev/null +++ b/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip diff --git a/spring-boot-keycloak/mvnw b/spring-boot-keycloak/mvnw new file mode 100755 index 0000000000..5bf251c077 --- /dev/null +++ b/spring-boot-keycloak/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-boot-keycloak/mvnw.cmd b/spring-boot-keycloak/mvnw.cmd new file mode 100644 index 0000000000..019bd74d76 --- /dev/null +++ b/spring-boot-keycloak/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/spring-boot-keycloak/pom.xml b/spring-boot-keycloak/pom.xml new file mode 100644 index 0000000000..657f96a265 --- /dev/null +++ b/spring-boot-keycloak/pom.xml @@ -0,0 +1,86 @@ + + + 4.0.0 + + com.baeldung.keycloak + spring-boot-keycloak + 0.0.1 + jar + + spring-boot-keycloak + This is a simple application demonstrating integration between Keycloak and Spring Boot. + + + org.springframework.boot + spring-boot-starter-parent + 1.5.8.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + org.keycloak + keycloak-spring-boot-starter + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + org.hsqldb + hsqldb + runtime + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + + + org.keycloak.bom + keycloak-adapter-bom + 3.3.0.Final + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/Customer.java b/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/Customer.java similarity index 99% rename from spring-boot/src/main/java/com/baeldung/keycloak/Customer.java rename to spring-boot-keycloak/src/main/java/com/baeldung/keycloak/Customer.java index c35eebf4c5..3293446b1d 100644 --- a/spring-boot/src/main/java/com/baeldung/keycloak/Customer.java +++ b/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/Customer.java @@ -17,26 +17,33 @@ public class Customer { public long getId() { return id; } + public void setId(long id) { this.id = id; } + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public String getServiceRendered() { return serviceRendered; } + public void setServiceRendered(String serviceRendered) { this.serviceRendered = serviceRendered; } + public String getAddress() { return address; } + public void setAddress(String address) { this.address = address; } - + } diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/CustomerDAO.java b/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomerDAO.java similarity index 100% rename from spring-boot/src/main/java/com/baeldung/keycloak/CustomerDAO.java rename to spring-boot-keycloak/src/main/java/com/baeldung/keycloak/CustomerDAO.java diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/SecurityConfig.java b/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/SecurityConfig.java similarity index 100% rename from spring-boot/src/main/java/com/baeldung/keycloak/SecurityConfig.java rename to spring-boot-keycloak/src/main/java/com/baeldung/keycloak/SecurityConfig.java diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java b/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/SpringBoot.java similarity index 68% rename from spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java rename to spring-boot-keycloak/src/main/java/com/baeldung/keycloak/SpringBoot.java index 9904c66725..d67dd05fc7 100644 --- a/spring-boot/src/main/java/com/baeldung/keycloak/SpringBoot.java +++ b/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/SpringBoot.java @@ -3,15 +3,12 @@ package com.baeldung.keycloak; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - -import com.baeldung.autoconfiguration.MySQLAutoconfiguration; - -@SpringBootApplication(exclude = MySQLAutoconfiguration.class) +@SpringBootApplication public class SpringBoot { public static void main(String[] args) { SpringApplication.run(SpringBoot.class, args); -} + } } diff --git a/spring-boot/src/main/java/com/baeldung/keycloak/WebController.java b/spring-boot-keycloak/src/main/java/com/baeldung/keycloak/WebController.java similarity index 100% rename from spring-boot/src/main/java/com/baeldung/keycloak/WebController.java rename to spring-boot-keycloak/src/main/java/com/baeldung/keycloak/WebController.java diff --git a/spring-boot-keycloak/src/main/resources/application.properties b/spring-boot-keycloak/src/main/resources/application.properties new file mode 100644 index 0000000000..f667d3b27e --- /dev/null +++ b/spring-boot-keycloak/src/main/resources/application.properties @@ -0,0 +1,6 @@ +#Keycloak Configuration +keycloak.auth-server-url=http://localhost:8180/auth +keycloak.realm=SpringBootKeycloak +keycloak.resource=login-app +keycloak.public-client=true +keycloak.principal-attribute=preferred_username \ No newline at end of file diff --git a/spring-boot-keycloak/src/main/resources/templates/customers.html b/spring-boot-keycloak/src/main/resources/templates/customers.html new file mode 100644 index 0000000000..5a060d31da --- /dev/null +++ b/spring-boot-keycloak/src/main/resources/templates/customers.html @@ -0,0 +1,33 @@ + + + + + +
    +

    + Hello, --name--. +

    +
    " + user.getUsername() + "" + user.getEmail() + "
    + + + + + + + + + + + + + + + + +
    IDNameAddressService Rendered
    Text ...Text ...Text ...Text...
    + + + + + diff --git a/spring-boot-keycloak/src/main/resources/templates/external.html b/spring-boot-keycloak/src/main/resources/templates/external.html new file mode 100644 index 0000000000..2f9cc76961 --- /dev/null +++ b/spring-boot-keycloak/src/main/resources/templates/external.html @@ -0,0 +1,31 @@ + + + + + +
    +
    +

    Customer Portal

    +
    +
    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam + erat lectus, vehicula feugiat ultricies at, tempus sed ante. Cras + arcu erat, lobortis vitae quam et, mollis pharetra odio. Nullam sit + amet congue ipsum. Nunc dapibus odio ut ligula venenatis porta non + id dui. Duis nec tempor tellus. Suspendisse id blandit ligula, sit + amet varius mauris. Nulla eu eros pharetra, tristique dui quis, + vehicula libero. Aenean a neque sit amet tellus porttitor rutrum nec + at leo.

    + +

    Existing Customers

    +
    + Enter the intranet: customers +
    +
    + +
    + + + + diff --git a/spring-boot-keycloak/src/main/resources/templates/layout.html b/spring-boot-keycloak/src/main/resources/templates/layout.html new file mode 100644 index 0000000000..bab0c2982b --- /dev/null +++ b/spring-boot-keycloak/src/main/resources/templates/layout.html @@ -0,0 +1,18 @@ + + + +Customer Portal + + + + + \ No newline at end of file diff --git a/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java b/spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java similarity index 99% rename from spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java rename to spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java index 7d88c25909..41662e5c17 100644 --- a/spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java +++ b/spring-boot-keycloak/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java @@ -1,6 +1,5 @@ package com.baeldung.keycloak; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 583aaf2984..5e5f01013d 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -76,7 +76,6 @@ tomcat-embed-core ${tomcat.version} - org.apache.tomcat.embed tomcat-embed-jasper @@ -294,4 +293,4 @@ 2.4.1.Final - + \ No newline at end of file diff --git a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java b/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java index 7be038910b..1dbb7df6de 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java +++ b/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java @@ -35,4 +35,4 @@ public class GenericBigDecimalConverter implements GenericConverter { return converted.setScale(2, BigDecimal.ROUND_HALF_EVEN); } } -} +} \ No newline at end of file diff --git a/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java b/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java index d7356323ee..5f680972b7 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java +++ b/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java @@ -11,4 +11,4 @@ public class StringToEmployeeConverter implements Converter { String[] data = from.split(","); return new Employee(Long.parseLong(data[0]), Double.parseDouble(data[1])); } -} +} \ No newline at end of file diff --git a/spring-boot/src/main/resources/application.properties b/spring-boot/src/main/resources/application.properties index 18d1223d43..458b4e0d46 100644 --- a/spring-boot/src/main/resources/application.properties +++ b/spring-boot/src/main/resources/application.properties @@ -49,10 +49,3 @@ contactInfoType=email endpoints.beans.id=springbeans endpoints.beans.sensitive=false - -#Keycloak Configuration -keycloak.auth-server-url=http://localhost:8180/auth -keycloak.realm=SpringBootKeycloak -keycloak.resource=login-app -keycloak.public-client=true -keycloak.principal-attribute=preferred_username diff --git a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java index 0fd181c1de..6a585b9905 100644 --- a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java +++ b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java @@ -50,4 +50,4 @@ public class CustomConverterTest { assertThat(conversionService.convert("2.32", BigDecimal.class)) .isEqualTo(BigDecimal.valueOf(2.32)); } -} +} \ No newline at end of file From 2a18104f3cdda697a0f079cb2ae9c8b1220563f2 Mon Sep 17 00:00:00 2001 From: Bogdan Stoean <4540392+BogdanStoean@users.noreply.github.com> Date: Fri, 3 Nov 2017 22:14:57 +0200 Subject: [PATCH 182/197] Hotfix/bael 1271 (#2948) * BAEL-1271 - added parent-boot-5 as parent * BAEL-1271 - update README --- spring-boot-admin/README.md | 18 +++++++++++++++++- .../spring-boot-admin-client/pom.xml | 11 +++++------ .../spring-boot-admin-server/pom.xml | 11 +++++------ 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/spring-boot-admin/README.md b/spring-boot-admin/README.md index 4cea3f0611..622533a6ad 100644 --- a/spring-boot-admin/README.md +++ b/spring-boot-admin/README.md @@ -1 +1,17 @@ -Spring Boot Admin \ No newline at end of file +## 1. Spring Boot Admin Server + +* mvn clean install +* mvn spring-boot:run +* starts on port 8080 +* login with admin/admin +* to activate mail notifications uncomment the starter mail dependency +and the mail configuration from application.properties +* add some real credentials if you want the app to send emails +* to activate Hipchat notifications proceed same as for email + +## 2. Spring Boot App Client + +* mvn clean install +* mvn spring-boot:run +* starts on port 8081 +* basic auth client/client \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-client/pom.xml b/spring-boot-admin/spring-boot-admin-client/pom.xml index ecb6c3f8b6..accedca5cb 100644 --- a/spring-boot-admin/spring-boot-admin-client/pom.xml +++ b/spring-boot-admin/spring-boot-admin-client/pom.xml @@ -3,19 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung spring-boot-admin-client 0.0.1-SNAPSHOT jar spring-boot-admin-client - Demo project for Spring Boot + Spring Boot Admin Client - org.springframework.boot - spring-boot-starter-parent - 1.5.8.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-5 diff --git a/spring-boot-admin/spring-boot-admin-server/pom.xml b/spring-boot-admin/spring-boot-admin-server/pom.xml index b199e63b31..4922d56878 100644 --- a/spring-boot-admin/spring-boot-admin-server/pom.xml +++ b/spring-boot-admin/spring-boot-admin-server/pom.xml @@ -3,19 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung spring-boot-admin-server 0.0.1-SNAPSHOT jar spring-boot-admin-server - Demo project for Spring Boot + Spring Boot Admin Server - org.springframework.boot - spring-boot-starter-parent - 1.5.8.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-5 From 7bc6714340ce0e6f0aa913313709c5e7a578dcea Mon Sep 17 00:00:00 2001 From: Bogdan Stoean <4540392+BogdanStoean@users.noreply.github.com> Date: Sat, 4 Nov 2017 10:03:05 +0200 Subject: [PATCH 183/197] Hotfix/bael 1271 (#2953) * BAEL-1271 - added parent-boot-5 as parent * BAEL-1271 - update README * BAEL-1271 - created spring-boot-admin module --- pom.xml | 1 + spring-boot-admin/pom.xml | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 spring-boot-admin/pom.xml diff --git a/pom.xml b/pom.xml index 1f7a7996bf..9aa45b1d5d 100644 --- a/pom.xml +++ b/pom.xml @@ -256,6 +256,7 @@ vertx-and-rxjava saas deeplearning4j + spring-boot-admin diff --git a/spring-boot-admin/pom.xml b/spring-boot-admin/pom.xml new file mode 100644 index 0000000000..918eeaabeb --- /dev/null +++ b/spring-boot-admin/pom.xml @@ -0,0 +1,23 @@ + + 4.0.0 + spring-boot-admin + 0.0.1-SNAPSHOT + pom + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + UTF-8 + + + + spring-boot-admin-server + spring-boot-admin-client + + + \ No newline at end of file From bc899ef38ff54dcdbc60cc9e5ec1e7bb80c31a7b Mon Sep 17 00:00:00 2001 From: Sergey Petunin Date: Sat, 4 Nov 2017 11:50:01 +0100 Subject: [PATCH 184/197] BAEL-1221: Added README.md with build and run instructions (#2947) * BAEL-1221: Added README.md with build and run instructions * BAEL-1281: Hibernate - Mapping Date/Time values (java.util and java.time) --- guest/spring-mvc/README.md | 17 ++ .../com/baeldung/hibernate/HibernateUtil.java | 2 + .../hibernate/pojo/TemporalValues.java | 195 ++++++++++++++++++ .../hibernate/TemporalValuesTest.java | 126 +++++++++++ 4 files changed, 340 insertions(+) create mode 100644 guest/spring-mvc/README.md create mode 100644 hibernate5/src/main/java/com/baeldung/hibernate/pojo/TemporalValues.java create mode 100644 hibernate5/src/test/java/com/baeldung/hibernate/TemporalValuesTest.java diff --git a/guest/spring-mvc/README.md b/guest/spring-mvc/README.md new file mode 100644 index 0000000000..9e5cd64a04 --- /dev/null +++ b/guest/spring-mvc/README.md @@ -0,0 +1,17 @@ +## Building + +To build the module, use Maven's `package` goal: + +``` +mvn clean package +``` + +## Running + +To run the application, use Spring Boot's `run` goal: + +``` +mvn spring-boot:run +``` + +The application will be accessible at [http://localhost:8080/](http://localhost:8080/) diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java index 91392bd454..0282673218 100644 --- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java +++ b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java @@ -3,6 +3,7 @@ package com.baeldung.hibernate; import com.baeldung.hibernate.pojo.Employee; import com.baeldung.hibernate.pojo.EntityDescription; import com.baeldung.hibernate.pojo.Phone; +import com.baeldung.hibernate.pojo.TemporalValues; import org.hibernate.SessionFactory; import org.hibernate.boot.Metadata; import org.hibernate.boot.MetadataSources; @@ -31,6 +32,7 @@ public class HibernateUtil { metadataSources.addAnnotatedClass(Employee.class); metadataSources.addAnnotatedClass(Phone.class); metadataSources.addAnnotatedClass(EntityDescription.class); + metadataSources.addAnnotatedClass(TemporalValues.class); Metadata metadata = metadataSources.buildMetadata(); return metadata.getSessionFactoryBuilder() diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/TemporalValues.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/TemporalValues.java new file mode 100644 index 0000000000..f3fe095cae --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/TemporalValues.java @@ -0,0 +1,195 @@ +package com.baeldung.hibernate.pojo; + +import javax.persistence.*; +import java.io.Serializable; +import java.sql.Date; +import java.sql.Time; +import java.sql.Timestamp; +import java.time.*; +import java.util.Calendar; + +@Entity +public class TemporalValues implements Serializable { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Basic + private java.sql.Date sqlDate; + + @Basic + private java.sql.Time sqlTime; + + @Basic + private java.sql.Timestamp sqlTimestamp; + + @Basic + @Temporal(TemporalType.DATE) + private java.util.Date utilDate; + + @Basic + @Temporal(TemporalType.TIME) + private java.util.Date utilTime; + + @Basic + @Temporal(TemporalType.TIMESTAMP) + private java.util.Date utilTimestamp; + + @Basic + @Temporal(TemporalType.DATE) + private java.util.Calendar calendarDate; + + @Basic + @Temporal(TemporalType.TIMESTAMP) + private java.util.Calendar calendarTimestamp; + + @Basic + private java.time.LocalDate localDate; + + @Basic + private java.time.LocalTime localTime; + + @Basic + private java.time.OffsetTime offsetTime; + + @Basic + private java.time.Instant instant; + + @Basic + private java.time.LocalDateTime localDateTime; + + @Basic + private java.time.OffsetDateTime offsetDateTime; + + @Basic + private java.time.ZonedDateTime zonedDateTime; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public Date getSqlDate() { + return sqlDate; + } + + public void setSqlDate(Date sqlDate) { + this.sqlDate = sqlDate; + } + + public Time getSqlTime() { + return sqlTime; + } + + public void setSqlTime(Time sqlTime) { + this.sqlTime = sqlTime; + } + + public Timestamp getSqlTimestamp() { + return sqlTimestamp; + } + + public void setSqlTimestamp(Timestamp sqlTimestamp) { + this.sqlTimestamp = sqlTimestamp; + } + + public java.util.Date getUtilDate() { + return utilDate; + } + + public void setUtilDate(java.util.Date utilDate) { + this.utilDate = utilDate; + } + + public java.util.Date getUtilTime() { + return utilTime; + } + + public void setUtilTime(java.util.Date utilTime) { + this.utilTime = utilTime; + } + + public java.util.Date getUtilTimestamp() { + return utilTimestamp; + } + + public void setUtilTimestamp(java.util.Date utilTimestamp) { + this.utilTimestamp = utilTimestamp; + } + + public Calendar getCalendarDate() { + return calendarDate; + } + + public void setCalendarDate(Calendar calendarDate) { + this.calendarDate = calendarDate; + } + + public Calendar getCalendarTimestamp() { + return calendarTimestamp; + } + + public void setCalendarTimestamp(Calendar calendarTimestamp) { + this.calendarTimestamp = calendarTimestamp; + } + + public LocalDate getLocalDate() { + return localDate; + } + + public void setLocalDate(LocalDate localDate) { + this.localDate = localDate; + } + + public LocalTime getLocalTime() { + return localTime; + } + + public void setLocalTime(LocalTime localTime) { + this.localTime = localTime; + } + + public OffsetTime getOffsetTime() { + return offsetTime; + } + + public void setOffsetTime(OffsetTime offsetTime) { + this.offsetTime = offsetTime; + } + + public Instant getInstant() { + return instant; + } + + public void setInstant(Instant instant) { + this.instant = instant; + } + + public LocalDateTime getLocalDateTime() { + return localDateTime; + } + + public void setLocalDateTime(LocalDateTime localDateTime) { + this.localDateTime = localDateTime; + } + + public OffsetDateTime getOffsetDateTime() { + return offsetDateTime; + } + + public void setOffsetDateTime(OffsetDateTime offsetDateTime) { + this.offsetDateTime = offsetDateTime; + } + + public ZonedDateTime getZonedDateTime() { + return zonedDateTime; + } + + public void setZonedDateTime(ZonedDateTime zonedDateTime) { + this.zonedDateTime = zonedDateTime; + } +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/TemporalValuesTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/TemporalValuesTest.java new file mode 100644 index 0000000000..ec8afc8db2 --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/TemporalValuesTest.java @@ -0,0 +1,126 @@ +package com.baeldung.hibernate; + +import com.baeldung.hibernate.pojo.TemporalValues; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.time.*; +import java.util.Calendar; +import java.util.TimeZone; + +import static org.assertj.core.api.Assertions.assertThat; + +public class TemporalValuesTest { + + private Session session; + + private Transaction transaction; + + @Before + public void setUp() throws IOException { + session = HibernateUtil.getSessionFactory().withOptions() + .jdbcTimeZone(TimeZone.getTimeZone("UTC")) + .openSession(); + transaction = session.beginTransaction(); + session.createNativeQuery("delete from temporalvalues").executeUpdate(); + } + + @After + public void tearDown() { + transaction.rollback(); + session.close(); + } + + @Test + public void givenEntity_whenMappingSqlTypes_thenTemporalIsSelectedAutomatically() { + TemporalValues temporalValues = new TemporalValues(); + temporalValues.setSqlDate(java.sql.Date.valueOf("2017-11-15")); + temporalValues.setSqlTime(java.sql.Time.valueOf("15:30:14")); + temporalValues.setSqlTimestamp(java.sql.Timestamp.valueOf("2017-11-15 15:30:14.332")); + + session.save(temporalValues); + session.flush(); + session.clear(); + + temporalValues = session.get(TemporalValues.class, temporalValues.getId()); + assertThat(temporalValues.getSqlDate()).isEqualTo(java.sql.Date.valueOf("2017-11-15")); + assertThat(temporalValues.getSqlTime()).isEqualTo(java.sql.Time.valueOf("15:30:14")); + assertThat(temporalValues.getSqlTimestamp()).isEqualTo(java.sql.Timestamp.valueOf("2017-11-15 15:30:14.332")); + + } + + @Test + public void givenEntity_whenMappingUtilDateType_thenTemporalIsSpecifiedExplicitly() throws Exception { + TemporalValues temporalValues = new TemporalValues(); + temporalValues.setUtilDate(new SimpleDateFormat("yyyy-MM-dd").parse("2017-11-15")); + temporalValues.setUtilTime(new SimpleDateFormat("HH:mm:ss").parse("15:30:14")); + temporalValues.setUtilTimestamp(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").parse("2017-11-15 15:30:14.332")); + + session.save(temporalValues); + session.flush(); + session.clear(); + + temporalValues = session.get(TemporalValues.class, temporalValues.getId()); + assertThat(temporalValues.getUtilDate()).isEqualTo(new SimpleDateFormat("yyyy-MM-dd").parse("2017-11-15")); + assertThat(temporalValues.getUtilTime()).isEqualTo(new SimpleDateFormat("HH:mm:ss").parse("15:30:14")); + assertThat(temporalValues.getUtilTimestamp()).isEqualTo(java.sql.Timestamp.valueOf("2017-11-15 15:30:14.332")); + + } + + @Test + public void givenEntity_whenMappingCalendarType_thenTemporalIsSpecifiedExplicitly() throws Exception { + TemporalValues temporalValues = new TemporalValues(); + + Calendar calendarDate = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + calendarDate.set(Calendar.YEAR, 2017); + calendarDate.set(Calendar.MONTH, 10); + calendarDate.set(Calendar.DAY_OF_MONTH, 15); + temporalValues.setCalendarDate(calendarDate); + + Calendar calendarTimestamp = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + calendarTimestamp.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").parse("2017-11-15 15:30:14.322")); + temporalValues.setCalendarTimestamp(calendarTimestamp); + + session.save(temporalValues); + session.flush(); + session.clear(); + + temporalValues = session.get(TemporalValues.class, temporalValues.getId()); + assertThat(temporalValues.getCalendarDate().getTime()).isEqualTo(new SimpleDateFormat("yyyy-MM-dd").parse("2017-11-15")); + assertThat(temporalValues.getCalendarTimestamp().getTime()).isEqualTo(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").parse("2017-11-15 15:30:14.322")); + + } + + @Test + public void givenEntity_whenMappingJavaTimeTypes_thenTemporalIsSelectedAutomatically() { + TemporalValues temporalValues = new TemporalValues(); + + temporalValues.setLocalDate(LocalDate.parse("2017-11-15")); + temporalValues.setLocalTime(LocalTime.parse("15:30:18")); + temporalValues.setOffsetTime(OffsetTime.parse("08:22:12+01:00")); + temporalValues.setInstant(Instant.parse("2017-11-15T08:22:12Z")); + temporalValues.setLocalDateTime(LocalDateTime.parse("2017-11-15T08:22:12")); + temporalValues.setOffsetDateTime(OffsetDateTime.parse("2017-11-15T08:22:12+01:00")); + temporalValues.setZonedDateTime(ZonedDateTime.parse("2017-11-15T08:22:12+01:00[Europe/Paris]")); + + session.save(temporalValues); + session.flush(); + session.clear(); + + temporalValues = session.get(TemporalValues.class, temporalValues.getId()); + assertThat(temporalValues.getLocalDate()).isEqualTo(LocalDate.parse("2017-11-15")); + assertThat(temporalValues.getLocalTime()).isEqualTo(LocalTime.parse("15:30:18")); + assertThat(temporalValues.getOffsetTime()).isEqualTo(OffsetTime.parse("08:22:12+01:00")); + assertThat(temporalValues.getInstant()).isEqualTo(Instant.parse("2017-11-15T08:22:12Z")); + assertThat(temporalValues.getLocalDateTime()).isEqualTo(LocalDateTime.parse("2017-11-15T08:22:12")); + assertThat(temporalValues.getOffsetDateTime()).isEqualTo(OffsetDateTime.parse("2017-11-15T08:22:12+01:00")); + assertThat(temporalValues.getZonedDateTime()).isEqualTo(ZonedDateTime.parse("2017-11-15T08:22:12+01:00[Europe/Paris]")); + + } + +} From a3e241236b7f1f78c4c6b42509ec9da3b75f5116 Mon Sep 17 00:00:00 2001 From: Marcos Date: Sat, 4 Nov 2017 13:15:54 +0100 Subject: [PATCH 185/197] spring tests with JUnit 5 and ExtendWith --- junit5/pom.xml | 12 +++++++++++ .../junit5/spring/GreetingsSpringTest.java | 21 +++++++++++++++++++ .../spring/SpringTestConfiguration.java | 8 +++++++ 3 files changed, 41 insertions(+) create mode 100644 junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java create mode 100644 junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java diff --git a/junit5/pom.xml b/junit5/pom.xml index b820d7b7bc..b8a7622b3d 100644 --- a/junit5/pom.xml +++ b/junit5/pom.xml @@ -29,6 +29,7 @@ 3.6.0 2.19.1 4.12 + 5.0.1.RELEASE @@ -111,6 +112,17 @@ ${junit4.version} test + + org.springframework + spring-test + ${spring.version} + test + + + org.springframework + spring-context + ${spring.version} + diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java b/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java new file mode 100644 index 0000000000..d0045f0e5b --- /dev/null +++ b/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java @@ -0,0 +1,21 @@ +package com.baeldung.junit5.spring; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import com.baeldung.junit5.mockito.Greetings; + +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = { SpringTestConfiguration.class }) +public class GreetingsSpringTest { + + @Test + void whenCallingSayHello_thenReturnHello() { + assertTrue("Hello".equals(Greetings.sayHello())); + } + +} diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java b/junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java new file mode 100644 index 0000000000..7651b2bd41 --- /dev/null +++ b/junit5/src/test/java/com/baeldung/junit5/spring/SpringTestConfiguration.java @@ -0,0 +1,8 @@ +package com.baeldung.junit5.spring; + +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SpringTestConfiguration { + +} From efe0655cde1cb3d11602722df5753150d5e3594f Mon Sep 17 00:00:00 2001 From: Marcos Date: Sat, 4 Nov 2017 13:40:08 +0100 Subject: [PATCH 186/197] organize imports --- .../java/com/baeldung/junit5/spring/GreetingsSpringTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java b/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java index d0045f0e5b..e7a8a1c1e7 100644 --- a/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java +++ b/junit5/src/test/java/com/baeldung/junit5/spring/GreetingsSpringTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; -import com.baeldung.junit5.mockito.Greetings; +import com.baeldung.junit5.Greetings; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { SpringTestConfiguration.class }) From b32cd7a635d0668fedaf7a204d635880b9565d8c Mon Sep 17 00:00:00 2001 From: Yasin Bhojawala Date: Sat, 4 Nov 2017 18:12:45 +0530 Subject: [PATCH 187/197] Add example for implicit conversion in controller methods --- .../StringToEmployeeConverterController.java | 16 +++++++++ ...ringToEmployeeConverterControllerTest.java | 34 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java create mode 100644 spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java diff --git a/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java b/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java new file mode 100644 index 0000000000..edd56dc136 --- /dev/null +++ b/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java @@ -0,0 +1,16 @@ +package org.baeldung.converter.controller; + +import com.baeldung.toggle.Employee; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/string-to-employee") +public class StringToEmployeeConverterController { + + @GetMapping + public ResponseEntity getStringToEmployee(@RequestParam("employee") Employee employee) { + return ResponseEntity.ok(employee); + } +} diff --git a/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java new file mode 100644 index 0000000000..a5ed7998b4 --- /dev/null +++ b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java @@ -0,0 +1,34 @@ +package org.baeldung.converter.controller; + +import org.baeldung.Application; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +import static org.hamcrest.CoreMatchers.is; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) +@AutoConfigureMockMvc +public class StringToEmployeeConverterControllerTest { + + @Autowired + private MockMvc mockMvc; + + @Test + public void getStringToEmployeeTest() throws Exception { + mockMvc.perform(get("/string-to-employee?employee=1,2000")) + .andDo(print()) + .andExpect(jsonPath("$.id", is(1))) + .andExpect(jsonPath("$.salary", is(2000.0))) + .andExpect(status().isOk()); + } +} From 8e04a06bc916c1904c090a84e0918e3976f042bf Mon Sep 17 00:00:00 2001 From: lor6 Date: Sat, 4 Nov 2017 15:43:29 +0200 Subject: [PATCH 188/197] activiti with spring security example (#2909) --- spring-activiti/pom.xml | 9 +- .../java/com/baeldung/activiti/security.rar | Bin 0 -> 3760 bytes .../activiti/security/config/MvcConfig.java | 20 +++ .../security/config/ProcessController.java | 54 +++++++ .../config/SpringSecurityGroupManager.java | 86 +++++++++++ .../config/SpringSecurityUserManager.java | 144 ++++++++++++++++++ .../security/withactiviti/SecurityConfig.java | 47 ++++++ .../SpringSecurityActivitiApplication.java | 34 +++++ .../ActivitiSpringSecurityApplication.java | 39 +++++ .../security/withspring/SecurityConfig.java | 50 ++++++ spring-activiti/src/main/resources/data.sql | 3 + .../processes/protected-process.bpmn20.xml | 41 +++++ spring-activiti/src/main/resources/schema.sql | 3 + .../src/main/resources/templates/login.html | 21 +++ ...ActivitiSpringSecurityIntegrationTest.java | 31 ++++ 15 files changed, 581 insertions(+), 1 deletion(-) create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security.rar create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security/config/MvcConfig.java create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security/config/ProcessController.java create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security/config/SpringSecurityGroupManager.java create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security/config/SpringSecurityUserManager.java create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security/withactiviti/SecurityConfig.java create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security/withactiviti/SpringSecurityActivitiApplication.java create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/ActivitiSpringSecurityApplication.java create mode 100644 spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/SecurityConfig.java create mode 100644 spring-activiti/src/main/resources/data.sql create mode 100644 spring-activiti/src/main/resources/processes/protected-process.bpmn20.xml create mode 100644 spring-activiti/src/main/resources/schema.sql create mode 100644 spring-activiti/src/main/resources/templates/login.html create mode 100644 spring-activiti/src/test/java/com/example/activitiwithspring/ActivitiSpringSecurityIntegrationTest.java diff --git a/spring-activiti/pom.xml b/spring-activiti/pom.xml index c5289b20a6..f6f992b7c0 100644 --- a/spring-activiti/pom.xml +++ b/spring-activiti/pom.xml @@ -19,9 +19,11 @@ + com.example.activitiwithspring.ActivitiWithSpringApplication UTF-8 UTF-8 1.8 + 6.0.0 @@ -30,9 +32,14 @@ activiti-spring-boot-starter-basic 6.0.0 + + org.activiti + activiti-spring-boot-starter-security + ${activiti.version} + org.springframework.boot - spring-boot-starter-web + spring-boot-starter-thymeleaf diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security.rar b/spring-activiti/src/main/java/com/baeldung/activiti/security.rar new file mode 100644 index 0000000000000000000000000000000000000000..38c4946168a456265f5999633bc8cb581a8360cc GIT binary patch literal 3760 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 JUw{%B;9rQ$_E`V` literal 0 HcmV?d00001 diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/config/MvcConfig.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/MvcConfig.java new file mode 100644 index 0000000000..f9394742cd --- /dev/null +++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/MvcConfig.java @@ -0,0 +1,20 @@ +package com.baeldung.activiti.security.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; + +@Configuration +@EnableWebMvc +public class MvcConfig extends WebMvcConfigurerAdapter { + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.addViewController("/login") + .setViewName("login"); + registry.addViewController("/homepage") + .setViewName("homepage"); + } + +} diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/config/ProcessController.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/ProcessController.java new file mode 100644 index 0000000000..671b246328 --- /dev/null +++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/ProcessController.java @@ -0,0 +1,54 @@ +package com.baeldung.activiti.security.config; + +import java.util.List; + +import org.activiti.engine.IdentityService; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +import org.activiti.engine.runtime.ProcessInstance; +import org.activiti.engine.task.Task; +import org.activiti.spring.SpringProcessEngineConfiguration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ProcessController { + + @Autowired + private RuntimeService runtimeService; + + @Autowired + private TaskService taskService; + + @Autowired + private IdentityService identityService; + + @Autowired + SpringProcessEngineConfiguration config; + + @GetMapping("/protected-process") + public String startProcess() { + + String userId = SecurityContextHolder.getContext() + .getAuthentication() + .getName(); + + identityService.setAuthenticatedUserId(userId); + + ProcessInstance pi = runtimeService.startProcessInstanceByKey("protected-process"); + + List usertasks = taskService.createTaskQuery() + .processInstanceId(pi.getId()) + .list(); + + taskService.complete(usertasks.iterator() + .next() + .getId()); + + return "Process started. Number of currently running process instances = " + runtimeService.createProcessInstanceQuery() + .count(); + } + +} diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/config/SpringSecurityGroupManager.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/SpringSecurityGroupManager.java new file mode 100644 index 0000000000..00fc674e22 --- /dev/null +++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/SpringSecurityGroupManager.java @@ -0,0 +1,86 @@ +package com.baeldung.activiti.security.config; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.activiti.engine.identity.Group; +import org.activiti.engine.identity.GroupQuery; +import org.activiti.engine.impl.GroupQueryImpl; +import org.activiti.engine.impl.Page; +import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl; +import org.activiti.engine.impl.persistence.entity.GroupEntityImpl; +import org.activiti.engine.impl.persistence.entity.GroupEntityManagerImpl; +import org.activiti.engine.impl.persistence.entity.data.GroupDataManager; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.provisioning.JdbcUserDetailsManager; + +public class SpringSecurityGroupManager extends GroupEntityManagerImpl { + + private JdbcUserDetailsManager userManager; + + public SpringSecurityGroupManager(ProcessEngineConfigurationImpl processEngineConfiguration, GroupDataManager groupDataManager) { + super(processEngineConfiguration, groupDataManager); + } + + @Override + public List findGroupByQueryCriteria(GroupQueryImpl query, Page page) { + + if (query.getUserId() != null) { + return findGroupsByUser(query.getUserId()); + } + return null; + } + + @Override + public long findGroupCountByQueryCriteria(GroupQueryImpl query) { + return findGroupByQueryCriteria(query, null).size(); + } + + @Override + public List findGroupsByUser(String userId) { + UserDetails userDetails = userManager.loadUserByUsername(userId); + System.out.println("group manager"); + if (userDetails != null) { + List groups = userDetails.getAuthorities() + .stream() + .map(a -> a.getAuthority()) + .map(a -> { + Group g = new GroupEntityImpl(); + g.setId(a); + return g; + }) + .collect(Collectors.toList()); + return groups; + } + return null; + } + + public void setUserManager(JdbcUserDetailsManager userManager) { + this.userManager = userManager; + } + + public Group createNewGroup(String groupId) { + throw new UnsupportedOperationException("This operation is not supported!"); + + } + + @Override + public void delete(String groupId) { + throw new UnsupportedOperationException("This operation is not supported!"); + + } + + public GroupQuery createNewGroupQuery() { + throw new UnsupportedOperationException("This operation is not supported!"); + } + + public List findGroupsByNativeQuery(Map parameterMap, int firstResult, int maxResults) { + throw new UnsupportedOperationException("This operation is not supported!"); + } + + public long findGroupCountByNativeQuery(Map parameterMap) { + throw new UnsupportedOperationException("This operation is not supported!"); + } + +} diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/config/SpringSecurityUserManager.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/SpringSecurityUserManager.java new file mode 100644 index 0000000000..ce9863eb6c --- /dev/null +++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/config/SpringSecurityUserManager.java @@ -0,0 +1,144 @@ +package com.baeldung.activiti.security.config; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.activiti.engine.identity.Group; +import org.activiti.engine.identity.User; +import org.activiti.engine.identity.UserQuery; +import org.activiti.engine.impl.Page; +import org.activiti.engine.impl.UserQueryImpl; +import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl; +import org.activiti.engine.impl.persistence.entity.GroupEntityImpl; +import org.activiti.engine.impl.persistence.entity.UserEntity; +import org.activiti.engine.impl.persistence.entity.UserEntityImpl; +import org.activiti.engine.impl.persistence.entity.UserEntityManagerImpl; +import org.activiti.engine.impl.persistence.entity.data.UserDataManager; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.provisioning.JdbcUserDetailsManager; + +public class SpringSecurityUserManager extends UserEntityManagerImpl { + + private JdbcUserDetailsManager userManager; + + public SpringSecurityUserManager(ProcessEngineConfigurationImpl processEngineConfiguration, UserDataManager userDataManager, JdbcUserDetailsManager userManager) { + super(processEngineConfiguration, userDataManager); + this.userManager = userManager; + } + + @Override + public UserEntity findById(String userId) { + UserDetails userDetails = userManager.loadUserByUsername(userId); + if (userDetails != null) { + UserEntityImpl user = new UserEntityImpl(); + user.setId(userId); + return user; + } + return null; + + } + + @Override + public List findUserByQueryCriteria(UserQueryImpl query, Page page) { + List users = null; + if (query.getGroupId() != null) { + users = userManager.findUsersInGroup(query.getGroupId()) + .stream() + .map(username -> { + User user = new UserEntityImpl(); + user.setId(username); + return user; + }) + .collect(Collectors.toList()); + if (page != null) { + return users.subList(page.getFirstResult(), page.getFirstResult() + page.getMaxResults()); + + } + return users; + } + + if (query.getId() != null) { + UserDetails userDetails = userManager.loadUserByUsername(query.getId()); + if (userDetails != null) { + UserEntityImpl user = new UserEntityImpl(); + user.setId(query.getId()); + return Collections.singletonList(user); + } + } + return null; + } + + @Override + public Boolean checkPassword(String userId, String password) { + return true; + } + + public void setUserManager(JdbcUserDetailsManager userManager) { + this.userManager = userManager; + } + + public User createNewUser(String userId) { + throw new UnsupportedOperationException("This operation is not supported!"); + } + + public void updateUser(User updatedUser) { + throw new UnsupportedOperationException("This operation is not supported!"); + + } + + public void delete(UserEntity userEntity) { + throw new UnsupportedOperationException("This operation is not supported!"); + + } + + @Override + public void deletePicture(User user) { + UserEntity userEntity = (UserEntity) user; + if (userEntity.getPictureByteArrayRef() != null) { + userEntity.getPictureByteArrayRef() + .delete(); + } + } + + public void delete(String userId) { + throw new UnsupportedOperationException("This operation is not supported!"); + + } + + public long findUserCountByQueryCriteria(UserQueryImpl query) { + return findUserByQueryCriteria(query, null).size(); + } + + public List findGroupsByUser(String userId) { + UserDetails userDetails = userManager.loadUserByUsername(userId); + if (userDetails != null) { + List groups = userDetails.getAuthorities() + .stream() + .map(a -> a.getAuthority()) + .map(a -> { + Group g = new GroupEntityImpl(); + g.setId(a); + return g; + }) + .collect(Collectors.toList()); + return groups; + } + return null; + } + + public UserQuery createNewUserQuery() { + throw new UnsupportedOperationException("This operation is not supported!"); + } + + public List findUsersByNativeQuery(Map parameterMap, int firstResult, int maxResults) { + throw new UnsupportedOperationException("This operation is not supported!"); + } + + public long findUserCountByNativeQuery(Map parameterMap) { + throw new UnsupportedOperationException("This operation is not supported!"); + + } + +} diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/withactiviti/SecurityConfig.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/withactiviti/SecurityConfig.java new file mode 100644 index 0000000000..f471600553 --- /dev/null +++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/withactiviti/SecurityConfig.java @@ -0,0 +1,47 @@ +package com.baeldung.activiti.security.withactiviti; + +import org.activiti.engine.IdentityService; +import org.activiti.spring.security.IdentityServiceUserDetailsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@Configuration +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + protected void configure(HttpSecurity http) throws Exception { + http.antMatcher("/**") + .authorizeRequests() + .antMatchers("/protected-process*") + .authenticated() + .anyRequest() + .permitAll() + .and() + .formLogin() + .loginPage("/login") + .defaultSuccessUrl("/homepage") + .failureUrl("/login?error=true") + .and() + .csrf() + .disable() + .logout() + .logoutSuccessUrl("/login"); + } + + @Autowired + private IdentityService identityService; + + @Bean + public IdentityServiceUserDetailsService userDetailsService() { + return new IdentityServiceUserDetailsService(identityService); + } + + @Autowired + public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userDetailsService()); + } + +} diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/withactiviti/SpringSecurityActivitiApplication.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/withactiviti/SpringSecurityActivitiApplication.java new file mode 100644 index 0000000000..2270a4d684 --- /dev/null +++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/withactiviti/SpringSecurityActivitiApplication.java @@ -0,0 +1,34 @@ +package com.baeldung.activiti.security.withactiviti; + +import org.activiti.engine.IdentityService; +import org.activiti.engine.identity.Group; +import org.activiti.engine.identity.User; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication(scanBasePackages = { "com.baeldung.activiti.security.config", "com.baeldung.activiti.security.withactiviti" }) +public class SpringSecurityActivitiApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringSecurityActivitiApplication.class, args); + } + + @Bean + InitializingBean usersAndGroupsInitializer(IdentityService identityService) { + return new InitializingBean() { + public void afterPropertiesSet() throws Exception { + User user = identityService.newUser("activiti_user"); + user.setPassword("pass"); + identityService.saveUser(user); + + Group group = identityService.newGroup("user"); + group.setName("ROLE_USER"); + group.setType("USER"); + identityService.saveGroup(group); + identityService.createMembership(user.getId(), group.getId()); + } + }; + } +} diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/ActivitiSpringSecurityApplication.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/ActivitiSpringSecurityApplication.java new file mode 100644 index 0000000000..5878a5d678 --- /dev/null +++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/ActivitiSpringSecurityApplication.java @@ -0,0 +1,39 @@ +package com.baeldung.activiti.security.withspring; + +import org.activiti.engine.impl.persistence.entity.data.impl.MybatisGroupDataManager; +import org.activiti.engine.impl.persistence.entity.data.impl.MybatisUserDataManager; +import org.activiti.spring.SpringProcessEngineConfiguration; +import org.activiti.spring.boot.SecurityAutoConfiguration; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.security.provisioning.JdbcUserDetailsManager; + +import com.baeldung.activiti.security.config.SpringSecurityGroupManager; +import com.baeldung.activiti.security.config.SpringSecurityUserManager; + +@SpringBootApplication(exclude = SecurityAutoConfiguration.class, scanBasePackages = { "com.baeldung.activiti.security.config", "com.baeldung.activiti.security.withspring" }) +public class ActivitiSpringSecurityApplication { + + public static void main(String[] args) { + SpringApplication.run(ActivitiSpringSecurityApplication.class, args); + } + + @Autowired + private SpringProcessEngineConfiguration processEngineConfiguration; + + @Autowired + private JdbcUserDetailsManager userManager; + + @Bean + InitializingBean processEngineInitializer() { + return new InitializingBean() { + public void afterPropertiesSet() throws Exception { + processEngineConfiguration.setUserEntityManager(new SpringSecurityUserManager(processEngineConfiguration, new MybatisUserDataManager(processEngineConfiguration), userManager)); + processEngineConfiguration.setGroupEntityManager(new SpringSecurityGroupManager(processEngineConfiguration, new MybatisGroupDataManager(processEngineConfiguration))); + } + }; + } +} diff --git a/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/SecurityConfig.java b/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/SecurityConfig.java new file mode 100644 index 0000000000..df1991c3e4 --- /dev/null +++ b/spring-activiti/src/main/java/com/baeldung/activiti/security/withspring/SecurityConfig.java @@ -0,0 +1,50 @@ +package com.baeldung.activiti.security.withspring; + +import javax.sql.DataSource; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.provisioning.JdbcUserDetailsManager; + +@Configuration +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + private DataSource dataSource; + + protected void configure(HttpSecurity http) throws Exception { + http.antMatcher("/**") + .authorizeRequests() + .antMatchers("/protected-process*") + .authenticated() + .anyRequest() + .permitAll() + .and() + .formLogin() + .loginPage("/login") + .defaultSuccessUrl("/homepage") + .failureUrl("/login?error=true") + .and() + .csrf() + .disable() + .logout() + .logoutSuccessUrl("/login"); + } + + @Bean + public JdbcUserDetailsManager userDetailsManager() { + JdbcUserDetailsManager manager = new JdbcUserDetailsManager(); + manager.setDataSource(dataSource); + return manager; + } + + @Autowired + public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(userDetailsManager()); + } + +} diff --git a/spring-activiti/src/main/resources/data.sql b/spring-activiti/src/main/resources/data.sql new file mode 100644 index 0000000000..cb9b72617a --- /dev/null +++ b/spring-activiti/src/main/resources/data.sql @@ -0,0 +1,3 @@ +insert into users(username, password, enabled) values ('spring_user', 'pass', true); + +insert into authorities(username, authority) values ('spring_user','ROLE_USER'); \ No newline at end of file diff --git a/spring-activiti/src/main/resources/processes/protected-process.bpmn20.xml b/spring-activiti/src/main/resources/processes/protected-process.bpmn20.xml new file mode 100644 index 0000000000..b7e04515cd --- /dev/null +++ b/spring-activiti/src/main/resources/processes/protected-process.bpmn20.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + ROLE_USER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-activiti/src/main/resources/schema.sql b/spring-activiti/src/main/resources/schema.sql new file mode 100644 index 0000000000..bf882895fd --- /dev/null +++ b/spring-activiti/src/main/resources/schema.sql @@ -0,0 +1,3 @@ +create table users(username varchar(255), password varchar(255), enabled boolean); + +create table authorities(username varchar(255),authority varchar(255)); \ No newline at end of file diff --git a/spring-activiti/src/main/resources/templates/login.html b/spring-activiti/src/main/resources/templates/login.html new file mode 100644 index 0000000000..53077fd5f3 --- /dev/null +++ b/spring-activiti/src/main/resources/templates/login.html @@ -0,0 +1,21 @@ + + + +

    Login

    +
    + + + + + + + + + + + + +
    User:
    Password:
    +
    + + \ No newline at end of file diff --git a/spring-activiti/src/test/java/com/example/activitiwithspring/ActivitiSpringSecurityIntegrationTest.java b/spring-activiti/src/test/java/com/example/activitiwithspring/ActivitiSpringSecurityIntegrationTest.java new file mode 100644 index 0000000000..c2eeb96555 --- /dev/null +++ b/spring-activiti/src/test/java/com/example/activitiwithspring/ActivitiSpringSecurityIntegrationTest.java @@ -0,0 +1,31 @@ +package com.example.activitiwithspring; + +import org.activiti.engine.IdentityService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +import com.baeldung.activiti.security.withspring.ActivitiSpringSecurityApplication; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = ActivitiSpringSecurityApplication.class) +@WebAppConfiguration +public class ActivitiSpringSecurityIntegrationTest { + @Autowired + private IdentityService identityService; + + @Test + public void whenUserExists_thenOk() { + identityService.setUserPicture("spring_user", null); + } + + @Test(expected = UsernameNotFoundException.class) + public void whenUserNonExistent_thenSpringException() { + identityService.setUserPicture("user3", null); + } + +} From b4c327ea4f91045d4ce899d53852dd3d47a9978e Mon Sep 17 00:00:00 2001 From: Marco Battaglia Date: Sat, 4 Nov 2017 14:43:56 +0100 Subject: [PATCH 189/197] Fixed error on AopConfiguration (#2946) * com. to org. * changed all 'com.baeldung ' in 'org.baeldung' in order to make AopConfiguration class able to work --- .../org/baeldung/performancemonitor/AopConfiguration.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-aop/src/main/java/org/baeldung/performancemonitor/AopConfiguration.java b/spring-aop/src/main/java/org/baeldung/performancemonitor/AopConfiguration.java index a5f36fb716..00026baf07 100644 --- a/spring-aop/src/main/java/org/baeldung/performancemonitor/AopConfiguration.java +++ b/spring-aop/src/main/java/org/baeldung/performancemonitor/AopConfiguration.java @@ -16,10 +16,10 @@ import java.time.Month; @EnableAspectJAutoProxy public class AopConfiguration { - @Pointcut("execution(public String com.baeldung.performancemonitor.PersonService.getFullName(..))") + @Pointcut("execution(public String org.baeldung.performancemonitor.PersonService.getFullName(..))") public void monitor() { } - @Pointcut("execution(public int com.baeldung.performancemonitor.PersonService.getAge(..))") + @Pointcut("execution(public int org.baeldung.performancemonitor.PersonService.getAge(..))") public void myMonitor() { } @Bean @@ -30,7 +30,7 @@ public class AopConfiguration { @Bean public Advisor performanceMonitorAdvisor() { AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut(); - pointcut.setExpression("com.baeldung.performancemonitor.AopConfiguration.monitor()"); + pointcut.setExpression("org.baeldung.performancemonitor.AopConfiguration.monitor()"); return new DefaultPointcutAdvisor(pointcut, performanceMonitorInterceptor()); } @@ -52,7 +52,7 @@ public class AopConfiguration { @Bean public Advisor myPerformanceMonitorAdvisor() { AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut(); - pointcut.setExpression("com.baeldung.performancemonitor.AopConfiguration.myMonitor()"); + pointcut.setExpression("org.baeldung.performancemonitor.AopConfiguration.myMonitor()"); return new DefaultPointcutAdvisor(pointcut, myPerformanceMonitorInterceptor()); } From 1e13b57895330195daa2718c8be18ce8e2f76260 Mon Sep 17 00:00:00 2001 From: Sergey Travin Date: Sat, 4 Nov 2017 19:46:53 +0600 Subject: [PATCH 190/197] Minor fixes (#2865) * Update README.md * Fix duplicate dependency in pom.xml --- log4j/pom.xml | 6 ------ spring-jms/README.md | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/log4j/pom.xml b/log4j/pom.xml index 2e73baac49..20906c4c05 100644 --- a/log4j/pom.xml +++ b/log4j/pom.xml @@ -26,12 +26,6 @@ ${log4j.version}     - - log4j - apache-log4j-extras - ${log4j.version} - - org.apache.logging.log4j diff --git a/spring-jms/README.md b/spring-jms/README.md index 9093937f44..b942cc72a0 100644 --- a/spring-jms/README.md +++ b/spring-jms/README.md @@ -1,2 +1,2 @@ -###Relevant Articles: +### Relevant Articles: - [An Introduction To Spring JMS](http://www.baeldung.com/spring-jms) From 7a2d2c5fb0581b1b0dbe5b213a97c980c3aa1d1f Mon Sep 17 00:00:00 2001 From: Buddhini Samarakkody Date: Sat, 4 Nov 2017 19:17:25 +0530 Subject: [PATCH 191/197] More code changes for BAEL-656 (#2900) * Java Config file for LocalSessionFactoryBean * Remove test class * Remove test class * Add new test classes for BAEL-656 * remove unused spring config BAEL-656 * modification in test method * change in test method * change in test method --- .../spring/PersistenceConfigHibernate3.java | 81 +++++++++++++++++++ ...nateExceptionScen1MainIntegrationTest.java | 43 ++++++++++ ...nateExceptionScen2MainIntegrationTest.java | 45 +++++++++++ 3 files changed, 169 insertions(+) create mode 100644 spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfigHibernate3.java create mode 100644 spring-hibernate3/src/test/java/org/baeldung/persistence/service/HibernateExceptionScen1MainIntegrationTest.java create mode 100644 spring-hibernate3/src/test/java/org/baeldung/persistence/service/HibernateExceptionScen2MainIntegrationTest.java diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfigHibernate3.java b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfigHibernate3.java new file mode 100644 index 0000000000..a128d8848c --- /dev/null +++ b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfigHibernate3.java @@ -0,0 +1,81 @@ +package org.baeldung.spring; + +import java.util.Properties; + +import javax.sql.DataSource; + +import org.apache.tomcat.dbcp.dbcp2.BasicDataSource; +import org.hibernate.SessionFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; +import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; +import org.springframework.orm.hibernate3.HibernateTransactionManager; +import org.springframework.orm.hibernate3.LocalSessionFactoryBean; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import com.google.common.base.Preconditions; + +@Configuration +@EnableTransactionManagement +@PropertySource({ "classpath:persistence-h2.properties" }) +@ComponentScan({ "org.baeldung.persistence.dao", "org.baeldung.persistence.service" }) +public class PersistenceConfigHibernate3 { + + @Autowired + private Environment env; + + public PersistenceConfigHibernate3() { + super(); + } + + @Bean + public LocalSessionFactoryBean sessionFactory() { + final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean(); + Resource config = new ClassPathResource("exceptionDemo.cfg.xml"); + sessionFactory.setDataSource(dataSource()); + sessionFactory.setConfigLocation(config); + sessionFactory.setHibernateProperties(hibernateProperties()); + + return sessionFactory; + } + + @Bean + public DataSource dataSource() { + final BasicDataSource dataSource = new BasicDataSource(); + dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName"))); + dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url"))); + dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user"))); + dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass"))); + + return dataSource; + } + + @Bean + @Autowired + public HibernateTransactionManager transactionManager(final SessionFactory sessionFactory) { + final HibernateTransactionManager txManager = new HibernateTransactionManager(); + txManager.setSessionFactory(sessionFactory); + + return txManager; + } + + @Bean + public PersistenceExceptionTranslationPostProcessor exceptionTranslation() { + return new PersistenceExceptionTranslationPostProcessor(); + } + + final Properties hibernateProperties() { + final Properties hibernateProperties = new Properties(); + hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto")); + hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect")); + // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true"); + return hibernateProperties; + } + +} diff --git a/spring-hibernate3/src/test/java/org/baeldung/persistence/service/HibernateExceptionScen1MainIntegrationTest.java b/spring-hibernate3/src/test/java/org/baeldung/persistence/service/HibernateExceptionScen1MainIntegrationTest.java new file mode 100644 index 0000000000..d53c4445a8 --- /dev/null +++ b/spring-hibernate3/src/test/java/org/baeldung/persistence/service/HibernateExceptionScen1MainIntegrationTest.java @@ -0,0 +1,43 @@ +package org.baeldung.persistence.service; + +import java.util.List; + +import org.baeldung.persistence.model.Event; +import org.baeldung.spring.PersistenceConfigHibernate3; +import org.hamcrest.core.IsInstanceOf; +import org.hibernate.HibernateException; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { PersistenceConfigHibernate3.class }, loader = AnnotationConfigContextLoader.class) +public class HibernateExceptionScen1MainIntegrationTest { + + @Autowired + EventService service; + + @Rule + public ExpectedException expectedEx = ExpectedException.none(); + + @Test + public final void whenEntityIsCreated_thenNoExceptions() { + service.create(new Event("from LocalSessionFactoryBean")); + } + + @Test + @Ignore + public final void whenNoTransBoundToSession_thenException() { + expectedEx.expectCause(IsInstanceOf.instanceOf(HibernateException.class)); + expectedEx.expectMessage("No Hibernate Session bound to thread, " + + "and configuration does not allow creation " + + "of non-transactional one here"); + service.create(new Event("from LocalSessionFactoryBean")); + } +} diff --git a/spring-hibernate3/src/test/java/org/baeldung/persistence/service/HibernateExceptionScen2MainIntegrationTest.java b/spring-hibernate3/src/test/java/org/baeldung/persistence/service/HibernateExceptionScen2MainIntegrationTest.java new file mode 100644 index 0000000000..84cafe0536 --- /dev/null +++ b/spring-hibernate3/src/test/java/org/baeldung/persistence/service/HibernateExceptionScen2MainIntegrationTest.java @@ -0,0 +1,45 @@ +package org.baeldung.persistence.service; + +import java.util.List; + +import org.baeldung.persistence.model.Event; +import org.baeldung.spring.PersistenceConfig; +import org.hamcrest.core.IsInstanceOf; +import org.hibernate.HibernateException; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) +public class HibernateExceptionScen2MainIntegrationTest { + + @Autowired + EventService service; + + @Rule + public ExpectedException expectedEx = ExpectedException.none(); + + @Test + public final void whenEntityIsCreated_thenNoExceptions() { + service.create(new Event("from AnnotationSessionFactoryBean")); + } + + @Test + @Ignore + public final void whenNoTransBoundToSession_thenException() { + expectedEx.expectCause(IsInstanceOf.instanceOf(HibernateException.class)); + expectedEx.expectMessage("No Hibernate Session bound to thread, " + + "and configuration does not allow creation " + + "of non-transactional one here"); + service.create(new Event("from AnnotationSessionFactoryBean")); + } + +} From b6f0ab774cd359d4bd947746e7539b6180634af1 Mon Sep 17 00:00:00 2001 From: Sergey Petunin Date: Sat, 4 Nov 2017 16:26:12 +0100 Subject: [PATCH 192/197] BAEL-1281: Hibernate - Mapping Date/Time values (java.util and java.time) (#2951) From 666206ce050c3f8a6f911b69eaaa69613f2e6860 Mon Sep 17 00:00:00 2001 From: Bogdan Stoean <4540392+BogdanStoean@users.noreply.github.com> Date: Sat, 4 Nov 2017 17:38:32 +0200 Subject: [PATCH 193/197] hipchat configuration (#2959) --- spring-boot-admin/pom.xml | 13 +++++++++++++ spring-boot-admin/spring-boot-admin-client/pom.xml | 4 ++-- spring-boot-admin/spring-boot-admin-server/pom.xml | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/spring-boot-admin/pom.xml b/spring-boot-admin/pom.xml index 918eeaabeb..9c1eeeabff 100644 --- a/spring-boot-admin/pom.xml +++ b/spring-boot-admin/pom.xml @@ -13,6 +13,7 @@ UTF-8 + 1.5.8.RELEASE @@ -20,4 +21,16 @@ spring-boot-admin-client + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + \ No newline at end of file diff --git a/spring-boot-admin/spring-boot-admin-client/pom.xml b/spring-boot-admin/spring-boot-admin-client/pom.xml index accedca5cb..d119450e0b 100644 --- a/spring-boot-admin/spring-boot-admin-client/pom.xml +++ b/spring-boot-admin/spring-boot-admin-client/pom.xml @@ -11,10 +11,10 @@ Spring Boot Admin Client - parent-boot-5 + spring-boot-admin com.baeldung 0.0.1-SNAPSHOT - ../../parent-boot-5 + ../../spring-boot-admin diff --git a/spring-boot-admin/spring-boot-admin-server/pom.xml b/spring-boot-admin/spring-boot-admin-server/pom.xml index 4922d56878..f28b7a3dc9 100644 --- a/spring-boot-admin/spring-boot-admin-server/pom.xml +++ b/spring-boot-admin/spring-boot-admin-server/pom.xml @@ -11,10 +11,10 @@ Spring Boot Admin Server - parent-boot-5 + spring-boot-admin com.baeldung 0.0.1-SNAPSHOT - ../../parent-boot-5 + ../../spring-boot-admin From a9bea07bd5f4f273efe338afa28a7ea658422028 Mon Sep 17 00:00:00 2001 From: Tim Schimandle Date: Sat, 4 Nov 2017 09:46:20 -0600 Subject: [PATCH 194/197] BAEL-1176 Spring Cloud Connector Heroku (#2911) * BAEL-1176 setting up base application with in memory database * BAEL-1176 adding postgres stuff --- spring-cloud/pom.xml | 1 + .../spring-cloud-connectors-heroku/pom.xml | 100 ++++++++++++++++++ .../heroku/ConnectorsHerokuApplication.java | 12 +++ .../connectors/heroku/product/Product.java | 30 ++++++ .../heroku/product/ProductController.java | 26 +++++ .../heroku/product/ProductRepository.java | 6 ++ .../heroku/product/ProductService.java | 28 +++++ .../src/main/resources/application.properties | 8 ++ 8 files changed, 211 insertions(+) create mode 100644 spring-cloud/spring-cloud-connectors-heroku/pom.xml create mode 100644 spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java create mode 100644 spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java create mode 100644 spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java create mode 100644 spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java create mode 100644 spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java create mode 100644 spring-cloud/spring-cloud-connectors-heroku/src/main/resources/application.properties diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml index 44e72535f8..93bf6ea74b 100644 --- a/spring-cloud/pom.xml +++ b/spring-cloud/pom.xml @@ -16,6 +16,7 @@ spring-cloud-rest spring-cloud-zookeeper spring-cloud-gateway + spring-cloud-connectors-heroku pom diff --git a/spring-cloud/spring-cloud-connectors-heroku/pom.xml b/spring-cloud/spring-cloud-connectors-heroku/pom.xml new file mode 100644 index 0000000000..ba3f0ef28f --- /dev/null +++ b/spring-cloud/spring-cloud-connectors-heroku/pom.xml @@ -0,0 +1,100 @@ + + + 4.0.0 + + + spring-boot-starter-parent + org.springframework.boot + 1.4.4.RELEASE + + + + com.baeldung.spring.cloud + spring-cloud-connectors-heroku + 1.0.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-cloud-connectors + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-actuator + + + + org.postgresql + postgresql + 9.4-1201-jdbc4 + + + + com.h2database + h2 + runtime + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud-dependencies.version} + pom + import + + + + + + Brixton.SR7 + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + 3 + true + + **/*IntegrationTest.java + **/*LongRunningUnitTest.java + **/*ManualTest.java + **/JdbcTest.java + **/*LiveTest.java + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.0 + + 1.8 + 1.8 + + + + + + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java new file mode 100644 index 0000000000..63246e89cc --- /dev/null +++ b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java @@ -0,0 +1,12 @@ +package com.baeldung.spring.cloud.connectors.heroku; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ConnectorsHerokuApplication { + + public static void main(String[] args) { + SpringApplication.run(ConnectorsHerokuApplication.class, args); + } +} diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java new file mode 100644 index 0000000000..40e8809fc5 --- /dev/null +++ b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java @@ -0,0 +1,30 @@ +package com.baeldung.spring.cloud.connectors.heroku.product; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Entity +public class Product { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long productId; + private String sku; + + public Long getProductId() { + return productId; + } + + public void setProductId(Long productId) { + this.productId = productId; + } + + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } +} diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java new file mode 100644 index 0000000000..51cf4412bf --- /dev/null +++ b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java @@ -0,0 +1,26 @@ +package com.baeldung.spring.cloud.connectors.heroku.product; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/products") +public class ProductController { + + private final ProductService productService; + + @Autowired + public ProductController(ProductService productService) { + this.productService = productService; + } + + @GetMapping("/{productId}") + public Product findProduct(@PathVariable Long productId) { + return productService.findProductById(productId); + } + + @PostMapping + public Product createProduct(@RequestBody Product product) { + return productService.createProduct(product); + } +} \ No newline at end of file diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java new file mode 100644 index 0000000000..508e1d048b --- /dev/null +++ b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java @@ -0,0 +1,6 @@ +package com.baeldung.spring.cloud.connectors.heroku.product; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ProductRepository extends JpaRepository{ +} diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java new file mode 100644 index 0000000000..f25b4ecf7b --- /dev/null +++ b/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java @@ -0,0 +1,28 @@ +package com.baeldung.spring.cloud.connectors.heroku.product; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional(readOnly = true) +public class ProductService { + private final ProductRepository productRepository; + + @Autowired + public ProductService(ProductRepository productRepository) { + this.productRepository = productRepository; + } + + public Product findProductById(Long productId) { + return productRepository.findOne(productId); + } + + @Transactional(propagation = Propagation.REQUIRED) + public Product createProduct(Product product) { + Product newProduct = new Product(); + newProduct.setSku(product.getSku()); + return productRepository.save(newProduct); + } +} diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/resources/application.properties b/spring-cloud/spring-cloud-connectors-heroku/src/main/resources/application.properties new file mode 100644 index 0000000000..d2f1c89dc5 --- /dev/null +++ b/spring-cloud/spring-cloud-connectors-heroku/src/main/resources/application.properties @@ -0,0 +1,8 @@ +spring.datasource.driverClassName=org.postgresql.Driver +spring.datasource.maxActive=10 +spring.datasource.maxIdle=5 +spring.datasource.minIdle=2 +spring.datasource.initialSize=5 +spring.datasource.removeAbandoned=true + +spring.jpa.hibernate.ddl-auto=update \ No newline at end of file From 3952b7ef591df4a9c501c45aa5b490cc87a205d7 Mon Sep 17 00:00:00 2001 From: lor6 Date: Sun, 5 Nov 2017 18:32:37 +0200 Subject: [PATCH 195/197] remove keycloak, refactor packages (#2963) --- spring-boot/pom.xml | 17 +--- .../org/baeldung/{ => boot}/Application.java | 2 +- .../baeldung/{ => boot}/client/Details.java | 2 +- .../client/DetailsServiceClient.java | 2 +- .../{ => boot}/config/H2JpaConfig.java | 6 +- .../baeldung/{ => boot}/config/WebConfig.java | 10 +-- .../controller/GenericEntityController.java | 8 +- .../controller/servlet/HelloWorldServlet.java | 86 +++++++++---------- .../servlet/SpringHelloWorldServlet.java | 86 +++++++++---------- .../converter/GenericBigDecimalConverter.java | 2 +- .../converter/StringToEmployeeConverter.java | 2 +- .../StringToEnumConverterFactory.java | 2 +- .../StringToLocalDateTimeConverter.java | 2 +- .../StringToEmployeeConverterController.java | 2 +- .../{ => boot}/domain/GenericEntity.java | 2 +- .../org/baeldung/{ => boot}/domain/Modes.java | 2 +- .../{ => boot}/jsoncomponent/User.java | 2 +- .../jsoncomponent/UserCombinedSerializer.java | 2 +- .../jsoncomponent/UserJsonDeserializer.java | 2 +- .../jsoncomponent/UserJsonSerializer.java | 2 +- .../monitor/jmx/MonitoringConfig.java | 44 +++++----- .../repository/GenericEntityRepository.java | 4 +- .../HeaderVersionArgumentResolver.java | 2 +- .../{ => boot}/web/resolver/Version.java | 2 +- .../{boot => demo}/DemoApplication.java | 2 +- .../{boot => demo}/boottest/Employee.java | 2 +- .../boottest/EmployeeRepository.java | 2 +- .../boottest/EmployeeRestController.java | 2 +- .../boottest/EmployeeService.java | 2 +- .../boottest/EmployeeServiceImpl.java | 2 +- .../{boot => demo}/components/FooService.java | 6 +- .../exceptions/CommonException.java | 2 +- .../exceptions/FooNotFoundException.java | 2 +- .../baeldung/{boot => demo}/model/Foo.java | 2 +- .../repository/FooRepository.java | 4 +- .../{boot => demo}/service/FooController.java | 6 +- .../info/TotalUsersInfoContributor.java | 2 +- .../baeldung/main/SpringBootApplication.java | 7 +- .../org/baeldung/{boot => }/model/User.java | 2 +- .../{boot => }/repository/UserRepository.java | 4 +- .../session/exception/Application.java | 2 +- .../exception/repository/FooRepository.java | 2 +- .../repository/FooRepositoryImpl.java | 2 +- .../SpringBootApplicationIntegrationTest.java | 3 +- .../baeldung/SpringBootH2IntegrationTest.java | 7 +- .../SpringBootJPAIntegrationTest.java | 5 +- .../SpringBootMailIntegrationTest.java | 1 + .../SpringBootProfileIntegrationTest.java | 5 +- .../boot/DemoApplicationIntegrationTest.java | 1 + .../DetailsServiceClientIntegrationTest.java | 5 +- .../UserJsonDeserializerIntegrationTest.java | 4 +- .../UserJsonSerializerIntegrationTest.java | 4 +- .../FooRepositoryIntegrationTest.java | 3 +- .../HibernateSessionIntegrationTest.java | 2 +- .../NoHibernateSessionIntegrationTest.java | 2 +- .../config/H2TestProfileJPAConfig.java | 2 +- .../converter/CustomConverterTest.java | 5 +- ...ringToEmployeeConverterControllerTest.java | 3 +- .../EmployeeControllerIntegrationTest.java | 5 +- .../EmployeeRepositoryIntegrationTest.java | 4 +- ...EmployeeRestControllerIntegrationTest.java | 6 +- .../EmployeeServiceImplIntegrationTest.java | 6 +- .../{boot => demo}/boottest/JsonUtil.java | 2 +- .../ConfigPropertiesIntegrationTest.java | 2 + 64 files changed, 220 insertions(+), 205 deletions(-) rename spring-boot/src/main/java/org/baeldung/{ => boot}/Application.java (95%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/client/Details.java (93%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/client/DetailsServiceClient.java (93%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/config/H2JpaConfig.java (89%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/config/WebConfig.java (74%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/controller/GenericEntityController.java (92%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/controller/servlet/HelloWorldServlet.java (93%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/controller/servlet/SpringHelloWorldServlet.java (93%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/converter/GenericBigDecimalConverter.java (97%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/converter/StringToEmployeeConverter.java (90%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/converter/StringToEnumConverterFactory.java (95%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/converter/StringToLocalDateTimeConverter.java (92%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/converter/controller/StringToEmployeeConverterController.java (90%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/domain/GenericEntity.java (95%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/domain/Modes.java (54%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/jsoncomponent/User.java (86%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/jsoncomponent/UserCombinedSerializer.java (97%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/jsoncomponent/UserJsonDeserializer.java (95%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/jsoncomponent/UserJsonSerializer.java (96%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/monitor/jmx/MonitoringConfig.java (90%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/repository/GenericEntityRepository.java (64%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/web/resolver/HeaderVersionArgumentResolver.java (96%) rename spring-boot/src/main/java/org/baeldung/{ => boot}/web/resolver/Version.java (86%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/DemoApplication.java (95%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/boottest/Employee.java (95%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/boottest/EmployeeRepository.java (91%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/boottest/EmployeeRestController.java (96%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/boottest/EmployeeService.java (89%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/boottest/EmployeeServiceImpl.java (96%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/components/FooService.java (76%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/exceptions/CommonException.java (85%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/exceptions/FooNotFoundException.java (86%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/model/Foo.java (95%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/repository/FooRepository.java (70%) rename spring-boot/src/main/java/org/baeldung/{boot => demo}/service/FooController.java (85%) rename spring-boot/src/main/java/org/baeldung/{boot => }/model/User.java (95%) rename spring-boot/src/main/java/org/baeldung/{boot => }/repository/UserRepository.java (77%) rename spring-boot/src/test/java/org/baeldung/{ => boot}/client/DetailsServiceClientIntegrationTest.java (92%) rename spring-boot/src/test/java/org/baeldung/{ => boot}/jsoncomponent/UserJsonDeserializerIntegrationTest.java (89%) rename spring-boot/src/test/java/org/baeldung/{ => boot}/jsoncomponent/UserJsonSerializerIntegrationTest.java (90%) rename spring-boot/src/test/java/org/baeldung/{boot => demo}/boottest/EmployeeControllerIntegrationTest.java (93%) rename spring-boot/src/test/java/org/baeldung/{boot => demo}/boottest/EmployeeRepositoryIntegrationTest.java (94%) rename spring-boot/src/test/java/org/baeldung/{boot => demo}/boottest/EmployeeRestControllerIntegrationTest.java (94%) rename spring-boot/src/test/java/org/baeldung/{boot => demo}/boottest/EmployeeServiceImplIntegrationTest.java (94%) rename spring-boot/src/test/java/org/baeldung/{boot => demo}/boottest/JsonUtil.java (91%) diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 5e5f01013d..d6ee022522 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -24,10 +24,6 @@ org.springframework.boot spring-boot-starter-web - - org.keycloak - keycloak-spring-boot-starter - org.springframework.boot spring-boot-starter-data-jpa @@ -172,17 +168,6 @@ artemis-server     - - - - org.keycloak.bom - keycloak-adapter-bom - 3.3.0.CR2 - pom - import - - - spring-boot @@ -282,7 +267,7 @@ - org.baeldung.boot.DemoApplication + org.baeldung.demo.DemoApplication 4.3.4.RELEASE 2.2.1 3.1.1 diff --git a/spring-boot/src/main/java/org/baeldung/Application.java b/spring-boot/src/main/java/org/baeldung/boot/Application.java similarity index 95% rename from spring-boot/src/main/java/org/baeldung/Application.java rename to spring-boot/src/main/java/org/baeldung/boot/Application.java index 1c1e466afc..78e95455b8 100644 --- a/spring-boot/src/main/java/org/baeldung/Application.java +++ b/spring-boot/src/main/java/org/baeldung/boot/Application.java @@ -1,4 +1,4 @@ -package org.baeldung; +package org.baeldung.boot; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-boot/src/main/java/org/baeldung/client/Details.java b/spring-boot/src/main/java/org/baeldung/boot/client/Details.java similarity index 93% rename from spring-boot/src/main/java/org/baeldung/client/Details.java rename to spring-boot/src/main/java/org/baeldung/boot/client/Details.java index 2ae3adc38f..1e3ddf7b21 100644 --- a/spring-boot/src/main/java/org/baeldung/client/Details.java +++ b/spring-boot/src/main/java/org/baeldung/boot/client/Details.java @@ -1,4 +1,4 @@ -package org.baeldung.client; +package org.baeldung.boot.client; public class Details { diff --git a/spring-boot/src/main/java/org/baeldung/client/DetailsServiceClient.java b/spring-boot/src/main/java/org/baeldung/boot/client/DetailsServiceClient.java similarity index 93% rename from spring-boot/src/main/java/org/baeldung/client/DetailsServiceClient.java rename to spring-boot/src/main/java/org/baeldung/boot/client/DetailsServiceClient.java index 51fa7c6181..f2b9d6d030 100644 --- a/spring-boot/src/main/java/org/baeldung/client/DetailsServiceClient.java +++ b/spring-boot/src/main/java/org/baeldung/boot/client/DetailsServiceClient.java @@ -1,4 +1,4 @@ -package org.baeldung.client; +package org.baeldung.boot.client; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.stereotype.Service; diff --git a/spring-boot/src/main/java/org/baeldung/config/H2JpaConfig.java b/spring-boot/src/main/java/org/baeldung/boot/config/H2JpaConfig.java similarity index 89% rename from spring-boot/src/main/java/org/baeldung/config/H2JpaConfig.java rename to spring-boot/src/main/java/org/baeldung/boot/config/H2JpaConfig.java index 62791bf180..4e4b2e06bd 100644 --- a/spring-boot/src/main/java/org/baeldung/config/H2JpaConfig.java +++ b/spring-boot/src/main/java/org/baeldung/boot/config/H2JpaConfig.java @@ -1,4 +1,4 @@ -package org.baeldung.config; +package org.baeldung.boot.config; import java.util.Properties; @@ -18,7 +18,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration -@EnableJpaRepositories(basePackages = { "org.baeldung.repository", "org.baeldung.boot.repository", "org.baeldung.boot.boottest" }) +@EnableJpaRepositories(basePackages = { "org.baeldung.boot.repository", "org.baeldung.boot.boottest","org.baeldung.repository" }) @PropertySource("classpath:persistence-generic-entity.properties") @EnableTransactionManagement public class H2JpaConfig { @@ -41,7 +41,7 @@ public class H2JpaConfig { public LocalContainerEntityManagerFactoryBean entityManagerFactory() { final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(dataSource()); - em.setPackagesToScan(new String[] { "org.baeldung.domain", "org.baeldung.boot.model", "org.baeldung.boot.boottest" }); + em.setPackagesToScan(new String[] { "org.baeldung.boot.domain", "org.baeldung.boot.model", "org.baeldung.boot.boottest", "org.baeldung.model" }); em.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); em.setJpaProperties(additionalProperties()); return em; diff --git a/spring-boot/src/main/java/org/baeldung/config/WebConfig.java b/spring-boot/src/main/java/org/baeldung/boot/config/WebConfig.java similarity index 74% rename from spring-boot/src/main/java/org/baeldung/config/WebConfig.java rename to spring-boot/src/main/java/org/baeldung/boot/config/WebConfig.java index 6609791c69..caf88c3be7 100644 --- a/spring-boot/src/main/java/org/baeldung/config/WebConfig.java +++ b/spring-boot/src/main/java/org/baeldung/boot/config/WebConfig.java @@ -1,9 +1,9 @@ -package org.baeldung.config; +package org.baeldung.boot.config; -import org.baeldung.converter.GenericBigDecimalConverter; -import org.baeldung.converter.StringToEnumConverterFactory; -import org.baeldung.converter.StringToEmployeeConverter; -import org.baeldung.web.resolver.HeaderVersionArgumentResolver; +import org.baeldung.boot.converter.GenericBigDecimalConverter; +import org.baeldung.boot.converter.StringToEmployeeConverter; +import org.baeldung.boot.converter.StringToEnumConverterFactory; +import org.baeldung.boot.web.resolver.HeaderVersionArgumentResolver; import org.springframework.context.annotation.Configuration; import org.springframework.format.FormatterRegistry; import org.springframework.web.method.support.HandlerMethodArgumentResolver; diff --git a/spring-boot/src/main/java/org/baeldung/controller/GenericEntityController.java b/spring-boot/src/main/java/org/baeldung/boot/controller/GenericEntityController.java similarity index 92% rename from spring-boot/src/main/java/org/baeldung/controller/GenericEntityController.java rename to spring-boot/src/main/java/org/baeldung/boot/controller/GenericEntityController.java index a9e7dee0b7..8b038e0335 100644 --- a/spring-boot/src/main/java/org/baeldung/controller/GenericEntityController.java +++ b/spring-boot/src/main/java/org/baeldung/boot/controller/GenericEntityController.java @@ -1,8 +1,8 @@ -package org.baeldung.controller; +package org.baeldung.boot.controller; -import org.baeldung.domain.GenericEntity; -import org.baeldung.domain.Modes; -import org.baeldung.web.resolver.Version; +import org.baeldung.boot.domain.GenericEntity; +import org.baeldung.boot.domain.Modes; +import org.baeldung.boot.web.resolver.Version; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java b/spring-boot/src/main/java/org/baeldung/boot/controller/servlet/HelloWorldServlet.java similarity index 93% rename from spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java rename to spring-boot/src/main/java/org/baeldung/boot/controller/servlet/HelloWorldServlet.java index 9adaf7fd29..34ad11254c 100644 --- a/spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java +++ b/spring-boot/src/main/java/org/baeldung/boot/controller/servlet/HelloWorldServlet.java @@ -1,43 +1,43 @@ -package org.baeldung.controller.servlet; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Objects; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class HelloWorldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - public HelloWorldServlet() { - super(); - } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - PrintWriter out = null; - try { - out = response.getWriter(); - out.println("HelloWorldServlet: GET METHOD"); - out.flush(); - } finally { - if (!Objects.isNull(out)) - out.close(); - } - } - - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - PrintWriter out = null; - try { - out = response.getWriter(); - out.println("HelloWorldServlet: POST METHOD"); - out.flush(); - } finally { - if (!Objects.isNull(out)) - out.close(); - } - } - -} +package org.baeldung.boot.controller.servlet; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Objects; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class HelloWorldServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + public HelloWorldServlet() { + super(); + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + PrintWriter out = null; + try { + out = response.getWriter(); + out.println("HelloWorldServlet: GET METHOD"); + out.flush(); + } finally { + if (!Objects.isNull(out)) + out.close(); + } + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + PrintWriter out = null; + try { + out = response.getWriter(); + out.println("HelloWorldServlet: POST METHOD"); + out.flush(); + } finally { + if (!Objects.isNull(out)) + out.close(); + } + } + +} diff --git a/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java b/spring-boot/src/main/java/org/baeldung/boot/controller/servlet/SpringHelloWorldServlet.java similarity index 93% rename from spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java rename to spring-boot/src/main/java/org/baeldung/boot/controller/servlet/SpringHelloWorldServlet.java index 9a62bdbbf2..91547683c6 100644 --- a/spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java +++ b/spring-boot/src/main/java/org/baeldung/boot/controller/servlet/SpringHelloWorldServlet.java @@ -1,43 +1,43 @@ -package org.baeldung.controller.servlet; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Objects; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class SpringHelloWorldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - public SpringHelloWorldServlet() { - super(); - } - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - PrintWriter out = null; - try { - out = response.getWriter(); - out.println("SpringHelloWorldServlet: GET METHOD"); - out.flush(); - } finally { - if (!Objects.isNull(out)) - out.close(); - } - } - - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - PrintWriter out = null; - try { - out = response.getWriter(); - out.println("SpringHelloWorldServlet: POST METHOD"); - out.flush(); - } finally { - if (!Objects.isNull(out)) - out.close(); - } - } - -} +package org.baeldung.boot.controller.servlet; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Objects; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class SpringHelloWorldServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + public SpringHelloWorldServlet() { + super(); + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + PrintWriter out = null; + try { + out = response.getWriter(); + out.println("SpringHelloWorldServlet: GET METHOD"); + out.flush(); + } finally { + if (!Objects.isNull(out)) + out.close(); + } + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + PrintWriter out = null; + try { + out = response.getWriter(); + out.println("SpringHelloWorldServlet: POST METHOD"); + out.flush(); + } finally { + if (!Objects.isNull(out)) + out.close(); + } + } + +} diff --git a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java b/spring-boot/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java similarity index 97% rename from spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java rename to spring-boot/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java index 1dbb7df6de..decd8ac5db 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/GenericBigDecimalConverter.java +++ b/spring-boot/src/main/java/org/baeldung/boot/converter/GenericBigDecimalConverter.java @@ -1,4 +1,4 @@ -package org.baeldung.converter; +package org.baeldung.boot.converter; import com.google.common.collect.ImmutableSet; import org.springframework.core.convert.TypeDescriptor; diff --git a/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java b/spring-boot/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java similarity index 90% rename from spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java rename to spring-boot/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java index 5f680972b7..de9cf3f55a 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/StringToEmployeeConverter.java +++ b/spring-boot/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java @@ -1,4 +1,4 @@ -package org.baeldung.converter; +package org.baeldung.boot.converter; import com.baeldung.toggle.Employee; diff --git a/spring-boot/src/main/java/org/baeldung/converter/StringToEnumConverterFactory.java b/spring-boot/src/main/java/org/baeldung/boot/converter/StringToEnumConverterFactory.java similarity index 95% rename from spring-boot/src/main/java/org/baeldung/converter/StringToEnumConverterFactory.java rename to spring-boot/src/main/java/org/baeldung/boot/converter/StringToEnumConverterFactory.java index 17c6fd06de..6fa51bfdcc 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/StringToEnumConverterFactory.java +++ b/spring-boot/src/main/java/org/baeldung/boot/converter/StringToEnumConverterFactory.java @@ -1,4 +1,4 @@ -package org.baeldung.converter; +package org.baeldung.boot.converter; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterFactory; diff --git a/spring-boot/src/main/java/org/baeldung/converter/StringToLocalDateTimeConverter.java b/spring-boot/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java similarity index 92% rename from spring-boot/src/main/java/org/baeldung/converter/StringToLocalDateTimeConverter.java rename to spring-boot/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java index cbb9e6ddb4..8a08b438f2 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/StringToLocalDateTimeConverter.java +++ b/spring-boot/src/main/java/org/baeldung/boot/converter/StringToLocalDateTimeConverter.java @@ -1,4 +1,4 @@ -package org.baeldung.converter; +package org.baeldung.boot.converter; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java b/spring-boot/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java similarity index 90% rename from spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java rename to spring-boot/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java index edd56dc136..ad921c2c43 100644 --- a/spring-boot/src/main/java/org/baeldung/converter/controller/StringToEmployeeConverterController.java +++ b/spring-boot/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java @@ -1,4 +1,4 @@ -package org.baeldung.converter.controller; +package org.baeldung.boot.converter.controller; import com.baeldung.toggle.Employee; import org.springframework.http.MediaType; diff --git a/spring-boot/src/main/java/org/baeldung/domain/GenericEntity.java b/spring-boot/src/main/java/org/baeldung/boot/domain/GenericEntity.java similarity index 95% rename from spring-boot/src/main/java/org/baeldung/domain/GenericEntity.java rename to spring-boot/src/main/java/org/baeldung/boot/domain/GenericEntity.java index 7b1d27cb66..f1c936e432 100644 --- a/spring-boot/src/main/java/org/baeldung/domain/GenericEntity.java +++ b/spring-boot/src/main/java/org/baeldung/boot/domain/GenericEntity.java @@ -1,4 +1,4 @@ -package org.baeldung.domain; +package org.baeldung.boot.domain; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/spring-boot/src/main/java/org/baeldung/domain/Modes.java b/spring-boot/src/main/java/org/baeldung/boot/domain/Modes.java similarity index 54% rename from spring-boot/src/main/java/org/baeldung/domain/Modes.java rename to spring-boot/src/main/java/org/baeldung/boot/domain/Modes.java index 473406ef26..dcba064e8c 100644 --- a/spring-boot/src/main/java/org/baeldung/domain/Modes.java +++ b/spring-boot/src/main/java/org/baeldung/boot/domain/Modes.java @@ -1,4 +1,4 @@ -package org.baeldung.domain; +package org.baeldung.boot.domain; public enum Modes { diff --git a/spring-boot/src/main/java/org/baeldung/jsoncomponent/User.java b/spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/User.java similarity index 86% rename from spring-boot/src/main/java/org/baeldung/jsoncomponent/User.java rename to spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/User.java index 8961874526..1f14131300 100644 --- a/spring-boot/src/main/java/org/baeldung/jsoncomponent/User.java +++ b/spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/User.java @@ -1,4 +1,4 @@ -package org.baeldung.jsoncomponent; +package org.baeldung.boot.jsoncomponent; import javafx.scene.paint.Color; diff --git a/spring-boot/src/main/java/org/baeldung/jsoncomponent/UserCombinedSerializer.java b/spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserCombinedSerializer.java similarity index 97% rename from spring-boot/src/main/java/org/baeldung/jsoncomponent/UserCombinedSerializer.java rename to spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserCombinedSerializer.java index cb1b838ca4..4d3a2cf99e 100644 --- a/spring-boot/src/main/java/org/baeldung/jsoncomponent/UserCombinedSerializer.java +++ b/spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserCombinedSerializer.java @@ -1,4 +1,4 @@ -package org.baeldung.jsoncomponent; +package org.baeldung.boot.jsoncomponent; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/spring-boot/src/main/java/org/baeldung/jsoncomponent/UserJsonDeserializer.java b/spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserJsonDeserializer.java similarity index 95% rename from spring-boot/src/main/java/org/baeldung/jsoncomponent/UserJsonDeserializer.java rename to spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserJsonDeserializer.java index a310dcba5a..ad82ca06c0 100644 --- a/spring-boot/src/main/java/org/baeldung/jsoncomponent/UserJsonDeserializer.java +++ b/spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserJsonDeserializer.java @@ -1,4 +1,4 @@ -package org.baeldung.jsoncomponent; +package org.baeldung.boot.jsoncomponent; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/spring-boot/src/main/java/org/baeldung/jsoncomponent/UserJsonSerializer.java b/spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserJsonSerializer.java similarity index 96% rename from spring-boot/src/main/java/org/baeldung/jsoncomponent/UserJsonSerializer.java rename to spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserJsonSerializer.java index 845bc3aac5..03330d81a4 100644 --- a/spring-boot/src/main/java/org/baeldung/jsoncomponent/UserJsonSerializer.java +++ b/spring-boot/src/main/java/org/baeldung/boot/jsoncomponent/UserJsonSerializer.java @@ -1,4 +1,4 @@ -package org.baeldung.jsoncomponent; +package org.baeldung.boot.jsoncomponent; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/spring-boot/src/main/java/org/baeldung/monitor/jmx/MonitoringConfig.java b/spring-boot/src/main/java/org/baeldung/boot/monitor/jmx/MonitoringConfig.java similarity index 90% rename from spring-boot/src/main/java/org/baeldung/monitor/jmx/MonitoringConfig.java rename to spring-boot/src/main/java/org/baeldung/boot/monitor/jmx/MonitoringConfig.java index 40f36ef924..d2e8fc228f 100644 --- a/spring-boot/src/main/java/org/baeldung/monitor/jmx/MonitoringConfig.java +++ b/spring-boot/src/main/java/org/baeldung/boot/monitor/jmx/MonitoringConfig.java @@ -1,22 +1,22 @@ -package org.baeldung.monitor.jmx; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import com.codahale.metrics.JmxReporter; -import com.codahale.metrics.MetricRegistry; - -@Configuration -public class MonitoringConfig { - @Autowired - private MetricRegistry registry; - - @Bean - public JmxReporter jmxReporter() { - JmxReporter reporter = JmxReporter.forRegistry(registry) - .build(); - reporter.start(); - return reporter; - } -} +package org.baeldung.boot.monitor.jmx; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.codahale.metrics.JmxReporter; +import com.codahale.metrics.MetricRegistry; + +@Configuration +public class MonitoringConfig { + @Autowired + private MetricRegistry registry; + + @Bean + public JmxReporter jmxReporter() { + JmxReporter reporter = JmxReporter.forRegistry(registry) + .build(); + reporter.start(); + return reporter; + } +} diff --git a/spring-boot/src/main/java/org/baeldung/repository/GenericEntityRepository.java b/spring-boot/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java similarity index 64% rename from spring-boot/src/main/java/org/baeldung/repository/GenericEntityRepository.java rename to spring-boot/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java index 7bb1e6dcdc..d897e17afe 100644 --- a/spring-boot/src/main/java/org/baeldung/repository/GenericEntityRepository.java +++ b/spring-boot/src/main/java/org/baeldung/boot/repository/GenericEntityRepository.java @@ -1,6 +1,6 @@ -package org.baeldung.repository; +package org.baeldung.boot.repository; -import org.baeldung.domain.GenericEntity; +import org.baeldung.boot.domain.GenericEntity; import org.springframework.data.jpa.repository.JpaRepository; public interface GenericEntityRepository extends JpaRepository { diff --git a/spring-boot/src/main/java/org/baeldung/web/resolver/HeaderVersionArgumentResolver.java b/spring-boot/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java similarity index 96% rename from spring-boot/src/main/java/org/baeldung/web/resolver/HeaderVersionArgumentResolver.java rename to spring-boot/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java index 89a77f38d1..b3a0dba7e8 100644 --- a/spring-boot/src/main/java/org/baeldung/web/resolver/HeaderVersionArgumentResolver.java +++ b/spring-boot/src/main/java/org/baeldung/boot/web/resolver/HeaderVersionArgumentResolver.java @@ -1,4 +1,4 @@ -package org.baeldung.web.resolver; +package org.baeldung.boot.web.resolver; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; diff --git a/spring-boot/src/main/java/org/baeldung/web/resolver/Version.java b/spring-boot/src/main/java/org/baeldung/boot/web/resolver/Version.java similarity index 86% rename from spring-boot/src/main/java/org/baeldung/web/resolver/Version.java rename to spring-boot/src/main/java/org/baeldung/boot/web/resolver/Version.java index 2a9e6e60b3..f69d40510e 100644 --- a/spring-boot/src/main/java/org/baeldung/web/resolver/Version.java +++ b/spring-boot/src/main/java/org/baeldung/boot/web/resolver/Version.java @@ -1,4 +1,4 @@ -package org.baeldung.web.resolver; +package org.baeldung.boot.web.resolver; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-boot/src/main/java/org/baeldung/boot/DemoApplication.java b/spring-boot/src/main/java/org/baeldung/demo/DemoApplication.java similarity index 95% rename from spring-boot/src/main/java/org/baeldung/boot/DemoApplication.java rename to spring-boot/src/main/java/org/baeldung/demo/DemoApplication.java index cb269f77f1..c4b0d48244 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/DemoApplication.java +++ b/spring-boot/src/main/java/org/baeldung/demo/DemoApplication.java @@ -1,4 +1,4 @@ -package org.baeldung.boot; +package org.baeldung.demo; import com.baeldung.graphql.GraphqlConfiguration; import org.springframework.boot.SpringApplication; diff --git a/spring-boot/src/main/java/org/baeldung/boot/boottest/Employee.java b/spring-boot/src/main/java/org/baeldung/demo/boottest/Employee.java similarity index 95% rename from spring-boot/src/main/java/org/baeldung/boot/boottest/Employee.java rename to spring-boot/src/main/java/org/baeldung/demo/boottest/Employee.java index a805e8f5fe..c1dd109f91 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/boottest/Employee.java +++ b/spring-boot/src/main/java/org/baeldung/demo/boottest/Employee.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRepository.java b/spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeRepository.java similarity index 91% rename from spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRepository.java rename to spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeRepository.java index 98d1c33212..d991d9a8a9 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRepository.java +++ b/spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeRepository.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; import java.util.List; diff --git a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRestController.java b/spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeRestController.java similarity index 96% rename from spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRestController.java rename to spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeRestController.java index 1bfde0f0bd..516bff0e8c 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeRestController.java +++ b/spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeRestController.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; import java.util.List; diff --git a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeService.java b/spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeService.java similarity index 89% rename from spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeService.java rename to spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeService.java index 13b5ca56e0..07765a511c 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeService.java +++ b/spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeService.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; import java.util.List; diff --git a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeServiceImpl.java b/spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeServiceImpl.java similarity index 96% rename from spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeServiceImpl.java rename to spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeServiceImpl.java index 3fbfa92bc8..bd85234e02 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/boottest/EmployeeServiceImpl.java +++ b/spring-boot/src/main/java/org/baeldung/demo/boottest/EmployeeServiceImpl.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; import java.util.List; diff --git a/spring-boot/src/main/java/org/baeldung/boot/components/FooService.java b/spring-boot/src/main/java/org/baeldung/demo/components/FooService.java similarity index 76% rename from spring-boot/src/main/java/org/baeldung/boot/components/FooService.java rename to spring-boot/src/main/java/org/baeldung/demo/components/FooService.java index 4ff8e9fdd4..334730ccb0 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/components/FooService.java +++ b/spring-boot/src/main/java/org/baeldung/demo/components/FooService.java @@ -1,7 +1,7 @@ -package org.baeldung.boot.components; +package org.baeldung.demo.components; -import org.baeldung.boot.model.Foo; -import org.baeldung.boot.repository.FooRepository; +import org.baeldung.demo.model.Foo; +import org.baeldung.demo.repository.FooRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-boot/src/main/java/org/baeldung/boot/exceptions/CommonException.java b/spring-boot/src/main/java/org/baeldung/demo/exceptions/CommonException.java similarity index 85% rename from spring-boot/src/main/java/org/baeldung/boot/exceptions/CommonException.java rename to spring-boot/src/main/java/org/baeldung/demo/exceptions/CommonException.java index e03b859eab..51dd7bbd44 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/exceptions/CommonException.java +++ b/spring-boot/src/main/java/org/baeldung/demo/exceptions/CommonException.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.exceptions; +package org.baeldung.demo.exceptions; public class CommonException extends RuntimeException { diff --git a/spring-boot/src/main/java/org/baeldung/boot/exceptions/FooNotFoundException.java b/spring-boot/src/main/java/org/baeldung/demo/exceptions/FooNotFoundException.java similarity index 86% rename from spring-boot/src/main/java/org/baeldung/boot/exceptions/FooNotFoundException.java rename to spring-boot/src/main/java/org/baeldung/demo/exceptions/FooNotFoundException.java index 0b04bd2759..59796c58f0 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/exceptions/FooNotFoundException.java +++ b/spring-boot/src/main/java/org/baeldung/demo/exceptions/FooNotFoundException.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.exceptions; +package org.baeldung.demo.exceptions; public class FooNotFoundException extends RuntimeException { diff --git a/spring-boot/src/main/java/org/baeldung/boot/model/Foo.java b/spring-boot/src/main/java/org/baeldung/demo/model/Foo.java similarity index 95% rename from spring-boot/src/main/java/org/baeldung/boot/model/Foo.java rename to spring-boot/src/main/java/org/baeldung/demo/model/Foo.java index d373e25b85..e5638cfd3d 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/model/Foo.java +++ b/spring-boot/src/main/java/org/baeldung/demo/model/Foo.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.model; +package org.baeldung.demo.model; import java.io.Serializable; diff --git a/spring-boot/src/main/java/org/baeldung/boot/repository/FooRepository.java b/spring-boot/src/main/java/org/baeldung/demo/repository/FooRepository.java similarity index 70% rename from spring-boot/src/main/java/org/baeldung/boot/repository/FooRepository.java rename to spring-boot/src/main/java/org/baeldung/demo/repository/FooRepository.java index 09d6975dba..c04e0c7438 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/repository/FooRepository.java +++ b/spring-boot/src/main/java/org/baeldung/demo/repository/FooRepository.java @@ -1,6 +1,6 @@ -package org.baeldung.boot.repository; +package org.baeldung.demo.repository; -import org.baeldung.boot.model.Foo; +import org.baeldung.demo.model.Foo; import org.springframework.data.jpa.repository.JpaRepository; public interface FooRepository extends JpaRepository { diff --git a/spring-boot/src/main/java/org/baeldung/boot/service/FooController.java b/spring-boot/src/main/java/org/baeldung/demo/service/FooController.java similarity index 85% rename from spring-boot/src/main/java/org/baeldung/boot/service/FooController.java rename to spring-boot/src/main/java/org/baeldung/demo/service/FooController.java index d400c3bf9e..c28dcde1a7 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/service/FooController.java +++ b/spring-boot/src/main/java/org/baeldung/demo/service/FooController.java @@ -1,7 +1,7 @@ -package org.baeldung.boot.service; +package org.baeldung.demo.service; -import org.baeldung.boot.components.FooService; -import org.baeldung.boot.model.Foo; +import org.baeldung.demo.components.FooService; +import org.baeldung.demo.model.Foo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/spring-boot/src/main/java/org/baeldung/endpoints/info/TotalUsersInfoContributor.java b/spring-boot/src/main/java/org/baeldung/endpoints/info/TotalUsersInfoContributor.java index 790584644f..34b50a2c0a 100644 --- a/spring-boot/src/main/java/org/baeldung/endpoints/info/TotalUsersInfoContributor.java +++ b/spring-boot/src/main/java/org/baeldung/endpoints/info/TotalUsersInfoContributor.java @@ -3,7 +3,7 @@ package org.baeldung.endpoints.info; import java.util.HashMap; import java.util.Map; -import org.baeldung.boot.repository.UserRepository; +import org.baeldung.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; diff --git a/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java b/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java index 2d118b0eae..0ab4ecb128 100644 --- a/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java +++ b/spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java @@ -1,9 +1,9 @@ package org.baeldung.main; +import org.baeldung.boot.controller.servlet.HelloWorldServlet; +import org.baeldung.boot.controller.servlet.SpringHelloWorldServlet; import org.baeldung.common.error.SpringHelloServletRegistrationBean; import org.baeldung.common.resources.ExecutorServiceExitCodeGenerator; -import org.baeldung.controller.servlet.HelloWorldServlet; -import org.baeldung.controller.servlet.SpringHelloWorldServlet; import org.baeldung.service.LoginService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; @@ -11,6 +11,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,7 +22,7 @@ import java.util.concurrent.Executors; @RestController @EnableAutoConfiguration(exclude = MySQLAutoconfiguration.class) -@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", "org.baeldung.common.properties", "org.baeldung.common.resources", "org.baeldung.endpoints", "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.service" }) +@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", "org.baeldung.common.properties", "org.baeldung.common.resources","org.baeldung.endpoints", "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.boot.config"}) public class SpringBootApplication { private static ApplicationContext applicationContext; diff --git a/spring-boot/src/main/java/org/baeldung/boot/model/User.java b/spring-boot/src/main/java/org/baeldung/model/User.java similarity index 95% rename from spring-boot/src/main/java/org/baeldung/boot/model/User.java rename to spring-boot/src/main/java/org/baeldung/model/User.java index f60ac86fe4..61936584c4 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/model/User.java +++ b/spring-boot/src/main/java/org/baeldung/model/User.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.model; +package org.baeldung.model; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/spring-boot/src/main/java/org/baeldung/boot/repository/UserRepository.java b/spring-boot/src/main/java/org/baeldung/repository/UserRepository.java similarity index 77% rename from spring-boot/src/main/java/org/baeldung/boot/repository/UserRepository.java rename to spring-boot/src/main/java/org/baeldung/repository/UserRepository.java index 3a419a65bd..360dbf883c 100644 --- a/spring-boot/src/main/java/org/baeldung/boot/repository/UserRepository.java +++ b/spring-boot/src/main/java/org/baeldung/repository/UserRepository.java @@ -1,6 +1,6 @@ -package org.baeldung.boot.repository; +package org.baeldung.repository; -import org.baeldung.boot.model.User; +import org.baeldung.model.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/spring-boot/src/main/java/org/baeldung/session/exception/Application.java b/spring-boot/src/main/java/org/baeldung/session/exception/Application.java index c0cc669420..70c68368b5 100644 --- a/spring-boot/src/main/java/org/baeldung/session/exception/Application.java +++ b/spring-boot/src/main/java/org/baeldung/session/exception/Application.java @@ -1,6 +1,6 @@ package org.baeldung.session.exception; -import org.baeldung.boot.model.Foo; +import org.baeldung.demo.model.Foo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; diff --git a/spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepository.java b/spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepository.java index 679d691b26..ce7bbfe57b 100644 --- a/spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepository.java +++ b/spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepository.java @@ -1,6 +1,6 @@ package org.baeldung.session.exception.repository; -import org.baeldung.boot.model.Foo; +import org.baeldung.demo.model.Foo; public interface FooRepository { diff --git a/spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepositoryImpl.java b/spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepositoryImpl.java index 36d87e6dad..11df542d05 100644 --- a/spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepositoryImpl.java +++ b/spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepositoryImpl.java @@ -1,6 +1,6 @@ package org.baeldung.session.exception.repository; -import org.baeldung.boot.model.Foo; +import org.baeldung.demo.model.Foo; import org.hibernate.SessionFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootApplicationIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootApplicationIntegrationTest.java index 358ba942d9..823625f811 100644 --- a/spring-boot/src/test/java/org/baeldung/SpringBootApplicationIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/SpringBootApplicationIntegrationTest.java @@ -1,6 +1,7 @@ package org.baeldung; -import org.baeldung.domain.Modes; +import org.baeldung.boot.Application; +import org.baeldung.boot.domain.Modes; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootH2IntegrationTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootH2IntegrationTest.java index 185a36e571..2cb2f4dc10 100644 --- a/spring-boot/src/test/java/org/baeldung/SpringBootH2IntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/SpringBootH2IntegrationTest.java @@ -1,8 +1,9 @@ package org.baeldung; -import org.baeldung.config.H2JpaConfig; -import org.baeldung.domain.GenericEntity; -import org.baeldung.repository.GenericEntityRepository; +import org.baeldung.boot.Application; +import org.baeldung.boot.config.H2JpaConfig; +import org.baeldung.boot.domain.GenericEntity; +import org.baeldung.boot.repository.GenericEntityRepository; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootJPAIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootJPAIntegrationTest.java index 7c90622cdc..d9c30c67da 100644 --- a/spring-boot/src/test/java/org/baeldung/SpringBootJPAIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/SpringBootJPAIntegrationTest.java @@ -1,7 +1,8 @@ package org.baeldung; -import org.baeldung.domain.GenericEntity; -import org.baeldung.repository.GenericEntityRepository; +import org.baeldung.boot.Application; +import org.baeldung.boot.domain.GenericEntity; +import org.baeldung.boot.repository.GenericEntityRepository; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootMailIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootMailIntegrationTest.java index 0e8a698f41..17e7d2d9e0 100644 --- a/spring-boot/src/test/java/org/baeldung/SpringBootMailIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/SpringBootMailIntegrationTest.java @@ -1,5 +1,6 @@ package org.baeldung; +import org.baeldung.boot.Application; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/spring-boot/src/test/java/org/baeldung/SpringBootProfileIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/SpringBootProfileIntegrationTest.java index 9dd473f321..1d4ee262b0 100644 --- a/spring-boot/src/test/java/org/baeldung/SpringBootProfileIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/SpringBootProfileIntegrationTest.java @@ -1,8 +1,9 @@ package org.baeldung; +import org.baeldung.boot.Application; +import org.baeldung.boot.domain.GenericEntity; +import org.baeldung.boot.repository.GenericEntityRepository; import org.baeldung.config.H2TestProfileJPAConfig; -import org.baeldung.domain.GenericEntity; -import org.baeldung.repository.GenericEntityRepository; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-boot/src/test/java/org/baeldung/boot/DemoApplicationIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/DemoApplicationIntegrationTest.java index 4fcea35b4a..fba816c681 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/DemoApplicationIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/boot/DemoApplicationIntegrationTest.java @@ -1,5 +1,6 @@ package org.baeldung.boot; +import org.baeldung.demo.DemoApplication; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/spring-boot/src/test/java/org/baeldung/client/DetailsServiceClientIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/client/DetailsServiceClientIntegrationTest.java similarity index 92% rename from spring-boot/src/test/java/org/baeldung/client/DetailsServiceClientIntegrationTest.java rename to spring-boot/src/test/java/org/baeldung/boot/client/DetailsServiceClientIntegrationTest.java index 0f6c13ae1f..6f1cc66979 100644 --- a/spring-boot/src/test/java/org/baeldung/client/DetailsServiceClientIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/boot/client/DetailsServiceClientIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.client; +package org.baeldung.boot.client; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; @@ -14,6 +14,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo; import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess; +import org.baeldung.boot.client.Details; +import org.baeldung.boot.client.DetailsServiceClient; + @RunWith(SpringRunner.class) @RestClientTest(DetailsServiceClient.class) public class DetailsServiceClientIntegrationTest { diff --git a/spring-boot/src/test/java/org/baeldung/jsoncomponent/UserJsonDeserializerIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/jsoncomponent/UserJsonDeserializerIntegrationTest.java similarity index 89% rename from spring-boot/src/test/java/org/baeldung/jsoncomponent/UserJsonDeserializerIntegrationTest.java rename to spring-boot/src/test/java/org/baeldung/boot/jsoncomponent/UserJsonDeserializerIntegrationTest.java index 4f5af3d0e7..f8b47a23fc 100644 --- a/spring-boot/src/test/java/org/baeldung/jsoncomponent/UserJsonDeserializerIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/boot/jsoncomponent/UserJsonDeserializerIntegrationTest.java @@ -1,7 +1,9 @@ -package org.baeldung.jsoncomponent; +package org.baeldung.boot.jsoncomponent; import com.fasterxml.jackson.databind.ObjectMapper; import javafx.scene.paint.Color; + +import org.baeldung.boot.jsoncomponent.User; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-boot/src/test/java/org/baeldung/jsoncomponent/UserJsonSerializerIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/jsoncomponent/UserJsonSerializerIntegrationTest.java similarity index 90% rename from spring-boot/src/test/java/org/baeldung/jsoncomponent/UserJsonSerializerIntegrationTest.java rename to spring-boot/src/test/java/org/baeldung/boot/jsoncomponent/UserJsonSerializerIntegrationTest.java index ac47c5e5d9..060374e8fa 100644 --- a/spring-boot/src/test/java/org/baeldung/jsoncomponent/UserJsonSerializerIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/boot/jsoncomponent/UserJsonSerializerIntegrationTest.java @@ -1,4 +1,4 @@ -package org.baeldung.jsoncomponent; +package org.baeldung.boot.jsoncomponent; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -11,6 +11,8 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.junit.Assert.assertEquals; +import org.baeldung.boot.jsoncomponent.User; + @JsonTest @RunWith(SpringRunner.class) public class UserJsonSerializerIntegrationTest { diff --git a/spring-boot/src/test/java/org/baeldung/boot/repository/FooRepositoryIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/repository/FooRepositoryIntegrationTest.java index a844b26b2d..5d02d34f53 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/repository/FooRepositoryIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/boot/repository/FooRepositoryIntegrationTest.java @@ -3,7 +3,8 @@ package org.baeldung.boot.repository; import static org.junit.Assert.assertThat; import org.baeldung.boot.DemoApplicationIntegrationTest; -import org.baeldung.boot.model.Foo; +import org.baeldung.demo.model.Foo; +import org.baeldung.demo.repository.FooRepository; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.is; diff --git a/spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java index be992bcc36..4658861162 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; import org.baeldung.boot.ApplicationIntegrationTest; -import org.baeldung.boot.model.Foo; +import org.baeldung.demo.model.Foo; import org.baeldung.session.exception.repository.FooRepository; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionIntegrationTest.java index 55b7fa7216..8de7068949 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionIntegrationTest.java @@ -1,7 +1,7 @@ package org.baeldung.boot.repository; import org.baeldung.boot.ApplicationIntegrationTest; -import org.baeldung.boot.model.Foo; +import org.baeldung.demo.model.Foo; import org.baeldung.session.exception.repository.FooRepository; import org.hibernate.HibernateException; import org.junit.Test; diff --git a/spring-boot/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java b/spring-boot/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java index eff383b440..499a755ae7 100644 --- a/spring-boot/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java +++ b/spring-boot/src/test/java/org/baeldung/config/H2TestProfileJPAConfig.java @@ -41,7 +41,7 @@ public class H2TestProfileJPAConfig { public LocalContainerEntityManagerFactoryBean entityManagerFactory() { final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(dataSource()); - em.setPackagesToScan(new String[] { "org.baeldung.domain", "org.baeldung.boot.model", "org.baeldung.boot.boottest" }); + em.setPackagesToScan(new String[] { "org.baeldung.domain", "org.baeldung.boot.domain", "org.baeldung.boot.boottest","org.baeldung.model" }); em.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); em.setJpaProperties(additionalProperties()); return em; diff --git a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java index 6a585b9905..fb773fc44c 100644 --- a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java +++ b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java @@ -1,8 +1,9 @@ package org.baeldung.converter; import com.baeldung.toggle.Employee; -import org.baeldung.Application; -import org.baeldung.domain.Modes; + +import org.baeldung.boot.Application; +import org.baeldung.boot.domain.Modes; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java index a5ed7998b4..06c3f740c2 100644 --- a/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java +++ b/spring-boot/src/test/java/org/baeldung/converter/controller/StringToEmployeeConverterControllerTest.java @@ -1,6 +1,5 @@ package org.baeldung.converter.controller; -import org.baeldung.Application; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -15,6 +14,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultHandlers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import org.baeldung.boot.Application; + @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) @AutoConfigureMockMvc diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeControllerIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeControllerIntegrationTest.java similarity index 93% rename from spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeControllerIntegrationTest.java rename to spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeControllerIntegrationTest.java index 2146fc09bc..f06c144908 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeControllerIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeControllerIntegrationTest.java @@ -1,5 +1,8 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; +import org.baeldung.demo.boottest.Employee; +import org.baeldung.demo.boottest.EmployeeRestController; +import org.baeldung.demo.boottest.EmployeeService; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeRepositoryIntegrationTest.java similarity index 94% rename from spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryIntegrationTest.java rename to spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeRepositoryIntegrationTest.java index ebde0e243a..221beda900 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRepositoryIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeRepositoryIntegrationTest.java @@ -1,5 +1,7 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; +import org.baeldung.demo.boottest.Employee; +import org.baeldung.demo.boottest.EmployeeRepository; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeRestControllerIntegrationTest.java similarity index 94% rename from spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntegrationTest.java rename to spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeRestControllerIntegrationTest.java index 9e5613ab10..e6f2203476 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeRestControllerIntegrationTest.java @@ -1,6 +1,8 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; -import org.baeldung.boot.DemoApplication; +import org.baeldung.demo.DemoApplication; +import org.baeldung.demo.boottest.Employee; +import org.baeldung.demo.boottest.EmployeeRepository; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeServiceImplIntegrationTest.java similarity index 94% rename from spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplIntegrationTest.java rename to spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeServiceImplIntegrationTest.java index 9837b02df6..58ef3d4081 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeServiceImplIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeServiceImplIntegrationTest.java @@ -1,5 +1,9 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; +import org.baeldung.demo.boottest.Employee; +import org.baeldung.demo.boottest.EmployeeRepository; +import org.baeldung.demo.boottest.EmployeeService; +import org.baeldung.demo.boottest.EmployeeServiceImpl; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-boot/src/test/java/org/baeldung/boot/boottest/JsonUtil.java b/spring-boot/src/test/java/org/baeldung/demo/boottest/JsonUtil.java similarity index 91% rename from spring-boot/src/test/java/org/baeldung/boot/boottest/JsonUtil.java rename to spring-boot/src/test/java/org/baeldung/demo/boottest/JsonUtil.java index 36d07164b2..7e04f47696 100644 --- a/spring-boot/src/test/java/org/baeldung/boot/boottest/JsonUtil.java +++ b/spring-boot/src/test/java/org/baeldung/demo/boottest/JsonUtil.java @@ -1,4 +1,4 @@ -package org.baeldung.boot.boottest; +package org.baeldung.demo.boottest; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java index ffd5bf55d6..a51e3a6884 100644 --- a/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java +++ b/spring-boot/src/test/java/org/baeldung/properties/ConfigPropertiesIntegrationTest.java @@ -1,5 +1,7 @@ package org.baeldung.properties; +import org.baeldung.properties.ConfigProperties; +import org.baeldung.properties.ConfigPropertiesDemoApplication; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; From 2e7d254adbb92ff47ac6d025a6dabd7edb845e3d Mon Sep 17 00:00:00 2001 From: KevinGilmore Date: Sun, 5 Nov 2017 14:06:25 -0600 Subject: [PATCH 196/197] BAEL-1133 README (#2962) * BAEL-973: updated README * BAEL-1069: Updated README * BAEL-817: add README file * BAEL-1084: README update * BAEL-960: Update README * BAEL-1155: updated README * BAEL-1041: updated README * BAEL-973: Updated README * BAEL-1187: updated README * BAEL-1183: Update README * BAEL-1133: Updated README --- core-kotlin/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/core-kotlin/README.md b/core-kotlin/README.md index 720187dc44..4b5f921f7b 100644 --- a/core-kotlin/README.md +++ b/core-kotlin/README.md @@ -15,5 +15,6 @@ - [Data Classes in Kotlin](http://www.baeldung.com/kotlin-data-classes) - [Delegated Properties in Kotlin](http://www.baeldung.com/kotlin-delegated-properties) - [Sealed Classes in Kotlin](http://www.baeldung.com/kotlin-sealed-classes) +- [JUnit 5 for Kotlin Developers](http://www.baeldung.com/junit-5-kotlin) From 90c2739563656be6c07e51ff3b1058be2322e06d Mon Sep 17 00:00:00 2001 From: tamasradu Date: Mon, 6 Nov 2017 03:46:29 +0200 Subject: [PATCH 197/197] Radu/bael 1265 junit updates (#2965) * Code for test article: Different Types of Bean Injection in Spring * Adding jUnits for test article: Different Types of Bean Injection in Spring * BAEL-1265: Adding jUnit for article * BAEL-1265: Closing ExecutorService in jUnit * BAEL-1265: Adding jUnit for CountDownLatch and example for ExecutorService.awaitTermination --- .../executorservice/DelayedCallable.java | 13 +++ .../WaitingForThreadsToFinishTest.java | 88 ++++++++++++++++--- .../ArticleFormatter.java | 16 ++++ .../ArticleWithConstructorInjection.java | 17 ++++ .../ArticleWithSetterInjection.java | 21 +++++ .../TextFormatter.java | 8 ++ .../dependencyinjectiontypes-context.xml | 23 +++++ .../DependencyInjectionTest.java | 35 ++++++++ 8 files changed, 211 insertions(+), 10 deletions(-) create mode 100644 spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleFormatter.java create mode 100644 spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleWithConstructorInjection.java create mode 100644 spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleWithSetterInjection.java create mode 100644 spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/TextFormatter.java create mode 100644 spring-core/src/main/resources/dependencyinjectiontypes-context.xml create mode 100644 spring-core/src/test/java/com/baeldung/dependencyinjectiontypes/DependencyInjectionTest.java diff --git a/core-java-concurrency/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java b/core-java-concurrency/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java index 2f0796b491..16d9aa4c9f 100644 --- a/core-java-concurrency/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java +++ b/core-java-concurrency/src/main/java/com/baeldung/concurrent/executorservice/DelayedCallable.java @@ -1,11 +1,18 @@ package com.baeldung.concurrent.executorservice; import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; public class DelayedCallable implements Callable { private String name; private long period; + private CountDownLatch latch; + + public DelayedCallable(String name, long period, CountDownLatch latch) { + this(name, period); + this.latch = latch; + } public DelayedCallable(String name, long period) { this.name = name; @@ -16,9 +23,15 @@ public class DelayedCallable implements Callable { try { Thread.sleep(period); + + if (latch != null) { + latch.countDown(); + } + } catch (InterruptedException ex) { // handle exception ex.printStackTrace(); + Thread.currentThread().interrupt(); } return name; diff --git a/core-java-concurrency/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishTest.java b/core-java-concurrency/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishTest.java index 0f461909ea..17b71aa35b 100644 --- a/core-java-concurrency/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishTest.java +++ b/core-java-concurrency/src/test/java/com/baeldung/concurrent/executorservice/WaitingForThreadsToFinishTest.java @@ -9,22 +9,91 @@ import java.util.List; import java.util.concurrent.*; import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.fail; public class WaitingForThreadsToFinishTest { private static final Logger LOG = LoggerFactory.getLogger(WaitingForThreadsToFinishTest.class); private final static ExecutorService WORKER_THREAD_POOL = Executors.newFixedThreadPool(10); + public void awaitTerminationAfterShutdown(ExecutorService threadPool) { + threadPool.shutdown(); + try { + if (!threadPool.awaitTermination(60, TimeUnit.SECONDS)) { + threadPool.shutdownNow(); + } + } catch (InterruptedException ex) { + threadPool.shutdownNow(); + Thread.currentThread().interrupt(); + } + } + + @Test + public void givenMultipleThreads_whenUsingCountDownLatch_thenMainShoudWaitForAllToFinish() { + + ExecutorService WORKER_THREAD_POOL = Executors.newFixedThreadPool(10); + + try { + long startTime = System.currentTimeMillis(); + + // create a CountDownLatch that waits for the 2 threads to finish + CountDownLatch latch = new CountDownLatch(2); + + for (int i = 0; i < 2; i++) { + WORKER_THREAD_POOL.submit(new Runnable() { + @Override + public void run() { + try { + Thread.sleep(1000); + latch.countDown(); + } catch (InterruptedException e) { + e.printStackTrace(); + Thread.currentThread().interrupt(); + } + } + }); + } + + // wait for the latch to be decremented by the two threads + latch.await(); + + long processingTime = System.currentTimeMillis() - startTime; + assertTrue(processingTime >= 1000); + + } catch (InterruptedException e) { + e.printStackTrace(); + } + + awaitTerminationAfterShutdown(WORKER_THREAD_POOL); + } + @Test public void givenMultipleThreads_whenInvokeAll_thenMainThreadShouldWaitForAllToFinish() { ExecutorService WORKER_THREAD_POOL = Executors.newFixedThreadPool(10); - List> callables = Arrays.asList(new DelayedCallable("fast thread", 100), new DelayedCallable("slow thread", 3000)); - + List> callables = Arrays.asList( + new DelayedCallable("fast thread", 100), + new DelayedCallable("slow thread", 3000)); + try { long startProcessingTime = System.currentTimeMillis(); List> futures = WORKER_THREAD_POOL.invokeAll(callables); + + awaitTerminationAfterShutdown(WORKER_THREAD_POOL); + + try { + WORKER_THREAD_POOL.submit(new Callable() { + @Override + public String call() throws Exception { + fail("This thread should have been rejected !"); + Thread.sleep(1000000); + return null; + } + }); + } catch (RejectedExecutionException ex) { + // + } long totalProcessingTime = System.currentTimeMillis() - startProcessingTime; assertTrue(totalProcessingTime >= 3000); @@ -39,9 +108,7 @@ public class WaitingForThreadsToFinishTest { } catch (ExecutionException | InterruptedException ex) { ex.printStackTrace(); - } - - WORKER_THREAD_POOL.shutdown(); + } } @Test @@ -49,14 +116,14 @@ public class WaitingForThreadsToFinishTest { CompletionService service = new ExecutorCompletionService<>(WORKER_THREAD_POOL); - List> callables = Arrays.asList(new DelayedCallable("fast thread", 100), new DelayedCallable("slow thread", 3000)); + List> callables = Arrays.asList( + new DelayedCallable("fast thread", 100), + new DelayedCallable("slow thread", 3000)); for (Callable callable : callables) { service.submit(callable); } - WORKER_THREAD_POOL.shutdown(); - try { long startProcessingTime = System.currentTimeMillis(); @@ -79,8 +146,9 @@ public class WaitingForThreadsToFinishTest { } catch (ExecutionException | InterruptedException ex) { ex.printStackTrace(); + } finally { + awaitTerminationAfterShutdown(WORKER_THREAD_POOL); } - } @Test @@ -142,6 +210,6 @@ public class WaitingForThreadsToFinishTest { e.printStackTrace(); } - WORKER_THREAD_POOL.shutdown(); + awaitTerminationAfterShutdown(WORKER_THREAD_POOL); } } diff --git a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleFormatter.java b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleFormatter.java new file mode 100644 index 0000000000..069e9df084 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleFormatter.java @@ -0,0 +1,16 @@ +package com.baeldung.dependencyinjectiontypes; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class ArticleFormatter { + + @SuppressWarnings("resource") + public static void main(String[] args) { + ApplicationContext context = new ClassPathXmlApplicationContext("dependencyinjectiontypes-context.xml"); + ArticleWithSetterInjection article = (ArticleWithSetterInjection) context.getBean("articleWithSetterInjectionBean"); + String formattedArticle = article.format("This is a text !"); + + System.out.print(formattedArticle); + } +} diff --git a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleWithConstructorInjection.java b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleWithConstructorInjection.java new file mode 100644 index 0000000000..776e9f4040 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleWithConstructorInjection.java @@ -0,0 +1,17 @@ +package com.baeldung.dependencyinjectiontypes; + +import org.springframework.beans.factory.annotation.Autowired; + +public class ArticleWithConstructorInjection { + + private TextFormatter formatter; + + @Autowired + public ArticleWithConstructorInjection(TextFormatter formatter) { + this.formatter = formatter; + } + + public String format(String text) { + return formatter.format(text); + } +} diff --git a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleWithSetterInjection.java b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleWithSetterInjection.java new file mode 100644 index 0000000000..931c6ea276 --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/ArticleWithSetterInjection.java @@ -0,0 +1,21 @@ +package com.baeldung.dependencyinjectiontypes; + +import org.springframework.beans.factory.annotation.Autowired; + +public class ArticleWithSetterInjection { + + private TextFormatter formatter; + + public ArticleWithSetterInjection(TextFormatter formatter) { + this.formatter = formatter; + } + + @Autowired + public void setTextFormatter(TextFormatter formatter) { + this.formatter = formatter; + } + + public String format(String text) { + return formatter.format(text); + } +} diff --git a/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/TextFormatter.java b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/TextFormatter.java new file mode 100644 index 0000000000..204436c9bd --- /dev/null +++ b/spring-core/src/main/java/com/baeldung/dependencyinjectiontypes/TextFormatter.java @@ -0,0 +1,8 @@ +package com.baeldung.dependencyinjectiontypes; + +public class TextFormatter { + + public String format(String text) { + return text.toUpperCase(); + } +} diff --git a/spring-core/src/main/resources/dependencyinjectiontypes-context.xml b/spring-core/src/main/resources/dependencyinjectiontypes-context.xml new file mode 100644 index 0000000000..bd6b3c408d --- /dev/null +++ b/spring-core/src/main/resources/dependencyinjectiontypes-context.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-core/src/test/java/com/baeldung/dependencyinjectiontypes/DependencyInjectionTest.java b/spring-core/src/test/java/com/baeldung/dependencyinjectiontypes/DependencyInjectionTest.java new file mode 100644 index 0000000000..57c1927e58 --- /dev/null +++ b/spring-core/src/test/java/com/baeldung/dependencyinjectiontypes/DependencyInjectionTest.java @@ -0,0 +1,35 @@ +package com.baeldung.dependencyinjectiontypes; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +public class DependencyInjectionTest { + + @Test + public void givenAutowiredAnnotation_WhenSetOnSetter_ThenDependencyValid() { + + ApplicationContext context = new ClassPathXmlApplicationContext("dependencyinjectiontypes-context.xml"); + ArticleWithSetterInjection article = (ArticleWithSetterInjection) context.getBean("articleWithSetterInjectionBean"); + + String originalText = "This is a text !"; + String formattedArticle = article.format(originalText); + + assertTrue(originalText.toUpperCase().equals(formattedArticle)); + } + + @Test + public void givenAutowiredAnnotation_WhenSetOnConstructor_ThenDependencyValid() { + + ApplicationContext context = new ClassPathXmlApplicationContext("dependencyinjectiontypes-context.xml"); + ArticleWithConstructorInjection article = (ArticleWithConstructorInjection) context.getBean("articleWithConstructorInjectionBean"); + + String originalText = "This is a text !"; + String formattedArticle = article.format(originalText); + + assertTrue(originalText.toUpperCase().equals(formattedArticle)); + } + +}