Merge pull request #27 from SimonHarmonicMinor/feature/group-id-to-com-kirekov

Changed group-id to "com.kirekov"

Author: SimonHarmonicMinor

Diff for: README.md

@@ -13,18 +13,17 @@ This library has no dependencies (except the test scope).
 Maven:
 ```xml
 <dependency>
-    <groupId>com.github.simonharmonicminor</groupId>
+    <groupId>com.kirekov</groupId>
     <artifactId>java-useful-utils</artifactId>
-    <version>1.2</version>
 </dependency>
 ```
 Gradle:
 ```groovy
-implementation 'com.github.simonharmonicminor:java-useful-utils:1.2' 
+implementation 'com.kirekov:java-useful-utils' 
 ```
 
 ### Status
-[![Sonatype Nexus (Releases)](https://img.shields.io/nexus/r/com.github.simonharmonicminor/java-useful-utils?server=https%3A%2F%2Foss.sonatype.org%2F)](https://repo1.maven.org/maven2/com/github/simonharmonicminor/java-useful-utils/1.2/)
+[![Sonatype Nexus (Releases)](https://img.shields.io/nexus/r/com.kirekov/java-useful-utils?server=https%3A%2F%2Foss.sonatype.org%2F)](https://repo1.maven.org/maven2/com/kirekov/java-useful-utils/)
 [![Build Status](https://travis-ci.com/SimonHarmonicMinor/Java-Useful-Utils.svg?branch=master)](https://travis-ci.com/SimonHarmonicMinor/Java-Useful-Utils)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=SimonHarmonicMinor_Java-Useful-Utils&metric=alert_status)](https://sonarcloud.io/dashboard?id=SimonHarmonicMinor_Java-Useful-Utils)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=SimonHarmonicMinor_Java-Useful-Utils&metric=coverage)](https://sonarcloud.io/dashboard?id=SimonHarmonicMinor_Java-Useful-Utils)

Diff for: pom.xml

@@ -4,9 +4,9 @@
          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>
 
-    <groupId>com.github.simonharmonicminor</groupId>
+    <groupId>com.kirekov</groupId>
     <artifactId>java-useful-utils</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
     <packaging>jar</packaging>
 
     <name>Java Useful Utils</name>
@@ -16,7 +16,7 @@
     <developers>
         <developer>
             <name>Semyon Kirekov</name>
-            <email>kirekov@gmail.com</email>
+            <email>semyon@kirekov.com</email>
             <organization>Github</organization>
             <organizationUrl>https://github.com/SimonHarmonicMinor</organizationUrl>
         </developer>

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/ParallelStreaming.java renamed to src/main/java/com/kirekov/juu/collection/ParallelStreaming.java

@@ -1,4 +1,4 @@
-package com.github.simonharmonicminor.juu.collection;
+package com.kirekov.juu.collection;
 
 import java.util.stream.Stream;
 

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/Streaming.java renamed to src/main/java/com/kirekov/juu/collection/Streaming.java

@@ -1,4 +1,4 @@
-package com.github.simonharmonicminor.juu.collection;
+package com.kirekov.juu.collection;
 
 import java.util.stream.Stream;
 

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/immutable/Immutable.java renamed to src/main/java/com/kirekov/juu/collection/immutable/Immutable.java

@@ -1,4 +1,4 @@
-package com.github.simonharmonicminor.juu.collection.immutable;
+package com.kirekov.juu.collection.immutable;
 
 import java.util.*;
 import java.util.stream.Collectors;

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/immutable/ImmutableArrayList.java renamed to src/main/java/com/kirekov/juu/collection/immutable/ImmutableArrayList.java

@@ -1,17 +1,12 @@
-package com.github.simonharmonicminor.juu.collection.immutable;
+package com.kirekov.juu.collection.immutable;
 
-import com.github.simonharmonicminor.juu.monad.Try;
+import com.kirekov.juu.monad.Try;
 
 import java.io.Serializable;
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.Stream;
 
-import static com.github.simonharmonicminor.juu.collection.immutable.Immutable.listOfWithoutCloning;
-import static com.github.simonharmonicminor.juu.collection.immutable.Immutable.setOf;
-import static com.github.simonharmonicminor.juu.collection.immutable.ImmutableCollectionUtils.listEquals;
-import static com.github.simonharmonicminor.juu.collection.immutable.ImmutableCollectionUtils.listToString;
-
 /**
  * An immutable implementation of java native {@link ArrayList}.
  *
@@ -107,7 +102,7 @@ public ImmutableList<T> slice(int fromIndex, int toIndex, int stepSize) {
             newArrayList.add(get(fromNorm));
             fromNorm = nextValueFunc.apply(fromNorm);
         }
-        return listOfWithoutCloning(newArrayList);
+        return Immutable.listOfWithoutCloning(newArrayList);
     }
 
     @Override
@@ -131,7 +126,7 @@ public ImmutableList<T> concatWith(Iterable<T> iterable) {
         for (T t : iterable) {
             copy.add(t);
         }
-        return listOfWithoutCloning(copy);
+        return Immutable.listOfWithoutCloning(copy);
     }
 
     private static <R> R getValByIndex(ImmutableList<R> immutableList, int index) {
@@ -149,7 +144,7 @@ public <R> ImmutableList<Pair<T, R>> zipWith(ImmutableList<R> list) {
             R right = getValByIndex(list, i);
             newArrayList.add(Pair.of(left, right));
         }
-        return listOfWithoutCloning(newArrayList);
+        return Immutable.listOfWithoutCloning(newArrayList);
     }
 
     @Override
@@ -158,7 +153,7 @@ public ImmutableList<Pair<T, T>> zipWithNext() {
         for (int i = 0; i < size() - 1; i++) {
             newArrayList.add(Pair.of(get(i), get(i + 1)));
         }
-        return listOfWithoutCloning(newArrayList);
+        return Immutable.listOfWithoutCloning(newArrayList);
     }
 
     @Override
@@ -168,7 +163,7 @@ public <R> ImmutableList<R> map(Function<? super T, ? extends R> mapper) {
         for (T t : arrayList) {
             newList.add(mapper.apply(t));
         }
-        return listOfWithoutCloning(newList);
+        return Immutable.listOfWithoutCloning(newList);
     }
 
     @Override
@@ -178,7 +173,7 @@ public <R> ImmutableList<R> mapIndexed(BiFunction<Integer, ? super T, ? extends
         for (int i = 0; i < arrayList.size(); i++) {
             newList.add(mapper.apply(i, arrayList.get(i)));
         }
-        return listOfWithoutCloning(newList);
+        return Immutable.listOfWithoutCloning(newList);
     }
 
     @Override
@@ -189,7 +184,7 @@ public <R> ImmutableList<R> flatMap(Function<? super T, ? extends Iterable<R>> m
             ImmutableArrayList<R> listElement = new ImmutableArrayList<>(mapper.apply(t));
             newList.addAll(listElement.arrayList);
         }
-        return listOfWithoutCloning(newList);
+        return Immutable.listOfWithoutCloning(newList);
     }
 
     @Override
@@ -202,7 +197,7 @@ public <R> ImmutableList<R> flatMapIndexed(
                     new ImmutableArrayList<>(mapper.apply(i, arrayList.get(i)));
             newList.addAll(listElement.arrayList);
         }
-        return listOfWithoutCloning(newList);
+        return Immutable.listOfWithoutCloning(newList);
     }
 
     @Override
@@ -212,7 +207,7 @@ public ImmutableList<T> filter(Predicate<? super T> predicate) {
         for (T t : arrayList) {
             if (predicate.test(t)) newList.add(t);
         }
-        return listOfWithoutCloning(newList);
+        return Immutable.listOfWithoutCloning(newList);
     }
 
     @Override
@@ -222,7 +217,7 @@ public ImmutableList<T> filterIndexed(BiPredicate<Integer, ? super T> predicate)
         for (int i = 0; i < arrayList.size(); i++) {
             if (predicate.test(i, arrayList.get(i))) newList.add(arrayList.get(i));
         }
-        return listOfWithoutCloning(newList);
+        return Immutable.listOfWithoutCloning(newList);
     }
 
     @Override
@@ -238,7 +233,7 @@ public ImmutableList<T> sorted(Comparator<? super T> comparator) {
         Objects.requireNonNull(comparator);
         ArrayList<T> copy = new ArrayList<>(arrayList);
         copy.sort(comparator);
-        return listOfWithoutCloning(copy);
+        return Immutable.listOfWithoutCloning(copy);
     }
 
     @Override
@@ -249,7 +244,7 @@ public ImmutableList<T> limit(int size) {
         for (int i = 0; i < Math.min(size(), size); i++) {
             newList.add(arrayList.get(i));
         }
-        return listOfWithoutCloning(newList);
+        return Immutable.listOfWithoutCloning(newList);
     }
 
     @Override
@@ -260,7 +255,7 @@ public ImmutableList<T> skip(int size) {
         for (int i = Math.min(size, size()); i < arrayList.size(); i++) {
             newList.add(arrayList.get(i));
         }
-        return listOfWithoutCloning(newList);
+        return Immutable.listOfWithoutCloning(newList);
     }
 
     @Override
@@ -286,7 +281,7 @@ public ImmutableList<T> toList() {
 
     @Override
     public ImmutableSet<T> toSet() {
-        return setOf(arrayList);
+        return Immutable.setOf(arrayList);
     }
 
     @Override
@@ -306,7 +301,7 @@ public Iterator<T> iterator() {
 
     @Override
     public boolean equals(Object o) {
-        return listEquals(this, o);
+        return ImmutableCollectionUtils.listEquals(this, o);
     }
 
     @Override
@@ -316,6 +311,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return listToString(this);
+        return ImmutableCollectionUtils.listToString(this);
     }
 }

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/immutable/ImmutableCollection.java renamed to src/main/java/com/kirekov/juu/collection/immutable/ImmutableCollection.java

@@ -1,7 +1,7 @@
-package com.github.simonharmonicminor.juu.collection.immutable;
+package com.kirekov.juu.collection.immutable;
 
-import com.github.simonharmonicminor.juu.collection.ParallelStreaming;
-import com.github.simonharmonicminor.juu.monad.Try;
+import com.kirekov.juu.collection.ParallelStreaming;
+import com.kirekov.juu.monad.Try;
 
 import java.util.*;
 import java.util.function.BinaryOperator;

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/immutable/ImmutableCollectionUtils.java renamed to src/main/java/com/kirekov/juu/collection/immutable/ImmutableCollectionUtils.java

@@ -1,6 +1,6 @@
-package com.github.simonharmonicminor.juu.collection.immutable;
+package com.kirekov.juu.collection.immutable;
 
-import com.github.simonharmonicminor.juu.monad.Try;
+import com.kirekov.juu.monad.Try;
 
 import java.util.Objects;
 import java.util.Optional;

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/immutable/ImmutableCollectors.java renamed to src/main/java/com/kirekov/juu/collection/immutable/ImmutableCollectors.java

@@ -1,4 +1,4 @@
-package com.github.simonharmonicminor.juu.collection.immutable;
+package com.kirekov.juu.collection.immutable;
 
 import java.util.*;
 import java.util.function.BiConsumer;

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/immutable/ImmutableHashMap.java renamed to src/main/java/com/kirekov/juu/collection/immutable/ImmutableHashMap.java

@@ -1,17 +1,12 @@
-package com.github.simonharmonicminor.juu.collection.immutable;
+package com.kirekov.juu.collection.immutable;
 
-import com.github.simonharmonicminor.juu.lambda.TriFunction;
+import com.kirekov.juu.lambda.TriFunction;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
-import static com.github.simonharmonicminor.juu.collection.immutable.Immutable.listOf;
-import static com.github.simonharmonicminor.juu.collection.immutable.Immutable.setOf;
-import static com.github.simonharmonicminor.juu.collection.immutable.ImmutableCollectionUtils.mapEquals;
-import static com.github.simonharmonicminor.juu.collection.immutable.ImmutableMapUtils.*;
-
 /**
  * An immutable implementation of java native {@link HashMap}
  *
@@ -35,9 +30,9 @@ public ImmutableHashMap(Map<K, V> map) {
     ImmutableHashMap(Map<K, V> map, boolean needsCloning) {
         if (needsCloning || !(map instanceof HashMap)) this.hashMap = new HashMap<>(map);
         else this.hashMap = (HashMap<K, V>) map;
-        this.keys = setOf(hashMap.keySet());
-        this.values = listOf(hashMap.values());
-        this.pairs = toPairSet(hashMap.entrySet());
+        this.keys = Immutable.setOf(hashMap.keySet());
+        this.values = Immutable.listOf(hashMap.values());
+        this.pairs = ImmutableMapUtils.toPairSet(hashMap.entrySet());
     }
 
     @Override
@@ -69,21 +64,21 @@ public boolean containsPair(Pair<K, V> pair) {
     @Override
     public ImmutableMap<K, V> concatWithOverride(ImmutableMap<K, V> map) {
         Objects.requireNonNull(map);
-        return concatenationWithOverride(this.hashMap, map);
+        return ImmutableMapUtils.concatenationWithOverride(this.hashMap, map);
     }
 
     @Override
     public ImmutableMap<K, V> concatWithoutOverride(ImmutableMap<K, V> map) {
         Objects.requireNonNull(map);
-        return concatenationWithoutOverride(this.hashMap, map);
+        return ImmutableMapUtils.concatenationWithoutOverride(this.hashMap, map);
     }
 
     @Override
     public ImmutableMap<K, V> concatWith(
             ImmutableMap<K, V> map, TriFunction<K, V, V, V> overrideBehaviour) {
         Objects.requireNonNull(map);
         Objects.requireNonNull(overrideBehaviour);
-        return concatenation(this.hashMap, map, overrideBehaviour);
+        return ImmutableMapUtils.concatenation(this.hashMap, map, overrideBehaviour);
     }
 
     @Override
@@ -113,7 +108,7 @@ public Map<K, V> toMutableMap() {
 
     @Override
     public boolean equals(Object o) {
-        return mapEquals(this, o);
+        return ImmutableCollectionUtils.mapEquals(this, o);
     }
 
     @Override

Diff for: src/main/java/com/github/simonharmonicminor/juu/collection/immutable/ImmutableHashSet.java renamed to src/main/java/com/kirekov/juu/collection/immutable/ImmutableHashSet.java

@@ -1,4 +1,4 @@
-package com.github.simonharmonicminor.juu.collection.immutable;
+package com.kirekov.juu.collection.immutable;
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -9,11 +9,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import static com.github.simonharmonicminor.juu.collection.immutable.Immutable.listOf;
-import static com.github.simonharmonicminor.juu.collection.immutable.Immutable.setOfWithoutCloning;
-import static com.github.simonharmonicminor.juu.collection.immutable.ImmutableCollectionUtils.setEquals;
-import static com.github.simonharmonicminor.juu.collection.immutable.ImmutableCollectionUtils.setToString;
-
 /**
  * An immutable implementation of java native {@link HashSet}
  *
@@ -53,7 +48,7 @@ public ImmutableSet<T> concatWith(Iterable<T> iterable) {
         for (T t : iterable) {
             newHashSet.add(t);
         }
-        return setOfWithoutCloning(newHashSet);
+        return Immutable.setOfWithoutCloning(newHashSet);
     }
 
     @Override
@@ -63,7 +58,7 @@ public <R> ImmutableSet<R> map(Function<? super T, ? extends R> mapper) {
         for (T t : this) {
             newHashSet.add(mapper.apply(t));
         }
-        return setOfWithoutCloning(newHashSet);
+        return Immutable.setOfWithoutCloning(newHashSet);
     }
 
     @Override
@@ -74,7 +69,7 @@ public <R> ImmutableSet<R> flatMap(Function<? super T, ? extends Iterable<R>> ma
             ImmutableHashSet<R> immutableHashSet = new ImmutableHashSet<>(mapper.apply(t));
             newHashSet.addAll(immutableHashSet.hashSet);
         }
-        return setOfWithoutCloning(newHashSet);
+        return Immutable.setOfWithoutCloning(newHashSet);
     }
 
     @Override
@@ -84,7 +79,7 @@ public ImmutableSet<T> filter(Predicate<? super T> predicate) {
         for (T t : this) {
             if (predicate.test(t)) newHashSet.add(t);
         }
-        return setOfWithoutCloning(newHashSet);
+        return Immutable.setOfWithoutCloning(newHashSet);
     }
 
     @Override
@@ -99,7 +94,7 @@ public boolean contains(Object element) {
 
     @Override
     public ImmutableList<T> toList() {
-        return listOf(this.hashSet);
+        return Immutable.listOf(this.hashSet);
     }
 
     @Override
@@ -124,7 +119,7 @@ public Iterator<T> iterator() {
 
     @Override
     public boolean equals(Object o) {
-        return setEquals(this, o);
+        return ImmutableCollectionUtils.setEquals(this, o);
     }
 
     @Override
@@ -134,6 +129,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return setToString(this);
+        return ImmutableCollectionUtils.setToString(this);
     }
 }