Skip to content

Commit 419c432

Browse files
zvigrinbergzvigrinberg
committed
Revert "feat: add oss-index provider/source support"
 because oss-index provider is out of forthcoming v0.9.0 preview release. This reverts commit 308f681.
1 parent b9aacfe commit 419c432

File tree

4 files changed

+0
-44
lines changed

4 files changed

+0
-44
lines changed

‎src/main/java/org/jboss/tools/intellij/exhort/ApiService.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,5 @@ private void setRequestProperties(final String manifestName) {
214214
} else {
215215
System.clearProperty("EXHORT_SNYK_TOKEN");
216216
}
217-
if (settings.ossIndexUser != null && !settings.ossIndexUser.isBlank()) {
218-
System.setProperty("EXHORT_OSS_INDEX_USER", settings.ossIndexUser);
219-
} else {
220-
System.clearProperty("EXHORT_OSS_INDEX_USER");
221-
}
222-
if (settings.ossIndexToken != null && !settings.ossIndexToken.isBlank()) {
223-
System.setProperty("EXHORT_OSS_INDEX_TOKEN", settings.ossIndexToken);
224-
} else {
225-
System.clearProperty("EXHORT_OSS_INDEX_TOKEN");
226-
}
227-
228217
}
229218
}

‎src/main/java/org/jboss/tools/intellij/settings/ApiSettingsComponent.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ public class ApiSettingsComponent {
4949
+ "<br>Specifies if comparing the resolved package versions with the versions defined in the manifest.</html>";
5050
private final static String snykTokenLabel = "<html>Red Hat Dependency Analytics: <b>Exhort Snyk Token</b>"
5151
+ "<br>Red Hat Dependency Analytics sever authentication token for Snyk.</html>";
52-
private final static String ossIndexUserLabel = "<html>Red Hat Dependency Analytics: <b>Exhort Oss Index User</b>"
53-
+ "<br>Red Hat Dependency Analytics sever User for Oss Index.</html>";
54-
private final static String ossIndexTokenLabel = "<html>Red Hat Dependency Analytics: <b>Exhort Oss Index Token</b>"
55-
+ "<br>Red Hat Dependency Analytics sever authentication token for Oss Index.</html>";
5652

5753
private final JPanel mainPanel;
5854

@@ -70,9 +66,6 @@ public class ApiSettingsComponent {
7066
private final JCheckBox pythonMatchManifestVersionsCheck;
7167
private final JBTextField snykTokenText;
7268

73-
private final JBTextField ossIndexUserText;
74-
private final JBTextField ossIndexTokenText;
75-
7669
public ApiSettingsComponent() {
7770
mvnPathText = new TextFieldWithBrowseButton();
7871
mvnPathText.addBrowseFolderListener(
@@ -148,8 +141,6 @@ public ApiSettingsComponent() {
148141
pythonMatchManifestVersionsCheck = new JCheckBox("Strictly match package version");
149142

150143
snykTokenText = new JBTextField();
151-
ossIndexUserText = new JBTextField();
152-
ossIndexTokenText = new JBTextField();
153144

154145
mainPanel = FormBuilder.createFormBuilder()
155146
.addLabeledComponent(new JBLabel(mvnPathLabel), mvnPathText, 1, true)
@@ -182,10 +173,6 @@ public ApiSettingsComponent() {
182173
.addVerticalGap(10)
183174
.addLabeledComponent(new JBLabel(snykTokenLabel), snykTokenText, 1, true)
184175
.addComponentFillVertically(new JPanel(), 0)
185-
.addVerticalGap(10)
186-
.addLabeledComponent(new JBLabel(ossIndexUserLabel), ossIndexUserText, 1, true)
187-
.addVerticalGap(10)
188-
.addLabeledComponent(new JBLabel(ossIndexTokenLabel), ossIndexTokenText, 1, true)
189176
.getPanel();
190177
}
191178

@@ -305,18 +292,7 @@ public String getSnykTokenText() {
305292
return snykTokenText.getText();
306293
}
307294

308-
public String getOssIndexTokenText() {
309-
return ossIndexTokenText.getText();
310-
}
311-
public String getOssIndexUserText() {
312-
return ossIndexUserText.getText();
313-
}
314-
315295
public void setSnykTokenText(@NotNull String text) {
316296
snykTokenText.setText(text);
317297
}
318-
public void setOssIndexTokenText(@NotNull String text) {
319-
ossIndexTokenText.setText(text);
320-
}
321-
322298
}

‎src/main/java/org/jboss/tools/intellij/settings/ApiSettingsConfigurable.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ public boolean isModified() {
5252
modified |= settingsComponent.getPythonInstallBestEffortsCheck() != settings.pythonInstallBestEfforts;
5353
modified |= settingsComponent.getPythonMatchManifestVersionsCheck() != settings.pythonMatchManifestVersions;
5454
modified |= !settingsComponent.getSnykTokenText().equals(settings.snykToken);
55-
modified |= !settingsComponent.getOssIndexTokenText().equals(settings.ossIndexToken);
56-
modified |= !settingsComponent.getOssIndexUserText().equals(settings.ossIndexUser);
57-
5855
return modified;
5956
}
6057

@@ -74,8 +71,6 @@ public void apply() {
7471
settings.pythonInstallBestEfforts = settingsComponent.getPythonInstallBestEffortsCheck();
7572
settings.pythonMatchManifestVersions = settingsComponent.getPythonMatchManifestVersionsCheck();
7673
settings.snykToken = settingsComponent.getSnykTokenText();
77-
settings.ossIndexToken = settingsComponent.getOssIndexTokenText();
78-
settings.ossIndexUser = settingsComponent.getOssIndexUserText();
7974
}
8075

8176
@Override
@@ -94,7 +89,6 @@ public void reset() {
9489
settingsComponent.setPythonInstallBestEffortsCheck(settings.pythonInstallBestEfforts);
9590
settingsComponent.setPythonMatchManifestVersionsCheck(settings.pythonMatchManifestVersions);
9691
settingsComponent.setSnykTokenText(settings.snykToken != null ? settings.snykToken : "");
97-
settingsComponent.setOssIndexTokenText(settings.ossIndexToken != null ? settings.ossIndexToken : "");
9892
}
9993

10094
@Override

‎src/main/java/org/jboss/tools/intellij/settings/ApiSettingsState.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ public static ApiSettingsState getInstance() {
5353

5454
public String snykToken;
5555

56-
public String ossIndexUser;
57-
public String ossIndexToken;
58-
5956
@Override
6057
public @Nullable ApiSettingsState getState() {
6158
return this;

0 commit comments

Comments
 (0)