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

Jump to bottom

Draft: Remove deprecated methods since #11371 #11756

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Draft: Remove deprecated methods since #11371 #11756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 1 addition & 11 deletions core/play/src/main/scala/play/api/controllers/Assets.scala
View file
Open in desktop
Expand Up @@ -716,22 +716,12 @@ object Assets {

@Singleton
class Assets @Inject() (errorHandler: HttpErrorHandler, meta: AssetsMetadata, env: Environment)
extends AssetsBuilder(errorHandler, meta, env) {
@deprecated("Use Assets(errorHandler,meta,env) instead.", "2.9")
def this(errorHandler: HttpErrorHandler, meta: AssetsMetadata) = {
this(errorHandler, meta, null)
}
}
extends AssetsBuilder(errorHandler, meta, env)

class AssetsBuilder(errorHandler: HttpErrorHandler, meta: AssetsMetadata, env: Environment) extends ControllerHelpers {
import meta._
import Assets._

@deprecated("Use AssetsBuilder(errorHandler,meta,env) instead.", "2.9")
def this(errorHandler: HttpErrorHandler, meta: AssetsMetadata) = {
this(errorHandler, meta, null)
}

protected val Action: ActionBuilder[Request, AnyContent] = new ActionBuilder.IgnoringBody()(Execution.trampoline)

private def maybeNotModified(
Expand Down
5 changes: 0 additions & 5 deletions core/play/src/main/scala/play/utils/Resources.scala
View file
Open in desktop
Expand Up @@ -25,11 +25,6 @@ object Resources {
throw new IllegalArgumentException(s"Cannot check isDirectory for a URL with protocol='${url.getProtocol}'")
}

@deprecated("Use isUrlConnectionADirectory(classLoader,urlConnection) instead.", "2.9")
def isUrlConnectionADirectory(urlConnection: URLConnection): Boolean = {
isUrlConnectionADirectory(null, urlConnection)
}

/**
* Tries to work out whether the given URL connection is a directory or not.
*
Expand Down