Some renamings in backend package structure (#7361)

* Some renamings in backend package structure * remove unused import, update statistics name field * format * fix after merge
scalableminds · Oct 4, 2023 · 0d813d6 · 0d813d6
1 parent 1fd1389
commit 0d813d6
Show file tree

Hide file tree

Showing 104 changed files with 177 additions and 166 deletions.
diff --git a/app/SilhouetteModule.scala b/app/SilhouetteModule.scala
@@ -2,7 +2,7 @@ import com.google.inject.{AbstractModule, Provides, TypeLiteral}
 import com.mohiva.play.silhouette.api.repositories.AuthInfoRepository
 import com.mohiva.play.silhouette.api.util.PasswordHasherRegistry
 import com.mohiva.play.silhouette.api.{Environment, Silhouette, SilhouetteProvider}
-import oxalis.security.{PasswordHasher, UserAuthInfoRepository, WkEnv, WkSilhouetteEnvironment}
+import security.{PasswordHasher, UserAuthInfoRepository, WkEnv, WkSilhouetteEnvironment}
 
 class SilhouetteModule extends AbstractModule {
   override def configure(): Unit = {

diff --git a/app/Startup.scala b/app/Startup.scala
@@ -1,17 +1,17 @@
 import akka.actor.{ActorSystem, Props}
+import cleanup.CleanUpService
 import com.typesafe.scalalogging.LazyLogging
 import controllers.InitialDataService
+import files.TempFileService
+import mail.{Mailer, MailerConfig}
 import models.annotation.AnnotationDAO
-import models.binary.ThumbnailCachingService
+import models.dataset.ThumbnailCachingService
 import models.user.InviteService
 import net.liftweb.common.{Failure, Full}
 import org.apache.http.client.utils.URIBuilder
-import oxalis.cleanup.CleanUpService
-import oxalis.files.TempFileService
-import oxalis.mail.{Mailer, MailerConfig}
-import oxalis.security.WkSilhouetteEnvironment
-import oxalis.telemetry.SlackNotificationService
 import play.api.inject.ApplicationLifecycle
+import security.WkSilhouetteEnvironment
+import telemetry.SlackNotificationService
 import utils.WkConf
 import utils.sql.SqlClient
 

diff --git a/app/WebknossosModule.scala b/app/WebknossosModule.scala
@@ -1,18 +1,18 @@
 import com.google.inject.AbstractModule
 import com.scalableminds.webknossos.datastore.storage.DataVaultService
 import controllers.InitialDataService
+import files.TempFileService
+import mail.MailchimpTicker
 import models.analytics.AnalyticsSessionService
 import models.annotation.{AnnotationMutexService, AnnotationStore}
-import models.binary.{DatasetService, ThumbnailCachingService}
+import models.dataset.{DatasetService, ThumbnailCachingService}
 import models.job.{JobService, WorkerLivenessService}
 import models.storage.UsedStorageService
 import models.task.TaskService
 import models.user._
 import models.user.time.TimeSpanService
 import models.voxelytics.LokiClient
-import oxalis.files.TempFileService
-import oxalis.mail.MailchimpTicker
-import oxalis.telemetry.SlackNotificationService
+import telemetry.SlackNotificationService
 import utils.sql.SqlClient
 
 class WebknossosModule extends AbstractModule {

diff --git a/app/oxalis/cleanup/CleanUpService.scala → app/cleanup/CleanUpService.scala b/app/oxalis/cleanup/CleanUpService.scala → app/cleanup/CleanUpService.scala
@@ -1,4 +1,4 @@
-package oxalis.cleanup
+package cleanup
 
 import akka.actor.{ActorSystem, Cancellable}
 import com.scalableminds.util.tools.Fox
@@ -11,7 +11,7 @@ import scala.concurrent.duration.FiniteDuration
 
 class CleanUpService @Inject()(system: ActorSystem)(implicit ec: ExecutionContext) extends LazyLogging {
 
-  @volatile var akkaIsShuttingDown = false
+  @volatile private var akkaIsShuttingDown = false
 
   system.registerOnTermination {
     akkaIsShuttingDown = true

diff --git a/app/controllers/AnnotationController.scala b/app/controllers/AnnotationController.scala
@@ -12,23 +12,23 @@ import com.scalableminds.webknossos.datastore.models.datasource.AdditionalAxis
 import com.scalableminds.webknossos.tracingstore.tracings.volume.ResolutionRestrictions
 import com.scalableminds.webknossos.tracingstore.tracings.{TracingIds, TracingType}
 import io.swagger.annotations._
+import mail.{MailchimpClient, MailchimpTag}
 import models.analytics.{AnalyticsService, CreateAnnotationEvent, OpenAnnotationEvent}
 import models.annotation.AnnotationState.Cancelled
 import models.annotation._
-import models.binary.{DatasetDAO, DatasetService}
+import models.dataset.{DatasetDAO, DatasetService}
 import models.organization.OrganizationDAO
 import models.project.ProjectDAO
 import models.task.TaskDAO
 import models.team.{TeamDAO, TeamService}
 import models.user.time._
 import models.user.{User, UserDAO, UserService}
-import oxalis.mail.{MailchimpClient, MailchimpTag}
-import oxalis.security.{URLSharing, UserAwareRequestLogging, WkEnv}
-import oxalis.telemetry.SlackNotificationService
 import play.api.i18n.{Messages, MessagesProvider}
 import play.api.libs.json.Json.WithDefaultValues
 import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers}
+import security.{URLSharing, UserAwareRequestLogging, WkEnv}
+import telemetry.SlackNotificationService
 import utils.{ObjectId, WkConf}
 
 import javax.inject.Inject

diff --git a/app/controllers/AnnotationIOController.scala b/app/controllers/AnnotationIOController.scala
@@ -33,16 +33,16 @@ import models.annotation.AnnotationState._
 import models.annotation._
 import models.annotation.nml.NmlResults.{NmlParseResult, NmlParseSuccess}
 import models.annotation.nml.{NmlResults, NmlWriter}
-import models.binary.{Dataset, DatasetDAO, DatasetService}
+import models.dataset.{Dataset, DatasetDAO, DatasetService}
 import models.organization.OrganizationDAO
 import models.project.ProjectDAO
 import models.task._
 import models.user._
-import oxalis.security.WkEnv
 import play.api.i18n.{Messages, MessagesProvider}
 import play.api.libs.Files.{TemporaryFile, TemporaryFileCreator}
 import play.api.libs.json.Json
 import play.api.mvc.{Action, AnyContent, MultipartFormData}
+import security.WkEnv
 import utils.{ObjectId, WkConf}
 
 import scala.concurrent.{ExecutionContext, Future}

diff --git a/app/controllers/AnnotationPrivateLinkController.scala b/app/controllers/AnnotationPrivateLinkController.scala
@@ -11,8 +11,8 @@ import play.api.libs.json._
 import javax.inject.Inject
 import models.annotation._
 import net.liftweb.common.Full
-import oxalis.security.{WkEnv, WkSilhouetteEnvironment}
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers}
+import security.{WkEnv, WkSilhouetteEnvironment}
 import utils.ObjectId
 
 import scala.concurrent.ExecutionContext

diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
@@ -5,13 +5,13 @@ import com.mohiva.play.silhouette.api.Silhouette
 import com.scalableminds.util.tools.{Fox, FoxImplicits}
 import com.typesafe.config.ConfigRenderOptions
 import io.swagger.annotations.{Api, ApiOperation, ApiResponse, ApiResponses}
+import mail.{DefaultMails, Send}
 import models.analytics.{AnalyticsService, FrontendAnalyticsEvent}
 import models.organization.OrganizationDAO
 import models.user.{MultiUserDAO, UserService}
-import oxalis.mail.{DefaultMails, Send}
-import oxalis.security.WkEnv
 import play.api.libs.json.{JsObject, Json}
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers}
+import security.WkEnv
 import utils.sql.{SimpleSQLDAO, SqlClient}
 import utils.{StoreModules, WkConf}
 

diff --git a/app/controllers/AuthenticationController.scala b/app/controllers/AuthenticationController.scala
@@ -9,25 +9,33 @@ import com.mohiva.play.silhouette.api.{LoginInfo, Silhouette}
 import com.mohiva.play.silhouette.impl.providers.CredentialsProvider
 import com.scalableminds.util.accesscontext.{AuthorizedAccessContext, DBAccessContext, GlobalAccessContext}
 import com.scalableminds.util.tools.{Fox, FoxImplicits, TextUtils}
+import mail.{DefaultMails, MailchimpClient, MailchimpTag, Send}
 import models.analytics.{AnalyticsService, InviteEvent, JoinOrganizationEvent, SignupEvent}
 import models.annotation.AnnotationState.Cancelled
 import models.annotation.{AnnotationDAO, AnnotationIdentifier, AnnotationInformationProvider}
-import models.binary.DatasetDAO
+import models.dataset.DatasetDAO
 import models.organization.{Organization, OrganizationDAO, OrganizationService}
 import models.user._
 import models.voxelytics.VoxelyticsDAO
 import net.liftweb.common.{Box, Empty, Failure, Full}
 import org.apache.commons.codec.binary.Base64
 import org.apache.commons.codec.digest.{HmacAlgorithms, HmacUtils}
-import oxalis.mail.{DefaultMails, MailchimpClient, MailchimpTag, Send}
-import oxalis.security._
-import oxalis.thirdparty.BrainTracing
 import play.api.data.Form
 import play.api.data.Forms.{email, _}
 import play.api.data.validation.Constraints._
 import play.api.i18n.{Messages, MessagesProvider}
 import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent, Cookie, PlayBodyParsers, Request, Result}
+import security.{
+  CombinedAuthenticator,
+  OpenIdConnectClient,
+  OpenIdConnectUserInfo,
+  PasswordHasher,
+  TokenType,
+  WkEnv,
+  WkSilhouetteEnvironment
+}
+import thirdparty.BrainTracing
 import utils.{ObjectId, WkConf}
 
 import java.net.URLEncoder

diff --git a/app/controllers/ConfigurationController.scala b/app/controllers/ConfigurationController.scala
@@ -3,13 +3,13 @@ package controllers
 import com.mohiva.play.silhouette.api.Silhouette
 import com.scalableminds.util.accesscontext.GlobalAccessContext
 import javax.inject.Inject
-import models.binary.{DatasetDAO, DatasetService}
+import models.dataset.{DatasetDAO, DatasetService}
 import models.configuration.DatasetConfigurationService
 import models.user.UserService
-import oxalis.security.{URLSharing, WkEnv}
 import play.api.i18n.Messages
 import play.api.libs.json.{JsObject, JsValue, Json}
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers}
+import security.{URLSharing, WkEnv}
 
 import scala.concurrent.ExecutionContext
 

diff --git a/app/controllers/Controller.scala b/app/controllers/Controller.scala
@@ -6,10 +6,10 @@ import com.scalableminds.util.mvc.ExtendedController
 import com.scalableminds.util.tools.Fox
 import com.typesafe.scalalogging.LazyLogging
 import models.user.User
-import oxalis.security.{UserAwareRequestLogging, WkEnv}
 import play.api.i18n.{I18nSupport, Messages, MessagesProvider}
 import play.api.libs.json._
 import play.api.mvc.{InjectedController, Request, Result}
+import security.{UserAwareRequestLogging, WkEnv}
 
 import scala.concurrent.ExecutionContext
 

diff --git a/app/controllers/CredentialController.scala b/app/controllers/CredentialController.scala
@@ -7,10 +7,10 @@ import com.scalableminds.webknossos.datastore.storage.{
   HttpBasicAuthCredential,
   S3AccessKeyCredential
 }
-import models.binary.credential.CredentialDAO
-import oxalis.security.WkEnv
+import models.dataset.credential.CredentialDAO
 import play.api.libs.json.{JsValue, Json, OFormat}
 import play.api.mvc.{Action, PlayBodyParsers}
+import security.WkEnv
 import utils.ObjectId
 
 import javax.inject.Inject

diff --git a/app/controllers/DataStoreController.scala b/app/controllers/DataStoreController.scala
@@ -5,14 +5,14 @@ import com.scalableminds.util.tools.{Fox, FoxImplicits}
 import io.swagger.annotations.{Api, ApiOperation, ApiResponse, ApiResponses}
 
 import javax.inject.Inject
-import models.binary.{DataStore, DataStoreDAO, DataStoreService}
+import models.dataset.{DataStore, DataStoreDAO, DataStoreService}
 import models.user.MultiUserDAO
 import net.liftweb.common.Empty
-import oxalis.security.WkEnv
 import play.api.i18n.Messages
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent}
+import security.WkEnv
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/app/controllers/DatasetController.scala b/app/controllers/DatasetController.scala
@@ -8,8 +8,8 @@ import com.scalableminds.util.tools.{Fox, TristateOptionJsonHelper}
 import com.scalableminds.webknossos.datastore.models.datasource.{DataLayer, ElementClass, GenericDataSource}
 import io.swagger.annotations._
 import models.analytics.{AnalyticsService, ChangeDatasetSettingsEvent, OpenDatasetEvent}
