extract pure java dotenv into dep

cdimascio · Sep 19, 2020 · a3094dd · a3094dd
1 parent ecc1c75
commit a3094dd
Show file tree

Hide file tree

Showing 8 changed files with 254 additions and 514 deletions.
diff --git a/pom.xml b/pom.xml
diff --git a/src/main/kotlin/io/github/cdimascio/dotenv/Dotenv.kt b/src/main/kotlin/io/github/cdimascio/dotenv/Dotenv.kt
diff --git a/src/main/kotlin/io/github/cdimascio/dotenv/internal/ClassPathHelper.kt b/src/main/kotlin/io/github/cdimascio/dotenv/internal/ClassPathHelper.kt
diff --git a/src/main/kotlin/io/github/cdimascio/dotenv/internal/DotenvParser.kt b/src/main/kotlin/io/github/cdimascio/dotenv/internal/DotenvParser.kt
diff --git a/src/main/kotlin/io/github/cdimascio/dotenv/internal/DotenvReader.kt b/src/main/kotlin/io/github/cdimascio/dotenv/internal/DotenvReader.kt
diff --git a/src/test/java/tests/JavaTests.java b/src/test/java/tests/JavaTests.java
@@ -1,8 +1,8 @@
 package tests;
 
-import io.github.cdimascio.dotenv.DotEnvException;
+import io.github.cdimascio.dotenv.DotenvException;
 import io.github.cdimascio.dotenv.Dotenv;
-import io.github.cdimascio.dotenv.DotenvEntriesFilter;
+import io.github.cdimascio.dotenv.Dotenv.EntriesFilter;
 import io.github.cdimascio.dotenv.DotenvEntry;
 import org.junit.Before;
 import org.junit.Test;
@@ -27,12 +27,12 @@ public void setUp() {
  envVars.put("WITHOUT_VALUE", "");
  }
 
- @Test(expected = DotEnvException.class)
+ @Test(expected = DotenvException.class)
  public void throwIfMalconfigured() {
  Dotenv.configure().load();
  }
 
- @Test(expected = DotEnvException.class)
+ @Test(expected = DotenvException.class)
  public void load() {
  Dotenv dotenv = Dotenv.load();
 
@@ -62,7 +62,7 @@ public void iteratorOverDotenvWithFilter() {
  .ignoreIfMalformed()
  .load();
 
- Set<DotenvEntry> entriesInFile = dotenv.entries(DotenvEntriesFilter.DECLARED_IN_ENV_FILE);
+ Set<DotenvEntry> entriesInFile = dotenv.entries(EntriesFilter.DECLARED_IN_ENV_FILE);
  Set<DotenvEntry> entriesAll = dotenv.entries();
  assertTrue(entriesInFile.size() < entriesAll.size());
 

diff --git a/src/test/kotlin/tests/BasicTests.kt b/src/test/kotlin/tests/BasicTests.kt
@@ -1,6 +1,6 @@
 package tests
 
-import io.github.cdimascio.dotenv.DotEnvException
+import io.github.cdimascio.dotenv.DotenvException
 import io.github.cdimascio.dotenv.Dotenv
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
@@ -15,7 +15,7 @@ class DotEnvTest {
  "MULTI_LINE" to "hello\\nworld"
  )
 
- @test(expected = DotEnvException::class)
+ @test(expected = DotenvException::class)
  fun dotenvMalformed() {
  Dotenv.configure()
  .directory("./src/test/resources")
@@ -113,7 +113,7 @@ class DotEnvTest {
  }
  }
 
- @test(expected = DotEnvException::class)
+ @test(expected = DotenvException::class)
  fun dotenvMissing() {
  Dotenv.configure()
  .directory("/missing/.env")

diff --git a/src/test/kotlin/tests/DslTests.kt b/src/test/kotlin/tests/DslTests.kt
@@ -1,10 +1,10 @@
 package tests
 
-import io.github.cdimascio.dotenv.DotEnvException
+import io.github.cdimascio.dotenv.DotenvException
 import io.github.cdimascio.dotenv.Dotenv
-import io.github.cdimascio.dotenv.DotenvEntriesFilter
+import io.github.cdimascio.dotenv.Dotenv.EntriesFilter
 import io.github.cdimascio.dotenv.dotenv
-import junit.framework.Assert.assertTrue
+import kotlin.test.assertTrue
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
 import kotlin.test.assertNotNull
@@ -24,7 +24,7 @@ class DotEnvDslTest {
  "HOME" to "dotenv_test_home"
  )
 
- @test(expected = DotEnvException::class)
+ @test(expected = DotenvException::class)
  fun dotenvMalformed() {
  dotenv()
  }
@@ -100,7 +100,7 @@ class DotEnvDslTest {
  .ignoreIfMalformed()
  .load()
 
- val entriesInFile = dotenv.entries(DotenvEntriesFilter.DECLARED_IN_ENV_FILE)
+ val entriesInFile = dotenv.entries(EntriesFilter.DECLARED_IN_ENV_FILE)
  val entriesAll = dotenv.entries()
  assertTrue(entriesInFile.size < entriesAll.size)
 
@@ -128,7 +128,7 @@ class DotEnvDslTest {
  assertHostEnvVar(env)
  }
 
- @test(expected = DotEnvException::class)
+ @test(expected = DotenvException::class)
  fun dotenvMissing() {
  dotenv {
  directory = "/missing/.env"