diff --git a/.github/workflows/github_issues.yml b/.github/workflows/github_issues.yml index f50c77ca89..e066582b5a 100644 --- a/.github/workflows/github_issues.yml +++ b/.github/workflows/github_issues.yml @@ -3,7 +3,7 @@ name: Sync issue to Azure DevOps work item "on": issues: types: - [opened, edited, deleted, closed, reopened, labeled, unlabeled] + [opened, reopened] jobs: alert: diff --git a/device/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/transport/TransportUtils.java b/device/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/transport/TransportUtils.java index 8d8eacaba1..8ac77abec0 100644 --- a/device/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/transport/TransportUtils.java +++ b/device/iot-device-client/src/main/java/com/microsoft/azure/sdk/iot/device/transport/TransportUtils.java @@ -10,7 +10,7 @@ public class TransportUtils public static String IOTHUB_API_VERSION = "2020-09-30"; private static final String JAVA_DEVICE_CLIENT_IDENTIFIER = "com.microsoft.azure.sdk.iot.iot-device-client"; - private static final String CLIENT_VERSION = "1.26.0"; + private static final String CLIENT_VERSION = "1.27.0"; private static String JAVA_RUNTIME = System.getProperty("java.version"); private static String OPERATING_SYSTEM = System.getProperty("java.runtime.name").toLowerCase().contains("android") ? "Android" : System.getProperty("os.name"); diff --git a/device/iot-device-samples/android-sample/app/build.gradle b/device/iot-device-samples/android-sample/app/build.gradle index 5f349433e7..3179f4e17c 100644 --- a/device/iot-device-samples/android-sample/app/build.gradle +++ b/device/iot-device-samples/android-sample/app/build.gradle @@ -44,7 +44,7 @@ dependencies { testImplementation 'junit:junit:4.12' // Remote binary dependency - api ('com.microsoft.azure.sdk.iot:iot-device-client:1.26.0') { + api ('com.microsoft.azure.sdk.iot:iot-device-client:1.27.0') { exclude module: 'slf4j-api' exclude module:'azure-storage' } diff --git a/pom.xml b/pom.xml index f84c75eafd..69c1a6b208 100644 --- a/pom.xml +++ b/pom.xml @@ -33,10 +33,10 @@ dice-provider x509-provider - 1.26.0 + 1.27.0 1.26.0 0.11.0 - 1.8.4 + 1.8.5 1.7.0 1.3.0 1.1.1 diff --git a/provisioning/provisioning-device-client/src/main/java/com/microsoft/azure/sdk/iot/provisioning/device/internal/SDKUtils.java b/provisioning/provisioning-device-client/src/main/java/com/microsoft/azure/sdk/iot/provisioning/device/internal/SDKUtils.java index 1ae22c54d3..f28428668b 100644 --- a/provisioning/provisioning-device-client/src/main/java/com/microsoft/azure/sdk/iot/provisioning/device/internal/SDKUtils.java +++ b/provisioning/provisioning-device-client/src/main/java/com/microsoft/azure/sdk/iot/provisioning/device/internal/SDKUtils.java @@ -11,7 +11,7 @@ public class SDKUtils { private static final String SERVICE_API_VERSION = "2019-03-31"; public static final String PROVISIONING_DEVICE_CLIENT_IDENTIFIER = "com.microsoft.azure.sdk.iot.dps.dps-device-client/"; - public static final String PROVISIONING_DEVICE_CLIENT_VERSION = "1.8.4"; + public static final String PROVISIONING_DEVICE_CLIENT_VERSION = "1.8.5"; private static String JAVA_RUNTIME = System.getProperty("java.version"); private static String OPERATING_SYSTEM = System.getProperty("java.runtime.name").toLowerCase().contains("android") ? "Android" : System.getProperty("os.name"); diff --git a/provisioning/provisioning-device-client/src/main/java/com/microsoft/azure/sdk/iot/provisioning/device/internal/contract/UrlPathBuilder.java b/provisioning/provisioning-device-client/src/main/java/com/microsoft/azure/sdk/iot/provisioning/device/internal/contract/UrlPathBuilder.java index 6bd3d88dbf..0258ed6107 100644 --- a/provisioning/provisioning-device-client/src/main/java/com/microsoft/azure/sdk/iot/provisioning/device/internal/contract/UrlPathBuilder.java +++ b/provisioning/provisioning-device-client/src/main/java/com/microsoft/azure/sdk/iot/provisioning/device/internal/contract/UrlPathBuilder.java @@ -11,9 +11,6 @@ import com.microsoft.azure.sdk.iot.provisioning.device.internal.SDKUtils; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; public class UrlPathBuilder { @@ -125,9 +122,8 @@ private String generateRequestUrlHttp(String registrationId, String operationsId * Generates URL Encoded SAS Token * @param registrationId Id for the registration. Cannot be {@code null} or empty * @return A string of format - * @throws UnsupportedEncodingException if the string could not be encoded. */ - public String generateSasTokenUrl(String registrationId) throws UnsupportedEncodingException + public String generateSasTokenUrl(String registrationId) { //SRS_UrlPathBuilder_25_005: [ This method shall throw IllegalArgumentException if the registration id is null or empty. ] if (registrationId == null || registrationId.isEmpty()) @@ -141,7 +137,7 @@ public String generateSasTokenUrl(String registrationId) throws UnsupportedEncod sasTokenUrl.append(REGISTRATIONS); sasTokenUrl.append(SLASH); sasTokenUrl.append(registrationId); - return URLEncoder.encode(sasTokenUrl.toString(), StandardCharsets.UTF_8.displayName()); + return sasTokenUrl.toString(); } /** diff --git a/provisioning/provisioning-device-client/src/test/java/tests/unit/com/microsoft/azure/sdk/iot/provisioning/device/internal/contract/UrlPathBuilderTest.java b/provisioning/provisioning-device-client/src/test/java/tests/unit/com/microsoft/azure/sdk/iot/provisioning/device/internal/contract/UrlPathBuilderTest.java index fb2fd1f4c9..7acb908fcf 100644 --- a/provisioning/provisioning-device-client/src/test/java/tests/unit/com/microsoft/azure/sdk/iot/provisioning/device/internal/contract/UrlPathBuilderTest.java +++ b/provisioning/provisioning-device-client/src/test/java/tests/unit/com/microsoft/azure/sdk/iot/provisioning/device/internal/contract/UrlPathBuilderTest.java @@ -212,8 +212,8 @@ public void generateRequestUrlHttpThrowsOnEmptyOpID() throws IOException public void generateSasTokenUrlSucceeds() throws IOException { //arrange - //testScope%2Fregistrations%2FtestRegistrationId - final String expectedSasTokenUrl = TEST_SCOPE + "%2Fregistrations%2F" + TEST_REGISTRATION_ID; + //testScope/registrations/testRegistrationId + final String expectedSasTokenUrl = TEST_SCOPE + "/registrations/" + TEST_REGISTRATION_ID; UrlPathBuilder urlPathBuilder = new UrlPathBuilder(TEST_HOST_NAME, TEST_SCOPE, ProvisioningDeviceClientTransportProtocol.HTTPS); //act String sastokenUrl = urlPathBuilder.generateSasTokenUrl(TEST_REGISTRATION_ID);