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.
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
Fix upload quota check and provide better error message #893
Merged
schabdo
merged 13 commits into
eclipse:master
from
bosch-io:feature_better_upload_quota_message
Oct 30, 2019
Merged
Fix upload quota check and provide better error message #893
schabdo
merged 13 commits into
eclipse:master
from
bosch-io:feature_better_upload_quota_message
Oct 30, 2019
Conversation
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
…r message Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
dobleralex
commented
Oct 2, 2019
hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java
Outdated
Show resolved
Hide resolved
dobleralex
commented
Oct 2, 2019
...t-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaArtifactManagement.java
Show resolved
Hide resolved
dobleralex
commented
Oct 2, 2019
...t-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaArtifactManagement.java
Outdated
Show resolved
Hide resolved
dobleralex
commented
Oct 2, 2019
...wkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java
Outdated
Show resolved
Hide resolved
dobleralex
commented
Oct 2, 2019
...wkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java
Outdated
Show resolved
Hide resolved
dobleralex
commented
Oct 2, 2019
...wkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
dobleralex
commented
Oct 11, 2019
...-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaInputStream.java
Outdated
Show resolved
Hide resolved
dobleralex
commented
Oct 11, 2019
...t-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaArtifactManagement.java
Outdated
Show resolved
Hide resolved
dobleralex
commented
Oct 11, 2019
...-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaInputStream.java
Outdated
Show resolved
Hide resolved
dobleralex
commented
Oct 11, 2019
...it-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java
Outdated
Show resolved
Hide resolved
dobleralex
commented
Oct 11, 2019
...it-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
… fixes Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
aktivk
reviewed
Oct 18, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
have a look on the code comment
...-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaInputStream.java
Outdated
Show resolved
Hide resolved
blomark
reviewed
Oct 21, 2019
hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java
Show resolved
Hide resolved
blomark
reviewed
Oct 21, 2019
hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java
Outdated
Show resolved
Hide resolved
blomark
reviewed
Oct 21, 2019
...-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaInputStream.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
hawkbit-bot
reviewed
Oct 24, 2019
...itory-api/src/main/java/org/eclipse/hawkbit/repository/exception/QuotaExceededException.java
Outdated
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 24, 2019
...it-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java
Outdated
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 24, 2019
...ava/org/eclipse/hawkbit/repository/jpa/utils/FileSizeAndStorageQuotaCheckingInputStream.java
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 24, 2019
...ava/org/eclipse/hawkbit/repository/jpa/utils/FileSizeAndStorageQuotaCheckingInputStream.java
Show resolved
Hide resolved
hawkbit-bot
reviewed
Oct 24, 2019
...bit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressButtonLayout.java
Show resolved
Hide resolved
bogdan-bondar
requested changes
Oct 24, 2019
...itory-api/src/main/java/org/eclipse/hawkbit/repository/exception/QuotaExceededException.java
Outdated
Show resolved
Hide resolved
...itory-api/src/main/java/org/eclipse/hawkbit/repository/exception/QuotaExceededException.java
Outdated
Show resolved
Hide resolved
...t-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaArtifactManagement.java
Outdated
Show resolved
Hide resolved
...ava/org/eclipse/hawkbit/repository/jpa/utils/FileSizeAndStorageQuotaCheckingInputStream.java
Show resolved
Hide resolved
...ava/org/eclipse/hawkbit/repository/jpa/utils/FileSizeAndStorageQuotaCheckingInputStream.java
Outdated
Show resolved
Hide resolved
...it-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java
Outdated
Show resolved
Hide resolved
...it-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java
Outdated
Show resolved
Hide resolved
...it-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
…ad_quota_message Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
ramannas
pushed a commit
to bosch-io/hawkbit
that referenced
this pull request
Nov 18, 2019
* Adjusted upload quota check to include file size and show proper error message Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Fixed failing upload quota tests Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Moved quota check to stream, fixed review findings Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Added missing license header to QuotaInputStream Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Reworked uploadLock, ensured error messages may be translated, review fixes Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Added local artifactrepo to gitignore Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Fixed sonar issues and assignment quota message Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * PR review fixes Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Split quota exceptions, PR fixes Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Removed left over conversion method in quota helper Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Made conversion helper class final Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
AmmarBikic
pushed a commit
to bosch-io/hawkbit
that referenced
this pull request
Oct 2, 2020
* Adjusted upload quota check to include file size and show proper error message Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Fixed failing upload quota tests Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Moved quota check to stream, fixed review findings Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Added missing license header to QuotaInputStream Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Reworked uploadLock, ensured error messages may be translated, review fixes Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Added local artifactrepo to gitignore Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Fixed sonar issues and assignment quota message Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * PR review fixes Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Split quota exceptions, PR fixes Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Removed left over conversion method in quota helper Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com> * Made conversion helper class final Signed-off-by: Alexander Dobler <alexander.dobler3@bosch-si.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the quota checks for uploads. It moves the quota check to be executed after the upload. This enables to consider the file size within the check and show a proper error message.
Before the quota was only successfully checked when it was already exceeded before.