Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

# Replacing Lightbend Config (https://github.com/lightbend/config) with sconfig (https://github.com/ekrich/sconfig)
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.TestKitSettings.create")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.TestKitSettings.apply")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.TestKitSettings.config")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.TestKitSettings.this")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.internal.ActorSystemStub#config.defaultReference")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit.applicationTestConfig")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit.create")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.BehaviorTestKit.create")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.BehaviorTestKit.applicationTestConfig")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.ManualTime.config")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource.this")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit.ApplicationTestConfig")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit.apply")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKit.config")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ActorTestKitBase.this")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.BehaviorTestKit.apply")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.BehaviorTestKit.ApplicationTestConfig")
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ManualTime.config")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit.this")
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package org.apache.pekko.actor.testkit.typed

import scala.concurrent.duration.{ Duration, FiniteDuration }

import com.typesafe.config.Config
import org.ekrich.config.Config

import org.apache.pekko
import pekko.actor.typed.ActorSystem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package org.apache.pekko.actor.testkit.typed.internal
import java.util.concurrent.{ CompletionStage, ThreadFactory }
import scala.concurrent._
import scala.annotation.nowarn
import com.typesafe.config.{ Config, ConfigFactory }
import org.ekrich.config.{ Config, ConfigFactory }
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import org.apache.pekko
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package org.apache.pekko.actor.testkit.typed.javadsl

import java.time.Duration

import com.typesafe.config.Config
import org.ekrich.config.Config

import org.apache.pekko
import pekko.actor.DeadLetter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
import pekko.actor.typed.receptionist.Receptionist
import pekko.actor.typed.{ ActorRef, Behavior, Signal }
import pekko.annotation.{ ApiMayChange, DoNotInherit }
import com.typesafe.config.Config
import org.ekrich.config.Config

import java.util.concurrent.ThreadLocalRandom

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.pekko.actor.testkit.typed.javadsl

import org.apache.pekko
import com.typesafe.config.Config
import org.ekrich.config.Config
import pekko.actor.testkit.typed.internal.TestKitUtils
import pekko.actor.testkit.typed.scaladsl.ActorTestKit.ApplicationTestConfig
import pekko.actor.typed.ActorSystem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import java.time.Duration

import scala.annotation.varargs

import com.typesafe.config.Config
import org.ekrich.config.Config

import org.apache.pekko
import pekko.actor.typed.ActorSystem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ package org.apache.pekko.actor.testkit.typed.javadsl

import java.time.Duration

import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.ekrich.config.Config
import org.ekrich.config.ConfigFactory
import org.junit.Rule
import org.junit.rules.ExternalResource

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import scala.concurrent.Await
import scala.concurrent.duration._
import scala.reflect.ClassTag

import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.ekrich.config.Config
import org.ekrich.config.ConfigFactory
import org.slf4j.LoggerFactory

import org.apache.pekko
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

package org.apache.pekko.actor.testkit.typed.scaladsl

import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.ekrich.config.Config
import org.ekrich.config.ConfigFactory

import org.apache.pekko
import pekko.actor.DeadLetter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
import pekko.actor.typed.receptionist.Receptionist
import pekko.actor.typed.{ ActorRef, Behavior, Signal, TypedActorContext }
import pekko.annotation.{ ApiMayChange, DoNotInherit }
import com.typesafe.config.Config
import org.ekrich.config.Config

import java.util.concurrent.ThreadLocalRandom
import scala.collection.immutable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package org.apache.pekko.actor.testkit.typed.scaladsl
import scala.annotation.varargs
import scala.concurrent.duration.{ Duration, FiniteDuration }

import com.typesafe.config.{ Config, ConfigFactory }
import org.ekrich.config.{ Config, ConfigFactory }

import org.apache.pekko
import pekko.actor.typed.ActorSystem
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

package org.apache.pekko.actor.testkit.typed.scaladsl

import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.ekrich.config.Config
import org.ekrich.config.ConfigFactory
import org.scalatest.{ BeforeAndAfterAll, TestSuite }
import org.scalatest.concurrent.Eventually
import org.scalatest.concurrent.ScalaFutures
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// #imports
import static org.junit.Assert.assertEquals;

import com.typesafe.config.Config;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
Expand All @@ -26,6 +25,7 @@
import org.apache.pekko.actor.testkit.typed.javadsl.TestInbox;
import org.apache.pekko.actor.typed.*;
import org.apache.pekko.actor.typed.javadsl.*;
import org.ekrich.config.Config;
import org.junit.Test;
import org.scalatestplus.junit.JUnitSuite;
import org.slf4j.event.Level;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package jdocs.org.apache.pekko.actor.testkit.typed.javadsl;

// #default-application-conf
import com.typesafe.config.ConfigFactory;
import org.ekrich.config.ConfigFactory;

