unwrap sdk responses, addressing PR comments

.gitignore

@@ -49,4 +49,4 @@ crates/bitwarden-napi/src-ts/bitwarden_client/schemas.ts
 languages/csharp/Bitwarden.Sdk/schemas.cs
 languages/js_webassembly/bitwarden_client/schemas.ts
 languages/python/BitwardenClient/schemas.py
-languages/java/src/main/java/bit/sdk/schema
+languages/java/src/main/java/com/bitwarden/sdk/schema

.vscode/tasks.json

@@ -50,11 +50,8 @@
     {
       "label": "buildJava",
       "type": "shell",
-      "command": "mvn",
-      "args": [
-          "clean",
-          "install"
-      ],
+      "command": "gradle",
+      "args": ["build"],
       "dependsOrder": "sequence",
       "dependsOn": ["rust: bitwarden-c build"]
   }

languages/java/README.md

@@ -1,6 +1,7 @@
 # Bitwarden Secrets Manager SDK
 
-Java bindings for interacting with the [Bitwarden Secrets Manager]. This is a beta release and might be missing some functionality.
+Java bindings for interacting with the [Bitwarden Secrets Manager]. This is a beta release and might be missing some
+functionality.
 
 ## Create access token
 
@@ -34,7 +35,7 @@ var projectsResponse = bitwardenClient.projects().list(organizationId);
 ### Update project
 
 ```java
-UUID projectId = projectResponse.getData().getID();
+UUID projectId = projectResponse.getID();
 projectResponse = bitwardenClient.projects().get(projectId);
 projectResponse = bitwardenClient.projects.update(projectId, organizationId, "TestProjectUpdated");
 ```
@@ -46,10 +47,11 @@ String key = "key";
 String value = "value";
 String note = "note";
 var secretResponse = bitwardenClient.secrets().create(key, value, note, organizationId, new UUID[]{projectId});
-UUID secretId = secretResponse.getData().getID();
+UUID secretId = secretResponse.getID();
 ```
 
 ### Update secret
+
 ```java
 bitwardenClient.secrets().update(secretId, key2, value2, note2, organizationId, new UUID[]{projectId});
 ```
@@ -68,4 +70,5 @@ bitwardenClient.projects().delete(new UUID[]{projectId});
 ```
 
 [Access Tokens]: https://bitwarden.com/help/access-tokens/
+
 [Bitwarden Secrets Manager]: https://bitwarden.com/products/secrets-manager/

languages/java/build.gradle

@@ -26,7 +26,7 @@ repositories {
         publications {
             maven(MavenPublication) {
                 groupId = 'com.bitwarden'
-                artifactId = 'sdk-java'
+                artifactId = 'sdk'
 
                 // Determine the version from the git history.
                 //

languages/java/src/main/java/bit/sdk/BitwardenClient.java → languages/java/src/main/java/com/bitwarden/sdk/BitwardenClient.java

@@ -1,6 +1,6 @@
-package bit.sdk;
+package com.bitwarden.sdk;
 
-import bit.sdk.schema.*;
+import com.bitwarden.sdk.schema.*;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
@@ -15,7 +15,7 @@ static <T, R> Function<T, R> throwingFunctionWrapper(ThrowingFunction<T, R, Exce
             try {
                 return throwingFunction.accept(i);
             } catch (Exception ex) {
-                throw new RuntimeException(ex);
+                throw new BitwardenClientException("Response deserialization failed");
             }
         };
     }
@@ -28,42 +28,46 @@ static <T, R> Function<T, R> throwingFunctionWrapper(ThrowingFunction<T, R, Exce
 
     private boolean isClientOpen;
 
-    private Projects projects;
+    private ProjectsClient projects;
 
-    private Secrets secrets;
+    private SecretsClient secrets;
 
     public BitwardenClient(BitwardenSettings bitwardenSettings) {
         ClientSettings clientSettings = new ClientSettings();
         clientSettings.setAPIURL(bitwardenSettings.getApiUrl());
         clientSettings.setIdentityURL(bitwardenSettings.getIdentityUrl());
         clientSettings.setDeviceType(DeviceType.SDK);
-        clientSettings.setUserAgent("Bitwarden Java SDK");
+        clientSettings.setUserAgent("Bitwarden JAVA-SDK");
         library = Native.load("bitwarden_c", BitwardenLibrary.class);
         try {
             client = library.init(Converter.ClientSettingsToJsonString(clientSettings));
         } catch (JsonProcessingException e) {
-            throw new RuntimeException("Error while processing client settings", e);
+            throw new BitwardenClientException("Error while processing client settings");
         }
         commandRunner = new CommandRunner(library, client);
-        projects = new Projects(commandRunner);
-        secrets = new Secrets(commandRunner);
+        projects = new ProjectsClient(commandRunner);
+        secrets = new SecretsClient(commandRunner);
         isClientOpen = true;
     }
 
-    public ResponseForAPIKeyLoginResponse accessTokenLogin(String accessToken) {
+    public APIKeyLoginResponse accessTokenLogin(String accessToken) {
         Command command = new Command();
         AccessTokenLoginRequest accessTokenLoginRequest = new AccessTokenLoginRequest();
         accessTokenLoginRequest.setAccessToken(accessToken);
         command.setAccessTokenLogin(accessTokenLoginRequest);
-        return commandRunner.runCommand(command,
+        ResponseForAPIKeyLoginResponse response = commandRunner.runCommand(command,
             throwingFunctionWrapper(Converter::ResponseForAPIKeyLoginResponseFromJsonString));
+        if (response == null || !response.getSuccess()) {
+            throw new BitwardenClientException(response != null ? response.getErrorMessage() : "Login failed");
+        }
+        return response.getData();
     }
 
-    public Projects projects() {
+    public ProjectsClient projects() {
         return projects;
     }
 
-    public Secrets secrets() {
+    public SecretsClient secrets() {
         return secrets;
     }
 

languages/java/src/main/java/com/bitwarden/sdk/BitwardenClientException.java

@@ -0,0 +1,8 @@
+package com.bitwarden.sdk;
+
+public class BitwardenClientException extends RuntimeException {
+
+    public BitwardenClientException(String message) {
+        super(message);
+    }
+}

languages/java/src/main/java/bit/sdk/BitwardenLibrary.java → languages/java/src/main/java/com/bitwarden/sdk/BitwardenLibrary.java

@@ -1,4 +1,4 @@
-package bit.sdk;
+package com.bitwarden.sdk;
 
 import com.sun.jna.Library;
 import com.sun.jna.Pointer;

languages/java/src/main/java/bit/sdk/BitwardenSettings.java → languages/java/src/main/java/com/bitwarden/sdk/BitwardenSettings.java

@@ -1,4 +1,4 @@
-package bit.sdk;
+package com.bitwarden.sdk;
 
 public class BitwardenSettings {
 

languages/java/src/main/java/bit/sdk/CommandRunner.java → languages/java/src/main/java/com/bitwarden/sdk/CommandRunner.java

@@ -1,7 +1,7 @@
-package bit.sdk;
+package com.bitwarden.sdk;
 
-import bit.sdk.schema.Command;
-import bit.sdk.schema.Converter;
+import com.bitwarden.sdk.schema.Command;
+import com.bitwarden.sdk.schema.Converter;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.jna.Pointer;