Skip to content

Commit a35aa9c

Browse files
more lint fixes
1 parent 521575a commit a35aa9c

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

src/com/magento/idea/magento2plugin/magento/packages/ComposerPackageModel.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.magento.packages;
67

7-
import org.jetbrains.annotations.Nullable;
8+
import com.intellij.json.psi.JsonValue;
89
import java.util.Map;
10+
import org.jetbrains.annotations.NotNull;
11+
import org.jetbrains.annotations.Nullable;
912

1013
public interface ComposerPackageModel {
1114
@Nullable
@@ -25,4 +28,7 @@ public interface ComposerPackageModel {
2528

2629
@Nullable
2730
Map<String, String> getAutoloadPsr4();
31+
32+
<T extends JsonValue> T getPropertyValueOfType(String propertyName,
33+
@NotNull Class<T> thisClass);
2834
}

src/com/magento/idea/magento2plugin/magento/packages/ComposerPackageModelImpl.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,21 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5-
package com.magento.idea.magento2plugin.magento.packages;
65

7-
import com.intellij.json.psi.*;
8-
import org.apache.commons.lang3.StringUtils;
9-
import org.jetbrains.annotations.NotNull;
10-
import org.jetbrains.annotations.Nullable;
6+
package com.magento.idea.magento2plugin.magento.packages;
117

8+
import com.intellij.json.psi.JsonArray;
9+
import com.intellij.json.psi.JsonObject;
10+
import com.intellij.json.psi.JsonProperty;
11+
import com.intellij.json.psi.JsonStringLiteral;
12+
import com.intellij.json.psi.JsonValue;
1213
import java.util.ArrayList;
1314
import java.util.HashMap;
1415
import java.util.List;
1516
import java.util.Map;
17+
import org.apache.commons.lang3.StringUtils;
18+
import org.jetbrains.annotations.NotNull;
19+
import org.jetbrains.annotations.Nullable;
1620

1721
public class ComposerPackageModelImpl implements ComposerPackageModel {
1822
private final JsonObject sourceComposerJson;
@@ -104,15 +108,16 @@ public Map<String, String> getAutoloadPsr4() {
104108
}
105109

106110
@Nullable
111+
@Override
107112
public <T extends JsonValue> T getPropertyValueOfType(String propertyName,
108-
@NotNull Class<T> aClass) {
113+
@NotNull Class<T> thisClass) {
109114
JsonProperty property = sourceComposerJson.findProperty(propertyName);
110115
if (property == null) {
111116
return null;
112117
}
113118
JsonValue value = property.getValue();
114-
if (aClass.isInstance(value)) {
115-
return aClass.cast(value);
119+
if (thisClass.isInstance(value)) {
120+
return thisClass.cast(value);
116121
}
117122

118123
return null;

0 commit comments

Comments
 (0)