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.

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

Bump to version 2.6.6 #249

Merged
merged 4 commits into from
Dec 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to QingStor SDK for JAVA will be documented in this file.

## [v2.6.6] - 2024-12-24

### Fixed

- Fix the bug that the header `x-qs-date` is not considered in the signature calculation.
- Fix the bug that decoding versioned delete-object output fails on boolean field.
- Use -1 as unknown body size hint before parsing the content length.

## [v2.6.5] - 2024-04-30

### Added
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
SHELL := /bin/bash

.PHONY: help all test unit build update generate

help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " all to update, generate and test this SDK"
@echo " test to run service test"
@echo " unit to run all sort of unit tests except runtime"
@echo " build to build jar"
@echo " update to update git submodules"
@echo " generate to generate service code"

Expand Down
2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Maven:
<dependency>
<groupId>com.yunify</groupId>
<artifactId>qingstor.sdk.java</artifactId>
<version>2.6.5</version>
<version>2.6.6</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion docs/install_zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Maven:
<dependency>
<groupId>com.yunify</groupId>
<artifactId>qingstor.sdk.java</artifactId>
<version>2.6.5</version>
<version>2.6.6</version>
</dependency>
```

Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.yunify</groupId>
<artifactId>qingstor.sdk.java</artifactId>
<version>2.6.5</version>
<version>2.6.6</version>
<name>Qingcloud Qingstor SDK for Java</name>
<description>The official QingStor SDK for the Java programming language.</description>
<url>https://www.qingcloud.com/products/objectstorage/</url>
Expand Down Expand Up @@ -40,6 +40,7 @@

<dependencies>
<dependency>
<!-- okio < 3.0.0. https://github.com/square/okio/pull/818 -->
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
Expand Down Expand Up @@ -269,7 +270,7 @@
<java>
<!-- apply a specific flavor of google-java-format and reflow long strings -->
<googleJavaFormat>
<version>1.10.0</version>
<version>1.7</version>
<style>AOSP</style>
</googleJavaFormat>

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/qingstor/sdk/constants/QSConstant.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public class QSConstant {
public static final String ENV_CONTEXT_KEY = "envContext";

public static final String HEADER_PARAM_KEY_DATE = "Date";
public static final String HEADER_PARAM_KEY_QS_DATE = "x-qs-date";

public static final String HEADER_PARAM_KEY_EXPIRES = "Expires";

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/qingstor/sdk/utils/QSJSONUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ private static Object getParseValue(Class type, Object value) {
return Long.parseLong(value.toString());
} else if (Float.class.equals(type) || "float".equals(type.toString())) {
return Float.parseFloat(value.toString());
} else if (Boolean.class.equals(type) || "boolean".equals(type.toString())) {
return Boolean.parseBoolean(value.toString());
}
return value;
}
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/qingstor/sdk/utils/QSSignatureUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,12 @@ public static String getStringToSignature(
// Append request time as string
String dateStr = "";
if (headers != null) {
if (headers.containsKey(QSConstant.HEADER_PARAM_KEY_DATE)) {
dateStr = headers.get(QSConstant.HEADER_PARAM_KEY_DATE);
}
if (headers.containsKey(QSConstant.HEADER_PARAM_KEY_EXPIRES)) {
dateStr = headers.get(QSConstant.HEADER_PARAM_KEY_EXPIRES);
} else {
if (!headers.containsKey(QSConstant.HEADER_PARAM_KEY_QS_DATE)) {
dateStr = headers.get(QSConstant.HEADER_PARAM_KEY_DATE);
}
}
}
sb.append("\n").append(dateStr);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2.6.5
version=2.6.6
Loading