Fixed conflicts

JGit/src/main/java/com/baeldung/jgit/porcelain/Log.java

@@ -28,14 +28,14 @@ public class Log {
                 System.out.println("Had " + count + " commits overall on current branch");
 
                 logs = git.log()
-                        .add(repository.resolve("remotes/origin/testbranch"))
+                        .add(repository.resolve(git.getRepository().getFullBranch()))
                         .call();
                 count = 0;
                 for (RevCommit rev : logs) {
                     System.out.println("Commit: " + rev /* + ", name: " + rev.getName() + ", id: " + rev.getId().getName() */);
                     count++;
                 }
-                System.out.println("Had " + count + " commits overall on test-branch");
+                System.out.println("Had " + count + " commits overall on "+git.getRepository().getFullBranch());
 
                 logs = git.log()
                         .all()

JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java

@@ -1,3 +1,5 @@
+package com.baeldung.jgit;
+
 import com.baeldung.jgit.helper.Helper;
 import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.ObjectReader;

algorithms-miscellaneous-1/src/main/java/com/baeldung/algorithms/string/SubstringPalindrome.java

@@ -1,4 +1,4 @@
-package com.baeldung.string;
+package com.baeldung.algorithms.string;
 
 import java.util.HashSet;
 import java.util.Set;

algorithms-miscellaneous-1/src/test/java/com/baeldung/algorithms/string/SubstringPalindromeUnitTest.java

@@ -1,4 +1,4 @@
-package com.baeldung.string;
+package com.baeldung.algorithms.string;
 
 import static org.junit.Assert.assertEquals;
 import java.util.HashSet;

algorithms-miscellaneous-2/pom.xml

@@ -33,6 +33,11 @@
             <artifactId>jgrapht-core</artifactId>
             <version>${org.jgrapht.core.version}</version>
         </dependency>
+        <dependency>
+        	<groupId>org.jgrapht</groupId>
+        	<artifactId>jgrapht-ext</artifactId>
+        	<version>${org.jgrapht.ext.version}</version>
+        </dependency>
         <dependency>
             <groupId>pl.allegro.finance</groupId>
             <artifactId>tradukisto</artifactId>
@@ -83,6 +88,7 @@
         <commons-math3.version>3.6.1</commons-math3.version>
         <tradukisto.version>1.0.1</tradukisto.version>
         <org.jgrapht.core.version>1.0.1</org.jgrapht.core.version>
+        <org.jgrapht.ext.version>1.0.1</org.jgrapht.ext.version>
         <org.assertj.core.version>3.9.0</org.assertj.core.version>
         <commons-codec.version>1.11</commons-codec.version>
     </properties>

algorithms-miscellaneous-2/src/test/java/com/baeldung/jgrapht/GraphImageGenerationUnitTest.java

@@ -0,0 +1,47 @@
+package com.baeldung.jgrapht;
+
+import static org.junit.Assert.assertTrue;
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import org.jgrapht.ext.JGraphXAdapter;
+import org.jgrapht.graph.DefaultDirectedGraph;
+import org.jgrapht.graph.DefaultEdge;
+import org.junit.Before;
+import org.junit.Test;
+import com.mxgraph.layout.mxCircleLayout;
+import com.mxgraph.layout.mxIGraphLayout;
+import com.mxgraph.util.mxCellRenderer;
+
+public class GraphImageGenerationUnitTest {
+    static DefaultDirectedGraph<String, DefaultEdge> g;
+
+    @Before
+    public void createGraph() throws IOException {
+        File imgFile = new File("src/test/resources/graph.png");
+        imgFile.createNewFile();
+        g = new DefaultDirectedGraph<String, DefaultEdge>(DefaultEdge.class);
+        String x1 = "x1";
+        String x2 = "x2";
+        String x3 = "x3";
+        g.addVertex(x1);
+        g.addVertex(x2);
+        g.addVertex(x3);
+        g.addEdge(x1, x2);
+        g.addEdge(x2, x3);
+        g.addEdge(x3, x1);
+    }
+
+    @Test
+    public void givenAdaptedGraph_whenWriteBufferedImage_ThenFileShouldExist() throws IOException {
+        JGraphXAdapter<String, DefaultEdge> graphAdapter = new JGraphXAdapter<String, DefaultEdge>(g);
+        mxIGraphLayout layout = new mxCircleLayout(graphAdapter);
+        layout.execute(graphAdapter.getDefaultParent());
+        File imgFile = new File("src/test/resources/graph.png");
+        BufferedImage image = mxCellRenderer.createBufferedImage(graphAdapter, null, 2, Color.WHITE, true, null);
+        ImageIO.write(image, "PNG", imgFile);
+        assertTrue(imgFile.exists());
+    }
+}

algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java

@@ -34,7 +34,7 @@ public class MergeSort {
 
         while (i < left && j < right) {
 
-            if (l[i] < r[j])
+            if (l[i] <= r[j])
                 a[k++] = l[i++];
             else
                 a[k++] = r[j++];

core-java-11/src/main/java/com/baeldung/add

@@ -0,0 +1,12 @@
+#!/usr/local/bin/java --source 11
+
+import java.util.Arrays;
+
+public class Addition
+{
+    public static void main(String[] args) {
+        System.out.println(Arrays.stream(args)
+          .mapToInt(Integer::parseInt)
+          .sum());
+    }
+}

core-java-8/src/main/java/com/baeldung/interfaces/multiinheritance/Fly.java

@@ -0,0 +1,5 @@
+package com.baeldung.interfaces.multiinheritance;
+
+public abstract interface Fly{
+    void fly();
+}

core-java-8/src/main/java/com/baeldung/interfaces/multiinheritance/Transform.java

@@ -0,0 +1,5 @@
+package com.baeldung.interfaces.multiinheritance;
+
+public interface Transform {
+    void transform();
+}

core-java-8/src/main/java/com/baeldung/interfaces/multiinheritance/Vehicle.java

@@ -0,0 +1,13 @@
+package com.baeldung.interfaces.multiinheritance;
+
+public class Vehicle implements Fly, Transform {
+    @Override
+    public void fly() {
+        System.out.println("I can Fly!!");
+    }
+
+    @Override
+    public void transform() {
+        System.out.println("I can Transform!!");
+    }
+}

core-java-8/src/main/java/com/baeldung/interfaces/polymorphysim/Circle.java

@@ -0,0 +1,21 @@
+package com.baeldung.interfaces.polymorphysim;
+
+public class Circle implements Shape {
+
+    private double radius;
+
+    public Circle(double radius){
+        this.radius = radius;
+    }
+
+    @Override
+    public String name() {
+        return "Circle";
+    }
+
+    @Override
+    public double area() {
+        return Math.PI * (radius * radius);
+    }
+
+}

core-java-8/src/main/java/com/baeldung/interfaces/polymorphysim/DisplayShape.java

@@ -0,0 +1,22 @@
+package com.baeldung.interfaces.polymorphysim;
+
+import java.util.ArrayList;
+
+public class DisplayShape {
+
+    private ArrayList<Shape> shapes;
+
+    public DisplayShape() {
+        shapes = new ArrayList<>();
+    }
+
+    public void add(Shape shape) {
+        shapes.add(shape);
+    }
+
+    public void display() {
+        for (Shape shape : shapes) {
+            System.out.println(shape.name() + " area: " + shape.area());
+        }
+    }
+}

core-java-8/src/main/java/com/baeldung/interfaces/polymorphysim/MainPolymorphic.java

@@ -0,0 +1,15 @@
+package com.baeldung.interfaces.polymorphysim;
+
+public class MainPolymorphic {
+    public static void main(String[] args){
+
+        Shape circleShape = new Circle(2);
+        Shape squareShape = new Square(2);
+
+        DisplayShape displayShape = new DisplayShape();
+        displayShape.add(circleShape);
+        displayShape.add(squareShape);
+
+        displayShape.display();
+    }
+}

core-java-8/src/main/java/com/baeldung/interfaces/polymorphysim/Shape.java

@@ -0,0 +1,6 @@
+package com.baeldung.interfaces.polymorphysim;
+
+public interface Shape {
+    public abstract String name();
+    public abstract double area();
+}

core-java-8/src/main/java/com/baeldung/interfaces/polymorphysim/Square.java

@@ -0,0 +1,20 @@
+package com.baeldung.interfaces.polymorphysim;
+
+public class Square implements Shape {
+
+    private double width;
+
+    public Square(double width) {
+        this.width = width;
+    }
+
+    @Override
+    public String name() {
+        return "Square";
+    }
+
+    @Override
+    public double area() {
+        return width * width;
+    }
+}

core-java-8/src/test/java/com/baeldung/interfaces/PolymorphysimUnitTest.java

@@ -0,0 +1,26 @@
+package com.baeldung.interfaces;
+
+import com.baeldung.interfaces.polymorphysim.Circle;
+import com.baeldung.interfaces.polymorphysim.Shape;
+import com.baeldung.interfaces.polymorphysim.Square;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class PolymorphysimUnitTest {
+
+    @Test
+    public void whenInterfacePointsToCircle_CircleAreaMethodisBeingCalled(){
+        double expectedArea = 12.566370614359172;
+        Shape circle = new Circle(2);
+        double actualArea = circle.area();
+        Assertions.assertThat(actualArea).isEqualTo(expectedArea);
+    }
+
+    @Test
+    public void whenInterfacePointsToSquare_SquareAreaMethodisBeingCalled(){
+        double expectedArea = 4;
+        Shape square = new Square(2);
+        double actualArea = square.area();
+        Assertions.assertThat(actualArea).isEqualTo(expectedArea);
+    }
+}

core-java-collections/src/main/java/com/baeldung/list/multidimensional/ArrayListOfArrayList.java

@@ -0,0 +1,37 @@
+package com.baeldung.list.multidimensional;
+
+import java.util.ArrayList;
+
+public class ArrayListOfArrayList {
+
+    public static void main(String args[]) {
+
+        int vertex = 5;
+        ArrayList<ArrayList<Integer>> graph = new ArrayList<>(vertex);
+
+        //Initializing each element of ArrayList with ArrayList
+        for(int i=0; i< vertex; i++) {
+            graph.add(new ArrayList<Integer>());
+        }
+
+        //We can add any number of columns to each row
+        graph.get(0).add(1);
+        graph.get(0).add(5);
+        graph.get(1).add(0);
+        graph.get(1).add(2);
+        graph.get(2).add(1);
+        graph.get(2).add(3);
+        graph.get(3).add(2);
+        graph.get(3).add(4);
+        graph.get(4).add(3);
+        graph.get(4).add(5);
+
+        //Printing all the edges
+        for(int i=0; i<vertex; i++) {
+            for(int j=0; j<graph.get(i).size(); j++) {
+                System.out.println("Edge between vertex "+i+"and "+graph.get(i).get(j));
+            }
+        }
+    }
+
+}

core-java-collections/src/main/java/com/baeldung/list/multidimensional/ThreeDimensionalArrayList.java

@@ -0,0 +1,45 @@
+package com.baeldung.list.multidimensional;
+
+import java.util.ArrayList;
+
+public class ThreeDimensionalArrayList {
+
+    public static void main(String args[]) {
+        
+        int x_axis_length = 2;
+        int y_axis_length = 2;
+        int z_axis_length = 2;
+        ArrayList< ArrayList< ArrayList<String> > > space = new ArrayList<>(x_axis_length);
+
+        //Initializing each element of ArrayList with ArrayList< ArrayList<String> >
+        for(int i=0; i< x_axis_length; i++) {
+            space.add(new ArrayList< ArrayList<String> >(y_axis_length));
+            for(int j =0; j< y_axis_length; j++) {
+                space.get(i).add(new ArrayList<String>(z_axis_length));
+            }
+        }
+
+        //Set Red color for points (0,0,0) and (0,0,1)
+        space.get(0).get(0).add("Red");
+        space.get(0).get(0).add("Red");
+        //Set Blue color for points (0,1,0) and (0,1,1)
+        space.get(0).get(1).add("Blue");
+        space.get(0).get(1).add("Blue");
+        //Set Green color for points (1,0,0) and (1,0,1)
+        space.get(1).get(0).add("Green");
+        space.get(1).get(0).add("Green");
+        //Set Yellow color for points (1,1,0) and (1,1,1)
+        space.get(1).get(1).add("Yellow");
+        space.get(1).get(1).add("Yellow");
+
+        //Printing colors for all the points
+        for(int i=0; i<x_axis_length; i++) {
+            for(int j=0; j<y_axis_length; j++) {
+                for(int k=0; k<z_axis_length; k++) {
+                    System.out.println("Color of point ("+i+","+j+","+k+") is :"+space.get(i).get(j).get(k));
+                }
+            }
+        }
+    }
+
+}

core-java-concurrency/README.md

@@ -26,7 +26,6 @@
 - [ExecutorService - Waiting for Threads to Finish](http://www.baeldung.com/java-executor-wait-for-threads)
 - [wait and notify() Methods in Java](http://www.baeldung.com/java-wait-notify)
 - [Priority-based Job Scheduling in Java](http://www.baeldung.com/java-priority-job-schedule)
-- [A Custom Spring SecurityConfigurer](http://www.baeldung.com/spring-security-custom-configurer)
 - [Life Cycle of a Thread in Java](http://www.baeldung.com/java-thread-lifecycle)
 - [Runnable vs. Callable in Java](http://www.baeldung.com/java-runnable-callable)
 - [Brief Introduction to Java Thread.yield()](https://www.baeldung.com/java-thread-yield)

core-java-io/src/main/java/com/baeldung/download/FileDownload.java

@@ -45,6 +45,7 @@ public class FileDownload {
             FileOutputStream fileOutputStream = new FileOutputStream(localFilename); FileChannel fileChannel = fileOutputStream.getChannel()) {
 
             fileChannel.transferFrom(readableByteChannel, 0, Long.MAX_VALUE);
+            fileOutputStream.close();
         }
     }
 

core-java-net/README.md

@@ -1,3 +0,0 @@
-=========
-
-## Core Java Net

core-java-networking/README.md

@@ -0,0 +1,7 @@
+=========
+
+## Core Java Networking
+
+### Relevant Articles
+
+- [Connecting Through Proxy Servers in Core Java](https://www.baeldung.com/java-connect-via-proxy-server)

core-java-networking/pom.xml

@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>core-java-net</artifactId>
+    <artifactId>core-java-networking</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>core-java-net</name>
+    <name>core-java-networking</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -14,6 +14,6 @@
     </parent>
 
     <build>
-        <finalName>core-java-net</finalName>
+        <finalName>core-java-networking</finalName>
     </build>
 </project>