// #default-application-conf

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import pekko.actor.testkit.typed.scaladsl.BehaviorTestKit
import pekko.actor.testkit.typed.scaladsl.TestInbox
import pekko.actor.typed._
import pekko.actor.typed.scaladsl._
import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory
import org.slf4j.event.Level

//#imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ object TestConfigExample {
def illustrateApplicationConfig(): Unit = {

// #default-application-conf
import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory

ConfigFactory.load()
// #default-application-conf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package org.apache.pekko.actor.testkit.typed.scaladsl

import scala.concurrent.Promise

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory
import org.scalatest.BeforeAndAfterAll
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.pekko.actor.testkit.typed.scaladsl

import org.apache.pekko
import pekko.actor.typed.ActorSystem
import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory
import org.apache.pekko.actor.testkit.typed.javadsl.JUnit5TestKitBuilder
import org.scalatest.wordspec.AnyWordSpec

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package org.apache.pekko.actor.testkit.typed.scaladsl

import scala.concurrent.duration._

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory
import org.scalatest.wordspec.AnyWordSpecLike

import org.apache.pekko.actor.typed.scaladsl.Behaviors
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

import static org.junit.Assert.*;

import com.typesafe.config.ConfigFactory;
import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
import org.apache.pekko.testkit.PekkoSpec;
import org.ekrich.config.ConfigFactory;
import org.junit.*;
import org.scalatestplus.junit.JUnitSuite;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;

import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import java.time.Duration;
import java.util.*;
import org.apache.pekko.actor.ActorRef;
Expand All @@ -30,6 +28,8 @@
import org.apache.pekko.event.Logging.Error;
import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
import org.apache.pekko.testkit.javadsl.TestKit;
import org.ekrich.config.Config;
import org.ekrich.config.ConfigFactory;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.pekko.dispatch

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory

import org.apache.pekko
import pekko.actor.{ Actor, Props }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.pekko.dispatch

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory
import org.apache.pekko
import pekko.actor.{ Actor, Props }
import pekko.testkit.{ ImplicitSender, PekkoSpec }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.pekko.dispatch

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory

import org.apache.pekko
import pekko.actor.{ Actor, Props }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package org.apache.pekko.actor
import scala.concurrent.duration._

import com.codahale.metrics.Histogram
import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory
import org.scalatest.BeforeAndAfterAll

import org.apache.pekko
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ package org.apache.pekko.actor

import scala.concurrent.duration.{ Duration, FiniteDuration }

import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.ekrich.config.Config
import org.ekrich.config.ConfigFactory

import org.apache.pekko
import pekko.ConfigurationException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package org.apache.pekko.actor
import scala.concurrent.ExecutionContext
import scala.concurrent.duration._

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory

import org.apache.pekko
import pekko.ConfigurationException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import scala.concurrent.{ Await, Future }
import scala.concurrent.duration._

import scala.annotation.nowarn
import com.typesafe.config.{ Config, ConfigFactory }
import org.ekrich.config.{ Config, ConfigFactory }
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks

import org.apache.pekko
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package org.apache.pekko.actor

import scala.concurrent.duration._

import com.typesafe.config.{ Config, ConfigFactory }
import org.ekrich.config.{ Config, ConfigFactory }
import org.scalatest.BeforeAndAfterEach

import org.apache.pekko
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import pekko.testkit.PekkoSpec
import pekko.testkit.EventFilter
import pekko.testkit.TestKit
import pekko.testkit.TestProbe
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import org.ekrich.config.Config
import org.ekrich.config.ConfigFactory

import java.util.concurrent.Executors
import java.util.concurrent.TimeoutException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ package org.apache.pekko.actor

import scala.concurrent.duration._

import com.typesafe.config.ConfigFactory
import com.typesafe.config.ConfigParseOptions
import org.ekrich.config.ConfigFactory
import org.ekrich.config.ConfigParseOptions

import org.apache.pekko
import pekko.routing._
Expand Down Expand Up @@ -142,7 +142,7 @@ class DeployerSpec extends PekkoSpec(DeployerSpec.deployerConf) {
}

"detect invalid number-of-instances" in {
intercept[com.typesafe.config.ConfigException.WrongType] {
intercept[org.ekrich.config.ConfigException.WrongType] {
val invalidDeployerConf = ConfigFactory
.parseString(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger

import scala.util.control.NoStackTrace

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package org.apache.pekko.actor
import scala.concurrent.Await
import scala.concurrent.duration._

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory

import org.apache.pekko
import pekko.event._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

package org.apache.pekko.actor

import com.typesafe.config.ConfigFactory
import org.ekrich.config.ConfigFactory

import org.apache.pekko
import pekko.actor.ActorSystem.Settings
Expand Down
Loading