Skip to content

Commit 74a5248

Browse files
committed
Reworded print statements
1 parent 8f26d1f commit 74a5248

File tree

9 files changed

+19
-21
lines changed

9 files changed

+19
-21
lines changed

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/AddAclBucketHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ public Void call() throws Exception {
9292
boolean result = client.getObjectStore().addAcl(obj,
9393
OzoneAcl.parseAcl(acl));
9494

95-
System.out.printf("%s%n", "Acl set successfully: " +
96-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
95+
System.out.printf("%s%n", "Acl added successfully: " + result);
9796

9897
client.close();
9998
return null;

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/RemoveAclBucketHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class RemoveAclBucketHandler extends Handler {
6868
*/
6969
@Override
7070
public Void call() throws Exception {
71-
Objects.requireNonNull(acl, "New acl to be added not specified.");
71+
Objects.requireNonNull(acl, "ACL to be removed not specified.");
7272
OzoneAddress address = new OzoneAddress(uri);
7373
address.ensureBucketAddress();
7474
OzoneClient client = address.createClient(createOzoneConfiguration());
@@ -92,8 +92,8 @@ public Void call() throws Exception {
9292
boolean result = client.getObjectStore().removeAcl(obj,
9393
OzoneAcl.parseAcl(acl));
9494

95-
System.out.printf("%s%n", "Acl removed successfully: " +
96-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
95+
System.out.printf("%s%n", "Acl removed successfully: " + result);
96+
9797
client.close();
9898
return null;
9999
}

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/SetAclBucketHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public Void call() throws Exception {
9292
boolean result = client.getObjectStore().setAcl(obj,
9393
OzoneAcl.parseAcls(acls));
9494

95-
System.out.printf("%s%n", "Acl set successfully: " +
96-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
95+
System.out.printf("%s%n", "Acl set successfully: " + result);
96+
9797
client.close();
9898
return null;
9999
}

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/AddAclKeyHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ public Void call() throws Exception {
9595
boolean result = client.getObjectStore().addAcl(obj,
9696
OzoneAcl.parseAcl(acl));
9797

98-
System.out.printf("%s%n", "Acl set successfully: " +
99-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
98+
System.out.printf("%s%n", "Acl added successfully: " + result);
10099

101100
client.close();
102101
return null;

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RemoveAclKeyHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class RemoveAclKeyHandler extends Handler {
6868
*/
6969
@Override
7070
public Void call() throws Exception {
71-
Objects.requireNonNull(acl, "New acl to be added not specified.");
71+
Objects.requireNonNull(acl, "ACL to be removed not specified.");
7272
OzoneAddress address = new OzoneAddress(uri);
7373
address.ensureKeyAddress();
7474
OzoneClient client = address.createClient(createOzoneConfiguration());
@@ -95,8 +95,8 @@ public Void call() throws Exception {
9595
boolean result = client.getObjectStore().removeAcl(obj,
9696
OzoneAcl.parseAcl(acl));
9797

98-
System.out.printf("%s%n", "Acl set successfully: " +
99-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
98+
System.out.printf("%s%n", "Acl removed successfully: " + result);
99+
100100
client.close();
101101
return null;
102102
}

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/SetAclKeyHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ public Void call() throws Exception {
9494
boolean result = client.getObjectStore().setAcl(obj,
9595
OzoneAcl.parseAcls(acls));
9696

97-
System.out.printf("%s%n", "Acl set successfully: " +
98-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
97+
System.out.printf("%s%n", "Acl set successfully: " + result);
98+
9999
client.close();
100100
return null;
101101
}

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/AddAclVolumeHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public Void call() throws Exception {
8989
boolean result = client.getObjectStore().addAcl(obj,
9090
OzoneAcl.parseAcl(acl));
9191

92-
System.out.printf("%s%n", "Acl set successfully: " +
93-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
92+
System.out.printf("%s%n", "Acl added successfully: " + result);
93+
9494
client.close();
9595
return null;
9696
}

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/RemoveAclVolumeHandler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class RemoveAclVolumeHandler extends Handler {
6868
*/
6969
@Override
7070
public Void call() throws Exception {
71-
Objects.requireNonNull(acl, "New acl to be added not specified.");
71+
Objects.requireNonNull(acl, "ACL to be removed not specified.");
7272
OzoneAddress address = new OzoneAddress(uri);
7373
address.ensureVolumeAddress();
7474
OzoneClient client = address.createClient(createOzoneConfiguration());
@@ -89,8 +89,8 @@ public Void call() throws Exception {
8989
boolean result = client.getObjectStore().removeAcl(obj,
9090
OzoneAcl.parseAcl(acl));
9191

92-
System.out.printf("%s%n", "Acl removed successfully: " +
93-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
92+
System.out.printf("%s%n", "Acl removed successfully: " + result);
93+
9494
client.close();
9595
return null;
9696
}

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/SetAclVolumeHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ public Void call() throws Exception {
9292
boolean result = client.getObjectStore().setAcl(obj,
9393
OzoneAcl.parseAcls(acls));
9494

95-
System.out.printf("%s%n", "Acl set successfully: " +
96-
JsonUtils.toJsonStringWithDefaultPrettyPrinter(result));
95+
System.out.printf("%s%n", "Acl set successfully: " + result);
96+
9797
client.close();
9898
return null;
9999
}

0 commit comments

Comments
 (0)