Skip to content

Commit c92b579

Browse files
authored
Import Box to WK Codebase; No more BoxImplicits (#8707)
Importing the Box into our codebase allows us to - Remove the large liftweb dependency - Use the box without its implicits - move our BoxUtils into object Box ### URL of deployed dev instance (used for testing): - https://box.webknossos.xyz ### Steps to test: - Annotate some, should still work - CI ### Issues: - fixes #8660 ------ - [x] Considered [common edge cases](../blob/master/.github/common_edge_cases.md) - [x] Needs datastore update after deployment
1 parent 6096fe4 commit c92b579

File tree

157 files changed

+1322
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+1322
-332
lines changed

app/Startup.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import mail.{Mailer, MailerConfig}
88
import models.annotation.AnnotationDAO
99
import models.dataset.ThumbnailCachingService
1010
import models.user.InviteService
11-
import net.liftweb.common.{Failure, Full}
11+
import com.scalableminds.util.tools.{Failure, Full}
1212
import org.apache.http.client.utils.URIBuilder
1313
import play.api.inject.ApplicationLifecycle
1414
import security.WkSilhouetteEnvironment

app/controllers/AnnotationIOController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import com.typesafe.scalalogging.LazyLogging
2828
import files.WkTempFileService
2929

3030
import javax.inject.Inject
31-
import net.liftweb.common.Empty
31+
import com.scalableminds.util.tools.Empty
3232
import models.analytics.{AnalyticsService, DownloadAnnotationEvent, UploadAnnotationEvent}
3333
import models.annotation.AnnotationState._
3434
import models.annotation._

app/controllers/AnnotationPrivateLinkController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import play.api.libs.json._
1010

1111
import javax.inject.Inject
1212
import models.annotation._
13-
import net.liftweb.common.Full
13+
import com.scalableminds.util.tools.Full
1414
import play.api.mvc.{Action, AnyContent, PlayBodyParsers}
1515
import security.{WkEnv, WkSilhouetteEnvironment}
1616
import com.scalableminds.util.objectid.ObjectId

app/controllers/AuthenticationController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import mail.{DefaultMails, MailchimpClient, MailchimpTag, Send}
77
import models.analytics.{AnalyticsService, InviteEvent, JoinOrganizationEvent, SignupEvent}
88
import models.organization.{Organization, OrganizationDAO, OrganizationService}
99
import models.user._
10-
import net.liftweb.common.{Box, Empty, Failure, Full}
10+
import com.scalableminds.util.tools.{Box, Empty, Failure, Full}
1111
import org.apache.commons.codec.binary.Base64
1212
import org.apache.commons.codec.digest.{HmacAlgorithms, HmacUtils}
1313
import org.apache.pekko.actor.ActorSystem

app/controllers/CreditTransactionController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import models.organization.{
1313
OrganizationService
1414
}
1515
import models.user.UserService
16-
import net.liftweb.common.Box.tryo
16+
import com.scalableminds.util.tools.Box.tryo
1717
import play.api.mvc.{Action, AnyContent}
1818
import play.silhouette.api.Silhouette
1919
import security.WkEnv

app/controllers/DataStoreController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.scalableminds.util.tools.{Fox, FoxImplicits}
66
import javax.inject.Inject
77
import models.dataset.{DataStore, DataStoreDAO, DataStoreService}
88
import models.user.MultiUserDAO
9-
import net.liftweb.common.Empty
9+
import com.scalableminds.util.tools.Empty
1010
import play.api.i18n.Messages
1111
import play.api.libs.functional.syntax._
1212
import play.api.libs.json._

app/controllers/DatasetController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import models.folder.FolderService
2020
import models.organization.OrganizationDAO
2121
import models.team.{TeamDAO, TeamService}
2222
import models.user.{User, UserDAO, UserService}
23-
import net.liftweb.common.{Empty, Failure, Full}
23+
import com.scalableminds.util.tools.{Empty, Failure, Full}
2424
import play.api.i18n.{Messages, MessagesProvider}
2525
import play.api.libs.functional.syntax._
2626
import play.api.libs.json._

app/controllers/InitialDataController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import models.project.{Project, ProjectDAO}
1414
import models.task.{TaskType, TaskTypeDAO}
1515
import models.team._
1616
import models.user._
17-
import net.liftweb.common.Full
17+
import com.scalableminds.util.tools.Full
1818
import play.api.libs.json.{JsArray, Json}
1919
import utils.{StoreModules, WkConf}
2020

app/controllers/LegacyApiController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import models.organization.OrganizationDAO
1111
import javax.inject.Inject
1212
import models.task.{BaseAnnotation, TaskParameters}
1313
import models.user.{Experience, User}
14-
import net.liftweb.common.Box.tryo
14+
import com.scalableminds.util.tools.Box.tryo
1515
import play.api.http.HttpEntity
1616
import play.api.libs.json._
1717
import play.api.mvc.{Action, AnyContent, PlayBodyParsers, Result}

app/controllers/TaskController.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import models.annotation.nml.NmlResults.TracingBoxContainer
1616
import models.project.ProjectDAO
1717
import models.task._
1818
import models.user._
19-
import net.liftweb.common.{Box, Full}
19+
import com.scalableminds.util.tools.{Box, Full}
2020
import play.api.i18n.Messages
2121
import play.api.libs.json._
2222
import play.api.mvc.{Action, AnyContent, PlayBodyParsers}

0 commit comments

Comments
 (0)