-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #347 from ODOICHON/hotfix/qa
[Hotfix/qa] ๊ด๋ฆฌ์ ํ์ด์ง ์ ์ ์ ๋ณด ์กฐํ ๊ฐ๋ฐ
- Loading branch information
Showing
11 changed files
with
401 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 22 additions & 22 deletions
44
src/main/kotlin/com/example/jhouse_server/global/config/RequestServletFilter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| package com.example.jhouse_server.global.config | ||
|
|
||
| import org.springframework.stereotype.Component | ||
| import javax.servlet.Filter | ||
| import javax.servlet.FilterChain | ||
| import javax.servlet.ServletRequest | ||
| import javax.servlet.ServletResponse | ||
| import javax.servlet.http.HttpServletRequest | ||
|
|
||
| @Component | ||
| class RequestServletFilter : Filter { | ||
| override fun doFilter( | ||
| request: ServletRequest, | ||
| response: ServletResponse, | ||
| chain: FilterChain | ||
| ) { | ||
| val wrappedRequest: HttpServletRequest = | ||
| RequestServletWrapper(request as HttpServletRequest) | ||
|
|
||
| chain.doFilter(wrappedRequest, response) | ||
| } | ||
| } | ||
| //package com.example.jhouse_server.global.config | ||
| // | ||
| //import org.springframework.stereotype.Component | ||
| //import javax.servlet.Filter | ||
| //import javax.servlet.FilterChain | ||
| //import javax.servlet.ServletRequest | ||
| //import javax.servlet.ServletResponse | ||
| //import javax.servlet.http.HttpServletRequest | ||
| // | ||
| //@Component | ||
| //class RequestServletFilter : Filter { | ||
| // override fun doFilter( | ||
| // request: ServletRequest, | ||
| // response: ServletResponse, | ||
| // chain: FilterChain | ||
| // ) { | ||
| // val wrappedRequest: HttpServletRequest = | ||
| // RequestServletWrapper(request as HttpServletRequest) | ||
| // | ||
| // chain.doFilter(wrappedRequest, response) | ||
| // } | ||
| //} |
128 changes: 64 additions & 64 deletions
128
src/main/kotlin/com/example/jhouse_server/global/config/RequestServletWrapper.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,64 @@ | ||
| package com.example.jhouse_server.global.config | ||
|
|
||
| import java.io.IOException | ||
| import java.io.StringReader | ||
| import java.util.* | ||
| import javax.servlet.ReadListener | ||
| import javax.servlet.ServletInputStream | ||
| import javax.servlet.http.HttpServletRequest | ||
| import javax.servlet.http.HttpServletRequestWrapper | ||
|
|
||
|
|
||
| class RequestServletWrapper(request: HttpServletRequest) : HttpServletRequestWrapper(request) { | ||
| private var requestData: String? = null | ||
|
|
||
| init { | ||
| try { | ||
| val s = request.inputStream?.let { Scanner(it).useDelimiter("\\A") } | ||
| if (s != null) { | ||
| requestData = if (s.hasNext()) s.next() else "" | ||
| } | ||
| } catch (e: IOException) { | ||
| e.printStackTrace() | ||
| } | ||
| } | ||
|
|
||
| override fun getInputStream(): ServletInputStream { | ||
| val reader = StringReader(requestData) | ||
|
|
||
| return object : ServletInputStream() { | ||
| private var readListener: ReadListener? = null | ||
|
|
||
| @Throws(IOException::class) | ||
| override fun read(): Int { | ||
| return reader.read() | ||
| } | ||
|
|
||
| override fun setReadListener(listener: ReadListener?) { | ||
| readListener = listener | ||
| try { | ||
| if (!isFinished) { | ||
| readListener?.onDataAvailable() | ||
| } else { | ||
| readListener?.onAllDataRead() | ||
| } | ||
| } catch (io: IOException) { | ||
| io.printStackTrace() | ||
| } | ||
| } | ||
|
|
||
| override fun isReady(): Boolean { | ||
| return isFinished | ||
| } | ||
|
|
||
| override fun isFinished(): Boolean { | ||
| try { | ||
| return reader.read() < 0 | ||
| } catch (e: IOException) { | ||
| e.printStackTrace() | ||
| } | ||
| return false | ||
| } | ||
| } | ||
| } | ||
| } | ||
| //package com.example.jhouse_server.global.config | ||
| // | ||
| //import java.io.IOException | ||
| //import java.io.StringReader | ||
| //import java.util.* | ||
| //import javax.servlet.ReadListener | ||
| //import javax.servlet.ServletInputStream | ||
| //import javax.servlet.http.HttpServletRequest | ||
| //import javax.servlet.http.HttpServletRequestWrapper | ||
| // | ||
| // | ||
| //class RequestServletWrapper(request: HttpServletRequest) : HttpServletRequestWrapper(request) { | ||
| // private var requestData: String? = null | ||
| // | ||
| // init { | ||
| // try { | ||
| // val s = request.inputStream?.let { Scanner(it).useDelimiter("\\A") } | ||
| // if (s != null) { | ||
| // requestData = if (s.hasNext()) s.next() else "" | ||
| // } | ||
| // } catch (e: IOException) { | ||
| // e.printStackTrace() | ||
| // } | ||
| // } | ||
| // | ||
| // override fun getInputStream(): ServletInputStream { | ||
| // val reader = StringReader(requestData) | ||
| // | ||
| // return object : ServletInputStream() { | ||
| // private var readListener: ReadListener? = null | ||
| // | ||
| // @Throws(IOException::class) | ||
| // override fun read(): Int { | ||
| // return reader.read() | ||
| // } | ||
| // | ||
| // override fun setReadListener(listener: ReadListener?) { | ||
| // readListener = listener | ||
| // try { | ||
| // if (!isFinished) { | ||
| // readListener?.onDataAvailable() | ||
| // } else { | ||
| // readListener?.onAllDataRead() | ||
| // } | ||
| // } catch (io: IOException) { | ||
| // io.printStackTrace() | ||
| // } | ||
| // } | ||
| // | ||
| // override fun isReady(): Boolean { | ||
| // return isFinished | ||
| // } | ||
| // | ||
| // override fun isFinished(): Boolean { | ||
| // try { | ||
| // return reader.read() < 0 | ||
| // } catch (e: IOException) { | ||
| // e.printStackTrace() | ||
| // } | ||
| // return false | ||
| // } | ||
| // } | ||
| // } | ||
| //} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.