-import models.binary._
-import models.binary.explore.{
+import models.dataset._
+import models.dataset.explore.{
   ExploreAndAddRemoteDatasetParameters,
   ExploreRemoteDatasetParameters,
   ExploreRemoteLayerService
@@ -18,8 +18,6 @@ import models.organization.OrganizationDAO
 import models.team.{TeamDAO, TeamService}
 import models.user.{User, UserDAO, UserService}
 import net.liftweb.common.{Box, Empty, Failure, Full}
-import oxalis.mail.{MailchimpClient, MailchimpTag}
-import oxalis.security.{URLSharing, WkEnv}
 import play.api.i18n.{Messages, MessagesProvider}
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
@@ -30,7 +28,9 @@ import javax.inject.Inject
 import scala.collection.mutable.ListBuffer
 import scala.concurrent.{ExecutionContext, Future}
 import com.scalableminds.webknossos.datastore.models.AdditionalCoordinate
+import mail.{MailchimpClient, MailchimpTag}
 import models.folder.FolderService
+import security.{URLSharing, WkEnv}
 
 case class DatasetUpdateParameters(
     description: Option[Option[String]] = Some(None),

diff --git a/app/controllers/EmailVerificationController.scala b/app/controllers/EmailVerificationController.scala
@@ -4,8 +4,8 @@ import com.mohiva.play.silhouette.api.Silhouette
 import com.scalableminds.util.accesscontext.GlobalAccessContext
 import com.scalableminds.util.tools.FoxImplicits
 import models.user.EmailVerificationService
-import oxalis.security.WkEnv
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers}
+import security.WkEnv
 
 import javax.inject.Inject
 import scala.concurrent.ExecutionContext

diff --git a/app/controllers/FolderController.scala b/app/controllers/FolderController.scala
@@ -3,14 +3,14 @@ package controllers
 import com.mohiva.play.silhouette.api.Silhouette
 import com.scalableminds.util.tools.{Fox, FoxImplicits}
 import io.swagger.annotations.{Api, ApiOperation, ApiResponse, ApiResponses}
-import models.binary.DatasetDAO
+import models.dataset.DatasetDAO
 import models.folder.{Folder, FolderDAO, FolderParameters, FolderService}
 import models.organization.OrganizationDAO
 import models.team.{TeamDAO, TeamService}
 import models.user.UserService
-import oxalis.security.WkEnv
 import play.api.libs.json.Json
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers}
+import security.WkEnv
 import utils.ObjectId
 
 import javax.inject.Inject

diff --git a/app/controllers/InitialDataController.scala b/app/controllers/InitialDataController.scala
@@ -6,20 +6,20 @@ import com.scalableminds.util.time.Instant
 import com.scalableminds.util.tools.{Fox, FoxImplicits}
 import com.typesafe.scalalogging.LazyLogging
 import models.annotation.{TracingStore, TracingStoreDAO}
-import models.binary._
+import models.dataset._
 import models.folder.{Folder, FolderDAO, FolderService}
 import models.project.{Project, ProjectDAO}
 import models.task.{TaskType, TaskTypeDAO}
 import models.team._
 import models.user._
 import net.liftweb.common.{Box, Full}
-import oxalis.security._
 import play.api.libs.json.Json
 import utils.{ObjectId, StoreModules, WkConf}
 
 import javax.inject.Inject
 import models.organization.{Organization, OrganizationDAO}
 import play.api.mvc.{Action, AnyContent}
+import security.{Token, TokenDAO, TokenType, WkEnv}
 
 import scala.concurrent.ExecutionContext
 

diff --git a/app/controllers/JobsController.scala b/app/controllers/JobsController.scala
@@ -3,16 +3,16 @@ package controllers
 import com.mohiva.play.silhouette.api.Silhouette
 import com.scalableminds.util.accesscontext.GlobalAccessContext
 import com.scalableminds.util.tools.Fox
-import models.binary.DatasetDAO
+import models.dataset.DatasetDAO
 import models.job._
 import models.organization.OrganizationDAO
-import models.binary.DataStoreDAO
+import models.dataset.DataStoreDAO
 import models.user.MultiUserDAO
-import oxalis.security.{WkEnv, WkSilhouetteEnvironment}
-import oxalis.telemetry.SlackNotificationService
 import play.api.i18n.Messages
 import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent}
