Skip to content

Commit

Permalink
fix: storage spotbugs (#10392)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChenTanyi
ChenTanyi authored Apr 21, 2020
1 parent 66f6da8 commit 62b6a62
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 21 deletions.
3 changes: 1 addition & 2 deletions ...age/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ public Mono<BlobContainer> updateResourceAsync() {

@Override
protected Mono<BlobContainerInner> getInnerAsync() {
BlobContainersInner client = this.manager().inner().blobContainers();
return null; // NOP getInnerAsync implementation as get is not supported
return this.manager().inner().blobContainers().getAsync(resourceGroupName, accountName, containerName);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...ge/mgmt/src/main/java/com/azure/management/storage/implementation/BlobContainersImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private ImmutabilityPolicyImpl wrapImmutabilityPolicyModel(ImmutabilityPolicyInn
return new ImmutabilityPolicyImpl(inner, manager());
}

private Mono<ImmutabilityPolicyInner> getImmutabilityPolicyInnerUsingBlobContainersInnerAsync(String id) {
public Mono<ImmutabilityPolicyInner> getImmutabilityPolicyInnerUsingBlobContainersInnerAsync(String id) {
String resourceGroupName = IdParsingUtils.getValueFromIdByName(id, "resourceGroups");
String accountName = IdParsingUtils.getValueFromIdByName(id, "storageAccounts");
String containerName = IdParsingUtils.getValueFromIdByName(id, "containers");
Expand All @@ -73,7 +73,7 @@ public Mono<BlobContainer> getAsync(String resourceGroupName, String accountName
BlobContainersInner client = this.inner();
return client
.getAsync(resourceGroupName, accountName, containerName)
.map(inner -> new BlobContainerImpl(inner, manager()));
.map(this::wrapBlobContainerModel);
}

@Override
Expand Down Expand Up @@ -106,7 +106,7 @@ public Mono<ImmutabilityPolicy> getImmutabilityPolicyAsync(
BlobContainersInner client = this.inner();
return client
.getImmutabilityPolicyAsync(resourceGroupName, accountName, containerName)
.map(inner -> wrapImmutabilityPolicyModel(inner));
.map(this::wrapImmutabilityPolicyModel);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...torage/mgmt/src/main/java/com/azure/management/storage/implementation/IdParsingUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static String getValueFromIdByName(String id, String name) {
Iterator<String> itr = iterable.iterator();
while (itr.hasNext()) {
String part = itr.next();
if (part != null && part.trim() != "") {
if (part != null && !part.trim().equals("")) {
if (part.equalsIgnoreCase(name)) {
if (itr.hasNext()) {
return itr.next();
Expand Down Expand Up @@ -52,7 +52,7 @@ public static String getValueFromIdByPosition(String id, int pos) {
int index = 0;
while (itr.hasNext()) {
String part = itr.next();
if (part != null && part.trim() != "") {
if (part != null && !part.trim().equals("")) {
if (index == pos) {
if (itr.hasNext()) {
return itr.next();
Expand Down
5 changes: 1 addition & 4 deletions ...torage/mgmt/src/main/java/com/azure/management/storage/implementation/PolicyRuleImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public PolicyRuleImpl withBlobTypeToFilterFor(BlobTypes blobType) {
if (blobTypesToFilterFor == null) {
blobTypesToFilterFor = new ArrayList<>();
}
if (blobTypesToFilterFor.contains(blobType)) {
if (blobTypesToFilterFor.contains(blobType.toString())) {
return this;
}
blobTypesToFilterFor.add(blobType.toString());
Expand Down Expand Up @@ -262,9 +262,6 @@ public PolicyRuleImpl withDeleteActionOnBaseBlob(float daysAfterBaseBlobModifica
@Override
public PolicyRuleImpl withDeleteActionOnSnapShot(float daysAfterSnapShotCreationUntilDeleting) {
ManagementPolicySnapShot currentSnapShot = new ManagementPolicySnapShot();
if (currentSnapShot == null) {
currentSnapShot = new ManagementPolicySnapShot();
}
currentSnapShot
.withDelete(
new DateAfterCreation().withDaysAfterCreationGreaterThan(daysAfterSnapShotCreationUntilDeleting));
Expand Down
19 changes: 10 additions & 9 deletions .../src/main/java/com/azure/management/storage/implementation/StorageNetworkRulesHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.TreeSet;

/** Helper to operate on storage account NetworkRule set {@link StorageAccountInner#getNetworkRuleSet} property. */
/** Helper to operate on storage account NetworkRule set {@link StorageAccountInner#networkRuleSet()} property. */
final class StorageNetworkRulesHelper {
private static final String BYPASS_NONE_STR = Bypass.NONE.toString().toLowerCase();
private static final String BYPASS_NONE_STR = Bypass.NONE.toString().toLowerCase(Locale.ROOT);
private final boolean isInCreateMode;
private final StorageAccountInner inner;
private final StorageAccountCreateParameters createParameters;
Expand Down Expand Up @@ -129,7 +130,7 @@ static boolean canReadLogEntriesFromAnyNetwork(final StorageAccountInner inner)
&& inner.networkRuleSet().defaultAction() != null
&& inner.networkRuleSet().defaultAction().equals(DefaultAction.DENY)) {
Set<String> bypassSet = parseBypass(inner.networkRuleSet().bypass());
return bypassSet.contains(Bypass.LOGGING.toString().toLowerCase());
return bypassSet.contains(Bypass.LOGGING.toString().toLowerCase(Locale.ROOT));
}
return true;
}
Expand All @@ -145,7 +146,7 @@ static boolean canReadMetricsFromAnyNetwork(final StorageAccountInner inner) {
&& inner.networkRuleSet().defaultAction() != null
&& inner.networkRuleSet().defaultAction().equals(DefaultAction.DENY)) {
Set<String> bypassSet = parseBypass(inner.networkRuleSet().bypass());
return bypassSet.contains(Bypass.METRICS.toString().toLowerCase());
return bypassSet.contains(Bypass.METRICS.toString().toLowerCase(Locale.ROOT));
}
return true;
}
Expand All @@ -161,7 +162,7 @@ static boolean canAccessFromAzureServices(final StorageAccountInner inner) {
&& inner.networkRuleSet().defaultAction() != null
&& inner.networkRuleSet().defaultAction().equals(DefaultAction.DENY)) {
Set<String> bypassSet = parseBypass(inner.networkRuleSet().bypass());
return bypassSet.contains(Bypass.AZURE_SERVICES.toString().toLowerCase());
return bypassSet.contains(Bypass.AZURE_SERVICES.toString().toLowerCase(Locale.ROOT));
}
return true;
}
Expand Down Expand Up @@ -350,7 +351,7 @@ StorageNetworkRulesHelper withoutAccessFromAzureServices() {
*/
private void addToBypassList(Bypass bypass) {
NetworkRuleSet networkRuleSet = this.getNetworkRuleSetConfig(true);
final String bypassStr = bypass.toString().toLowerCase();
final String bypassStr = bypass.toString().toLowerCase(Locale.ROOT);
Set<String> bypassSet = parseBypass(networkRuleSet.bypass());
if (bypassStr.equalsIgnoreCase(BYPASS_NONE_STR)) {
bypassSet.clear();
Expand All @@ -375,7 +376,7 @@ private void removeFromBypassList(Bypass bypass) {
return;
} else {
Set<String> bypassSet = parseBypass(networkRuleSet.bypass());
String bypassStr = bypass.toString().toLowerCase();
String bypassStr = bypass.toString().toLowerCase(Locale.ROOT);
if (bypassSet.contains(bypassStr)) {
bypassSet.remove(bypassStr);
}
Expand All @@ -387,7 +388,7 @@ private void removeFromBypassList(Bypass bypass) {
}

/**
* The {@link NetworkRuleSet#getDefaultAction()} is a required property.
* The {@link NetworkRuleSet#defaultAction()} is a required property.
*
* <p>During create mode, this method sets the default action to DENY if it is already not set by the user and user
* specifies at least one network rule or choose at least one exception.
Expand Down Expand Up @@ -590,7 +591,7 @@ private static Set<String> parseBypass(Bypass bypass) {
Set<String> bypassSet = new TreeSet<>();
List<String> bypassStrList = Arrays.asList(bypass.toString().split(","));
for (String s : bypassStrList) {
s = s.trim().toLowerCase();
s = s.trim().toLowerCase(Locale.ROOT);
if (!s.isEmpty() && !bypassSet.contains(s)) {
bypassSet.add(s);
}
Expand Down
2 changes: 1 addition & 1 deletion ...orage/mgmt/src/main/java/com/azure/management/storage/implementation/StorageSkusImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ public PagedFlux<StorageSku> listAsync() {

@Override
public SkusInner inner() {
return this.inner();
return manager.inner().skus();
}
}

0 comments on commit 62b6a62

Please sign in to comment.