Skip to content

Commit

Permalink
Remove redundant jooq codes and their usages in core/amber (#3164)
Browse files Browse the repository at this point in the history
As titled, this PR removes the redundant jooq codes in package
`edu.uci.ics.texera.web.model.jooq.generated` in `core/amber`. All the
imports related to them are now pointing to
`edu.uci.ics.texera.dao.jooq.generated` in `core/dao`.
  • Loading branch information
bobbai00 authored Dec 17, 2024
1 parent fc3170a commit 8cc5098
Show file tree
Hide file tree
Showing 139 changed files with 90 additions and 14,908 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import edu.uci.ics.amber.engine.common.storage.SequentialRecordStorage
import edu.uci.ics.amber.engine.common.{AmberConfig, AmberRuntime, Utils}
import edu.uci.ics.amber.virtualidentity.ExecutionIdentity
import edu.uci.ics.texera.web.auth.JwtAuth.setupJwtAuth
import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.WorkflowExecutions
import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.WorkflowExecutions
import edu.uci.ics.texera.web.resource.WorkflowWebsocketResource
import edu.uci.ics.texera.web.resource.dashboard.user.workflow.WorkflowExecutionsResource
import edu.uci.ics.texera.web.service.ExecutionsMetadataPersistService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package edu.uci.ics.texera.web

import com.typesafe.scalalogging.LazyLogging
import edu.uci.ics.texera.web.auth.JwtAuth.jwtConsumer
import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.User
import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
import org.apache.http.client.utils.URLEncodedUtils
import org.jooq.types.UInteger

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package edu.uci.ics.texera.web.auth

import edu.uci.ics.texera.web.auth.GuestAuthFilter.GUEST
import edu.uci.ics.texera.web.model.jooq.generated.enums.UserRole
import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.User
import edu.uci.ics.texera.dao.jooq.generated.enums.UserRole
import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
import io.dropwizard.auth.AuthFilter

import java.io.IOException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package edu.uci.ics.texera.web.auth
import com.github.toastshaman.dropwizard.auth.jwt.JwtAuthFilter
import com.typesafe.config.Config
import edu.uci.ics.amber.engine.common.AmberConfig
import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.User
import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
import io.dropwizard.auth.AuthDynamicFeature
import io.dropwizard.setup.Environment
import org.jose4j.jws.AlgorithmIdentifiers.HMAC_SHA256
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package edu.uci.ics.texera.web.auth

import edu.uci.ics.texera.web.model.jooq.generated.enums.UserRole
import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.User
import edu.uci.ics.texera.dao.jooq.generated.enums.UserRole
import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
import org.jooq.types.UInteger

import java.security.Principal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package edu.uci.ics.texera.web.auth

import com.typesafe.scalalogging.LazyLogging
import edu.uci.ics.texera.web.model.jooq.generated.enums.UserRole
import edu.uci.ics.texera.web.model.jooq.generated.tables.pojos.User
import edu.uci.ics.texera.dao.jooq.generated.enums.UserRole
import edu.uci.ics.texera.dao.jooq.generated.tables.pojos.User
import io.dropwizard.auth.Authenticator
import org.jooq.types.UInteger
import org.jose4j.jwt.consumer.JwtContext
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.uci.ics.texera.web.auth

import edu.uci.ics.texera.web.model.jooq.generated.enums.UserRole
import edu.uci.ics.texera.dao.jooq.generated.enums.UserRole
import io.dropwizard.auth.Authorizer

object UserRoleAuthorizer extends Authorizer[SessionUser] {
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8cc5098

Please sign in to comment.