+import security.{WkEnv, WkSilhouetteEnvironment}
+import telemetry.SlackNotificationService
 import utils.{ObjectId, WkConf}
 
 import java.util.Date

diff --git a/app/controllers/LegacyApiController.scala b/app/controllers/LegacyApiController.scala
@@ -9,10 +9,10 @@ import javax.inject.Inject
 import models.project.ProjectDAO
 import models.task.{TaskDAO, TaskService}
 import models.user.User
-import oxalis.security.WkEnv
 import play.api.http.HttpEntity
 import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers, Result}
+import security.WkEnv
 import utils.ObjectId
 
 import scala.concurrent.ExecutionContext

diff --git a/app/controllers/MaintenanceController.scala b/app/controllers/MaintenanceController.scala
@@ -4,7 +4,6 @@ import com.mohiva.play.silhouette.api.Silhouette
 import com.scalableminds.util.time.Instant
 import com.scalableminds.util.tools.{Fox, FoxImplicits}
 import models.user.UserService
-import oxalis.security.WkEnv
 import play.api.libs.json.{JsObject, Json, OFormat}
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers}
 import slick.lifted.Rep
@@ -15,6 +14,7 @@ import javax.inject.Inject
 import scala.concurrent.ExecutionContext
 import scala.concurrent.duration._
 import com.scalableminds.webknossos.schema.Tables._
+import security.WkEnv
 
 class MaintenanceController @Inject()(
     sil: Silhouette[WkEnv],

diff --git a/app/controllers/MeshController.scala b/app/controllers/MeshController.scala
@@ -4,8 +4,8 @@ import com.mohiva.play.silhouette.api.Silhouette
 import com.scalableminds.util.tools.FoxImplicits
 import models.annotation.AnnotationDAO
 import models.mesh.{MeshDAO, MeshInfo, MeshInfoParameters, MeshService}
-import oxalis.security.WkEnv
 import play.api.mvc.{Action, AnyContent, PlayBodyParsers, RawBuffer}
+import security.WkEnv
 import utils.ObjectId
 import javax.inject.Inject