Merge remote-tracking branch 'upstream/master'

2017-12-01 11:14:58 +05:30
parent d51b1b4f20 d45a891d4c
commit a793b67436
78 changed files with 2520 additions and 206 deletions
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Eugen Paraschiv
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -1,9 +1,14 @@

 The "REST with Spring" Classes
 ==============================
+
 After 5 months of work, here's the Master Class of REST With Spring: <br/>
 **[>> THE REST WITH SPRING MASTER CLASS](http://www.baeldung.com/rest-with-spring-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=rws#master-class)**

+And here's the Master Class of Learn Spring Security: <br/>
+**[>> LEARN SPRING SECURITY MASTER CLASS](http://www.baeldung.com/learn-spring-security-course?utm_source=github&utm_medium=social&utm_content=tutorials&utm_campaign=lss#master-class)**
+
+

 Spring Tutorials
 ================
@@ -0,0 +1,224 @@
+package com.baeldung.poi.powerpoint;
+
+import org.apache.poi.sl.usermodel.AutoNumberingScheme;
+import org.apache.poi.sl.usermodel.PictureData;
+import org.apache.poi.sl.usermodel.TableCell;
+import org.apache.poi.sl.usermodel.TextParagraph;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xslf.usermodel.*;
+
+import java.awt.*;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Helper class for the PowerPoint presentation creation
+ */
+public class PowerPointHelper {
+
+    /**
+     * Read an existing presentation
+     *
+     * @param fileLocation
+     *            File location of the presentation
+     * @return instance of {@link XMLSlideShow}
+     * @throws IOException
+     */
+    public XMLSlideShow readingExistingSlideShow(String fileLocation) throws IOException {
+        return new XMLSlideShow(new FileInputStream(fileLocation));
+    }
+
+    /**
+     * Create a sample presentation
+     *
+     * @param fileLocation
+     *            File location of the presentation
+     * @throws IOException
+     */
+    public void createPresentation(String fileLocation) throws IOException {
+        // Create presentation
+        XMLSlideShow ppt = new XMLSlideShow();
+
+        XSLFSlideMaster defaultMaster = ppt.getSlideMasters().get(0);
+
+        // Retriving the slide layout
+        XSLFSlideLayout layout = defaultMaster.getLayout(SlideLayout.TITLE_ONLY);
+
+        // Creating the 1st slide
+        XSLFSlide slide1 = ppt.createSlide(layout);
+        XSLFTextShape title = slide1.getPlaceholder(0);
+        // Clearing text to remove the predefined one in the template
+        title.clearText();
+        XSLFTextParagraph p = title.addNewTextParagraph();
+
+        XSLFTextRun r1 = p.addNewTextRun();
+        r1.setText("Baeldung");
+        r1.setFontColor(new Color(78, 147, 89));
+        r1.setFontSize(48.);
+
+        // Add Image
+        ClassLoader classLoader = getClass().getClassLoader();
+        byte[] pictureData = IOUtils.toByteArray(new FileInputStream(classLoader.getResource("logo-leaf.png").getFile()));
+
+        XSLFPictureData pd = ppt.addPicture(pictureData, PictureData.PictureType.PNG);
+        XSLFPictureShape picture = slide1.createPicture(pd);
+        picture.setAnchor(new Rectangle(320, 230, 100, 92));
+
+        // Creating 2nd slide
+        layout = defaultMaster.getLayout(SlideLayout.TITLE_AND_CONTENT);
+        XSLFSlide slide2 = ppt.createSlide(layout);
+
+        // setting the tile
+        title = slide2.getPlaceholder(0);
+        title.clearText();
+        XSLFTextRun r = title.addNewTextParagraph().addNewTextRun();
+        r.setText("Baeldung");
+
+        // Adding the link
+        XSLFHyperlink link = r.createHyperlink();
+        link.setAddress("http://www.baeldung.com");
+
+        // setting the content
+        XSLFTextShape content = slide2.getPlaceholder(1);
+        content.clearText(); // unset any existing text
+        content.addNewTextParagraph().addNewTextRun().setText("First paragraph");
+        content.addNewTextParagraph().addNewTextRun().setText("Second paragraph");
+        content.addNewTextParagraph().addNewTextRun().setText("Third paragraph");
+
+        // Creating 3rd slide - List
+        layout = defaultMaster.getLayout(SlideLayout.TITLE_AND_CONTENT);
+        XSLFSlide slide3 = ppt.createSlide(layout);
+        title = slide3.getPlaceholder(0);
+        title.clearText();
+        r = title.addNewTextParagraph().addNewTextRun();
+        r.setText("Lists");
+
+        content = slide3.getPlaceholder(1);
+        content.clearText();
+        XSLFTextParagraph p1 = content.addNewTextParagraph();
+        p1.setIndentLevel(0);
+        p1.setBullet(true);
+        r1 = p1.addNewTextRun();
+        r1.setText("Bullet");
+
+        // the next three paragraphs form an auto-numbered list
+        XSLFTextParagraph p2 = content.addNewTextParagraph();
+        p2.setBulletAutoNumber(AutoNumberingScheme.alphaLcParenRight, 1);
+        p2.setIndentLevel(1);
+        XSLFTextRun r2 = p2.addNewTextRun();
+        r2.setText("Numbered List Item - 1");
+
+        // Creating 4th slide
+        XSLFSlide slide4 = ppt.createSlide();
+        createTable(slide4);
+
+        // Save presentation
+        FileOutputStream out = new FileOutputStream(fileLocation);
+        ppt.write(out);
+        out.close();
+
+        // Closing presentation
+        ppt.close();
+    }
+
+    /**
+     * Delete a slide from the presentation
+     *
+     * @param ppt
+     *            The presentation
+     * @param slideNumber
+     *            The number of the slide to be deleted (0-based)
+     */
+    public void deleteSlide(XMLSlideShow ppt, int slideNumber) {
+        ppt.removeSlide(slideNumber);
+    }
+
+    /**
+     * Re-order the slides inside a presentation
+     *
+     * @param ppt
+     *            The presentation
+     * @param slideNumber
+     *            The number of the slide to move
+     * @param newSlideNumber
+     *            The new position of the slide (0-base)
+     */
+    public void reorderSlide(XMLSlideShow ppt, int slideNumber, int newSlideNumber) {
+        List<XSLFSlide> slides = ppt.getSlides();
+
+        XSLFSlide secondSlide = slides.get(slideNumber);
+        ppt.setSlideOrder(secondSlide, newSlideNumber);
+    }
+
+    /**
+     * Retrieve the placeholder inside a slide
+     * 
+     * @param slide 
+     *          The slide
+     * @return List of placeholder inside a slide
+     */
+    public List<XSLFShape> retrieveTemplatePlaceholders(XSLFSlide slide) {
+        List<XSLFShape> placeholders = new ArrayList<>();
+
+        for (XSLFShape shape : slide.getShapes()) {
+            if (shape instanceof XSLFAutoShape) {
+                placeholders.add(shape);
+            }
+        }
+        return placeholders;
+    }
+
+    /**
+     * Create a table
+     *
+     * @param slide
+     *            Slide
+     */
+    private void createTable(XSLFSlide slide) {
+
+        XSLFTable tbl = slide.createTable();
+        tbl.setAnchor(new Rectangle(50, 50, 450, 300));
+
+        int numColumns = 3;
+        int numRows = 5;
+
+        // header
+        XSLFTableRow headerRow = tbl.addRow();
+        headerRow.setHeight(50);
+        for (int i = 0; i < numColumns; i++) {
+            XSLFTableCell th = headerRow.addCell();
+            XSLFTextParagraph p = th.addNewTextParagraph();
+            p.setTextAlign(TextParagraph.TextAlign.CENTER);
+            XSLFTextRun r = p.addNewTextRun();
+            r.setText("Header " + (i + 1));
+            r.setBold(true);
+            r.setFontColor(Color.white);
+            th.setFillColor(new Color(79, 129, 189));
+            th.setBorderWidth(TableCell.BorderEdge.bottom, 2.0);
+            th.setBorderColor(TableCell.BorderEdge.bottom, Color.white);
+            // all columns are equally sized
+            tbl.setColumnWidth(i, 150);
+        }
+
+        // data
+        for (int rownum = 0; rownum < numRows; rownum++) {
+            XSLFTableRow tr = tbl.addRow();
+            tr.setHeight(50);
+            for (int i = 0; i < numColumns; i++) {
+                XSLFTableCell cell = tr.addCell();
+                XSLFTextParagraph p = cell.addNewTextParagraph();
+                XSLFTextRun r = p.addNewTextRun();
+
+                r.setText("Cell " + (i * rownum + 1));
+                if (rownum % 2 == 0) {
+                    cell.setFillColor(new Color(208, 216, 232));
+                } else {
+                    cell.setFillColor(new Color(233, 247, 244));
+                }
+            }
+        }
+    }
+}
@@ -0,0 +1,77 @@
+package com.baeldung.poi.powerpoint;
+
+import org.apache.poi.xslf.usermodel.XMLSlideShow;
+import org.apache.poi.xslf.usermodel.XSLFShape;
+import org.apache.poi.xslf.usermodel.XSLFSlide;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.List;
+
+public class PowerPointIntegrationTest {
+
+    private PowerPointHelper pph;
+    private String fileLocation;
+    private static final String FILE_NAME = "presentation.pptx";
+
+    @Before
+    public void setUp() throws Exception {
+        File currDir = new File(".");
+        String path = currDir.getAbsolutePath();
+        fileLocation = path.substring(0, path.length() - 1) + FILE_NAME;
+
+        pph = new PowerPointHelper();
+        pph.createPresentation(fileLocation);
+    }
+
+    @Test
+    public void whenReadingAPresentation_thenOK() throws Exception {
+        XMLSlideShow xmlSlideShow = pph.readingExistingSlideShow(fileLocation);
+
+        Assert.assertNotNull(xmlSlideShow);
+        Assert.assertEquals(4, xmlSlideShow.getSlides().size());
+    }
+
+    @Test
+    public void whenRetrievingThePlaceholdersForEachSlide_thenOK() throws Exception {
+        XMLSlideShow xmlSlideShow = pph.readingExistingSlideShow(fileLocation);
+
+        List<XSLFShape> onlyTitleSlidePlaceholders = pph.retrieveTemplatePlaceholders(xmlSlideShow.getSlides().get(0));
+        List<XSLFShape> titleAndBodySlidePlaceholders = pph.retrieveTemplatePlaceholders(xmlSlideShow.getSlides().get(1));
+        List<XSLFShape> emptySlidePlaceholdes = pph.retrieveTemplatePlaceholders(xmlSlideShow.getSlides().get(3));
+
+        Assert.assertEquals(1, onlyTitleSlidePlaceholders.size());
+        Assert.assertEquals(2, titleAndBodySlidePlaceholders.size());
+        Assert.assertEquals(0, emptySlidePlaceholdes.size());
+
+    }
+
+    @Test
+    public void whenSortingSlides_thenOK() throws Exception {
+        XMLSlideShow xmlSlideShow = pph.readingExistingSlideShow(fileLocation);
+        XSLFSlide slide4 = xmlSlideShow.getSlides().get(3);
+        pph.reorderSlide(xmlSlideShow, 3, 1);
+
+        Assert.assertEquals(slide4, xmlSlideShow.getSlides().get(1));
+    }
+
+    @Test
+    public void givenPresentation_whenDeletingASlide_thenOK() throws Exception {
+        XMLSlideShow xmlSlideShow = pph.readingExistingSlideShow(fileLocation);
+        pph.deleteSlide(xmlSlideShow, 3);
+
+        Assert.assertEquals(3, xmlSlideShow.getSlides().size());
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        File testFile = new File(fileLocation);
+        if (testFile.exists()) {
+            testFile.delete();
+        }
+        pph = null;
+    }
+}
@@ -28,8 +28,14 @@
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.12</version>
      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
    </dependency>
  </dependencies>
  <dependencyManagement>
@@ -0,0 +1,33 @@
+package com.baeldung.concurrent.waitandnotify;
+
+public class Data {
+    private String packet;
+    
+    // True if receiver should wait
+    // False if sender should wait
+    private boolean transfer = true;
+ 
+    public synchronized String receive() {
+        while (transfer) {
+            try {
+                wait();
+            } catch (InterruptedException e) {}
+        }
+        transfer = true;
+
+        notifyAll();
+        return packet;
+    }
+ 
+    public synchronized void send(String packet) {
+        while (!transfer) {
+            try { 
+                wait();
+            } catch (InterruptedException e) {}
+        }
+        transfer = false;
+        
+        this.packet = packet;
+        notifyAll();
+    }
+}
@@ -0,0 +1,12 @@
+package com.baeldung.concurrent.waitandnotify;
+
+public class NetworkDriver {
+    public static void main(String[] args) {
+        Data data = new Data();
+        Thread sender = new Thread(new Sender(data));
+        Thread receiver = new Thread(new Receiver(data));
+        
+        sender.start();
+        receiver.start();
+    }
+}
@@ -0,0 +1,25 @@
+package com.baeldung.concurrent.waitandnotify;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+public class Receiver implements Runnable {
+    private Data load;
+ 
+    public Receiver(Data load) {
+        this.load = load;
+    }
+ 
+    public void run() {
+        for(String receivedMessage = load.receive();
+          !"End".equals(receivedMessage) ;
+          receivedMessage = load.receive()) {
+            
+            System.out.println(receivedMessage);
+
+            //Thread.sleep() to mimic heavy server-side processing
+            try {
+                Thread.sleep(ThreadLocalRandom.current().nextInt(1000, 5000));
+            } catch (InterruptedException e) {}
+        }
+    }
+}
@@ -0,0 +1,30 @@
+package com.baeldung.concurrent.waitandnotify;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+public class Sender implements Runnable {
+    private Data data;
+ 
+    public Sender(Data data) {
+        this.data = data;
+    }
+ 
+    public void run() {
+        String packets[] = {
+            "First packet",
+            "Second packet",
+            "Third packet",
+            "Fourth packet",
+            "End"
+        };
+ 
+        for (String packet : packets) {
+            data.send(packet);
+            
+            //Thread.sleep() to mimic heavy server-side processing
+            try {
+                Thread.sleep(ThreadLocalRandom.current().nextInt(1000, 5000));
+            } catch (InterruptedException e) {}
+        }
+    }
+}
@@ -1,7 +1,11 @@
 package com.baeldung.concurrent.stopping;

+import com.jayway.awaitility.Awaitility;
 import org.junit.Test;

+import java.util.concurrent.TimeUnit;
+
+import static com.jayway.awaitility.Awaitility.await;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

@@ -22,11 +26,10 @@ public class StopThreadTest {

        // Stop it and make sure the flags have been reversed
        controlSubThread.stop();
-        Thread.sleep(interval);
-        assertTrue(controlSubThread.isStopped());
+        await()
+          .until(() -> assertTrue(controlSubThread.isStopped()));
    }

-
    @Test
    public void whenInterruptedThreadIsStopped() throws InterruptedException {

@@ -44,7 +47,8 @@ public class StopThreadTest {
        controlSubThread.interrupt();

        // Wait less than the time we would normally sleep, and make sure we exited.
-        Thread.sleep(interval/10);
-        assertTrue(controlSubThread.isStopped());
+        Awaitility.await()
+          .atMost(interval/ 10, TimeUnit.MILLISECONDS)
+          .until(controlSubThread::isStopped);
    }
 }
@@ -0,0 +1,65 @@
+package com.baeldung.concurrent.waitandnotify;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class NetworkIntegrationTest {
+
+	private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
+	private final ByteArrayOutputStream errContent = new ByteArrayOutputStream();
+	private String expected;
+	
+	@Before
+	public void setUpStreams() {
+	    System.setOut(new PrintStream(outContent));
+	    System.setErr(new PrintStream(errContent));
+	}
+	
+	@Before
+	public void setUpExpectedOutput() {
+		StringWriter expectedStringWriter = new StringWriter();
+		
+		PrintWriter printWriter = new PrintWriter(expectedStringWriter);
+		printWriter.println("First packet");
+		printWriter.println("Second packet");
+		printWriter.println("Third packet");
+		printWriter.println("Fourth packet");
+		printWriter.close();
+		
+		expected = expectedStringWriter.toString();
+	}
+
+	@After
+	public void cleanUpStreams() {
+	    System.setOut(null);
+	    System.setErr(null);
+	}
+	
+	@Test
+	public void givenSenderAndReceiver_whenSendingPackets_thenNetworkSynchronized() {
+        Data data = new Data();
+        Thread sender = new Thread(new Sender(data));
+        Thread receiver = new Thread(new Receiver(data));
+        
+        sender.start();
+        receiver.start();
+        
+        //wait for sender and receiver to finish before we test against expected
+        try {
+			sender.join();
+			receiver.join();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+		
+	    assertEquals(expected, outContent.toString());
+	}
+}
@@ -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
@@ -0,0 +1,6 @@
+=========
+
+## Core Java Cookbooks and Examples
+
+### Relevant Articles: 
+- [Creating a Java Compiler Plugin](http://www.baeldung.com/java-build-compiler-plugin)
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
@@ -0,0 +1,2 @@
+### Relevant Articles:
+- [SHA-256 Hashing in Java](http://www.baeldung.com/sha-256-hashing-java)
@@ -0,0 +1,6 @@
+log4j.rootLogger=DEBUG, A1
+
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>web - %date [%thread] %-5level %logger{36} - %message%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
@@ -181,11 +181,6 @@
            <version>2.1.0.1</version>
        </dependency>

-        <dependency>
-            <groupId>com.sun.messaging.mq</groupId>
-            <artifactId>fscontext</artifactId>
-            <version>${fscontext.version}</version>
-        </dependency>
        <dependency>
            <groupId>com.codepoetics</groupId>
            <artifactId>protonpack</artifactId>
@@ -216,13 +211,6 @@
 		    <artifactId>spring-web</artifactId>
 		    <version>4.3.4.RELEASE</version>
 		</dependency>
-        <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>tools</artifactId>
-            <version>1.8.0</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency>
    </dependencies>

    <build>
@@ -0,0 +1,51 @@
+package com.baeldung.comparable;
+
+public class Player implements Comparable<Player> {
+
+    private int ranking;
+
+    private String name;
+
+    private int age;
+
+    public Player(int ranking, String name, int age) {
+        this.ranking = ranking;
+        this.name = name;
+        this.age = age;
+    }
+
+    public int getRanking() {
+        return ranking;
+    }
+
+    public void setRanking(int ranking) {
+        this.ranking = ranking;
+    }
+
+    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 this.name;
+    }
+
+    @Override
+    public int compareTo(Player otherPlayer) {
+        return (this.getRanking() - otherPlayer.getRanking());
+    }
+
+}
@@ -0,0 +1,25 @@
+package com.baeldung.comparable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class PlayerSorter {
+
+    public static void main(String[] args) {
+
+        List<Player> footballTeam = new ArrayList<Player>();
+        Player player1 = new Player(59, "John", 20);
+        Player player2 = new Player(67, "Roger", 22);
+        Player player3 = new Player(45, "Steven", 24);
+        footballTeam.add(player1);
+        footballTeam.add(player2);
+        footballTeam.add(player3);
+
+        System.out.println("Before Sorting : " + footballTeam);
+        Collections.sort(footballTeam);
+        System.out.println("After Sorting : " + footballTeam);
+
+    }
+
+}
--- a/Show More
+++ b/Show More