Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove redundant jooq codes and their usages in core/amber #3164

Merged
merged 4 commits into from
Dec 17, 2024
Merged

Remove redundant jooq codes and their usages in core/amber #3164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec31f61
finished
bobbai00 Dec 17, 2024
e722ca9
fmt
bobbai00 Dec 17, 2024
4d51ec3
drop wrong changes
bobbai00 Dec 17, 2024
66aa78b
Merge branch 'master' into jiadong-remove-jooq-generated-codes
bobbai00 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/amber/src/main/scala/edu/uci/ics/texera/web/ComputingUnitMaster.scala
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion core/amber/src/main/scala/edu/uci/ics/texera/web/ServletAwareConfigurator.scala
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions core/amber/src/main/scala/edu/uci/ics/texera/web/auth/GuestAuthFilter.scala
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion core/amber/src/main/scala/edu/uci/ics/texera/web/auth/JwtAuth.scala
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions core/amber/src/main/scala/edu/uci/ics/texera/web/auth/SessionUser.scala
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserAuthenticator.scala
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion core/amber/src/main/scala/edu/uci/ics/texera/web/auth/UserRoleAuthorizer.scala
View file
Open in desktop
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
51 changes: 0 additions & 51 deletions core/amber/src/main/scala/edu/uci/ics/texera/web/model/jooq/generated/DefaultCatalog.java
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions core/amber/src/main/scala/edu/uci/ics/texera/web/model/jooq/generated/Indexes.java
View file
Open in desktop

This file was deleted.

Loading
Loading