Skip to content

Commit

Permalink
Merge pull request #17 from reportportal/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
HardNorth authored Apr 4, 2024
2 parents 2b8e0a9 + 9a67d13 commit c5c56f3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# Changelog

## [Unreleased]
### Changed
- Client version updated on [5.2.13](https://github.com/reportportal/client-java/releases/tag/5.2.13), by @HardNorth

## [5.2.2]
### Changed
- Client version updated on [5.2.7](https://github.com/reportportal/client-java/releases/tag/5.2.7), by @HardNorth
- Client version updated on [5.2.8](https://github.com/reportportal/client-java/releases/tag/5.2.8), by @HardNorth
- Client and JSR 305 dependencies marked as `compileOnly`, by @HardNorth

## [5.2.1]
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description=Report Portal Java formatting utils for Agents and Loggers
junit5_version=5.6.3
junit5_runner_version=1.6.3
mockito_version=4.5.1
client_version=5.2.8
client_version=5.2.13
jsr305_version=3.0.2
scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts
scripts_branch=master
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private HttpFormatUtils() {
@Nonnull
public static String getMimeType(@Nullable String contentType) {
return ofNullable(contentType).filter(ct -> !ct.isEmpty())
.map(ct -> ContentType.parse(contentType))
.map(ct -> ContentType.stripMediaType(contentType))
.orElse(ContentType.APPLICATION_OCTET_STREAM);
}

Expand Down Expand Up @@ -278,7 +278,7 @@ public static BodyType getBodyType(@Nullable String contentType, @Nullable Map<S
if (contentType == null || contentType.isEmpty()) {
return BodyType.NONE;
}
String mimeType = ContentType.parse(contentType);
String mimeType = ContentType.stripMediaType(contentType);
return ofNullable(typeMap).map(m -> m.getOrDefault(mimeType, BodyType.BINARY)).orElse(BodyType.BINARY);
}

Expand Down

0 comments on commit c5c56f3

Please sign in to comment.