Merge pull request #1086 from ScottLogic/1048-remove-kotlin-stdlib

Remove kotlin standard library
finos · Jun 27, 2019 · 05c824b · 05c824b
2 parents 9e5d353 + 9a11f17
commit 05c824b
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 11 deletions.
diff --git a/generator/build.gradle b/generator/build.gradle
@@ -2,7 +2,6 @@ dependencies {
     compile project(':common')
     compile project(':output')
 
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21'
     compile 'com.google.inject:guice:4.1.0'
     compile 'dk.brics.automaton:automaton:1.11-8'
     compile 'org.apache.commons:commons-csv:1.5'

diff --git a/generator/src/main/java/com/scottlogic/deg/generator/generation/FieldSpecValueGenerator.java b/generator/src/main/java/com/scottlogic/deg/generator/generation/FieldSpecValueGenerator.java
@@ -7,7 +7,6 @@
 import com.scottlogic.deg.generator.generation.fieldvaluesources.CombiningFieldValueSource;
 import com.scottlogic.deg.generator.generation.fieldvaluesources.FieldValueSource;
 import com.scottlogic.deg.generator.utils.JavaUtilRandomNumberGenerator;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -42,7 +41,6 @@ public Stream<DataBagValue> generate(FieldSpec spec) {
         return createValuesFromSources(spec, fieldValueSources);
     }
 
-    @NotNull
     private Stream<DataBagValue> createValuesFromSources(FieldSpec spec, List<FieldValueSource> fieldValueSources) {
         FieldValueSource combinedFieldValueSource = new CombiningFieldValueSource(fieldValueSources);
 

diff --git a/.../main/java/com/scottlogic/deg/generator/generation/StandardFieldValueSourceEvaluator.java b/.../main/java/com/scottlogic/deg/generator/generation/StandardFieldValueSourceEvaluator.java
@@ -7,7 +7,6 @@
 import com.scottlogic.deg.generator.generation.string.RegexStringGenerator;
 import com.scottlogic.deg.generator.generation.string.StringGenerator;
 import com.scottlogic.deg.generator.restrictions.*;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -57,7 +56,7 @@ private List<FieldValueSource> addNullSource(List<FieldValueSource> setRestricti
         return Stream.concat(setRestrictionSources.stream(), Stream.of(nullOnlySource)).collect(Collectors.toList());
     }
 
-    private List<FieldValueSource> getSetRestrictionSources(@NotNull Set<Object> whitelist) {
+    private List<FieldValueSource> getSetRestrictionSources(Set<Object> whitelist) {
         if (whitelist.isEmpty()){
             return Collections.emptyList();
         }

diff --git a/generator/src/test/java/com/scottlogic/deg/generator/restrictions/FieldSpecFactoryTests.java b/generator/src/test/java/com/scottlogic/deg/generator/restrictions/FieldSpecFactoryTests.java
@@ -6,7 +6,6 @@
 import com.scottlogic.deg.generator.fieldspecs.FieldSpecFactory;
 import org.junit.jupiter.api.Test;
 
-import static com.shazam.shazamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 
 class FieldSpecFactoryTests {

diff --git a/output/build.gradle b/output/build.gradle
@@ -1,7 +1,6 @@
 dependencies {
     compile project(':common')
 
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21'
     compile 'org.apache.commons:commons-csv:1.5'
     compile 'com.google.inject:guice:4.1.0'
 

diff --git a/output/src/main/java/com/scottlogic/deg/output/writer/csv/CsvDataSetWriter.java b/output/src/main/java/com/scottlogic/deg/output/writer/csv/CsvDataSetWriter.java
@@ -6,7 +6,6 @@
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
 import org.apache.commons.csv.QuoteMode;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -22,11 +21,10 @@ class CsvDataSetWriter implements DataSetWriter {
     private static final CSVFormat writerFormat = CSVFormat.RFC4180;
     private static final CSVFormat csvStringFormatter = writerFormat.withQuoteMode(QuoteMode.ALL);
 
-    @NotNull
     private final CSVPrinter csvPrinter;
     private final ProfileFields fieldOrder;
 
-    private CsvDataSetWriter(@NotNull CSVPrinter csvPrinter, ProfileFields fieldOrder) {
+    private CsvDataSetWriter(CSVPrinter csvPrinter, ProfileFields fieldOrder) {
         this.csvPrinter = csvPrinter;
         this.fieldOrder = fieldOrder;
     }

diff --git a/profile/build.gradle b/profile/build.gradle
@@ -6,7 +6,6 @@ dependencies {
     compile project(':common')
     compile group: 'org.apache.commons', name: 'commons-csv', version: '1.6'
     compile group: 'com.google.inject', name: 'guice', version: '4.2.2'
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21'
     compile 'com.worldturner.medeia:medeia-validator-jackson:1.0.0'
     compile 'org.leadpony.justify:justify:0.14.0'
     compile 'org.glassfish:javax.json:1.1.3'