Skip to content

Commit e1be6c5

Browse files
BoykoAlexBoykoAlex
committed
Remove javax.inject usages - unnecessary
1 parent 5bb1cd8 commit e1be6c5

File tree

13 files changed

+38
-61
lines changed

13 files changed

+38
-61
lines changed

‎eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,5 @@ Import-Package: org.eclipse.core.runtime,
4848
org.apache.commons.lang3,
4949
org.eclipse.osgi.util,
5050
org.osgi.framework,
51-
javax.inject,
5251
org.json
5352
Automatic-Module-Name: org.springframework.ide.eclipse.boot.wizard

‎eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/src/org/springframework/ide/eclipse/boot/wizard/guides/ChooseTypedContentSection.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212

1313
import java.util.HashMap;
1414
import java.util.function.Predicate;
15-
16-
import javax.inject.Provider;
15+
import java.util.function.Supplier;
1716

1817
import org.eclipse.jface.dialogs.Dialog;
1918
import org.eclipse.jface.layout.GridDataFactory;
@@ -223,7 +222,7 @@ private boolean matchChildren(Viewer viewer, Object e) {
223222
return false;
224223
}
225224

226-
private boolean match(Provider<String> provider) {
225+
private boolean match(Supplier<String> provider) {
227226
if (matcher == null) {
228227
return true; // Search term not set... anything is acceptable.
229228
} else {

‎eclipse-extensions/org.springframework.ide.eclipse.xterm/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.115.0",
1212
org.apache.httpcomponents.httpclient,
1313
org.apache.httpcomponents.httpcore,
1414
org.eclipse.wildwebdeveloper.embedder.node
15-
Import-Package: javax.inject
1615
Bundle-ClassPath: .
1716
Bundle-ActivationPolicy: lazy
1817
Export-Package: org.springframework.ide.eclipse.xterm,

‎eclipse-extensions/org.springframework.ide.eclipse.xterm/src/org/springframework/ide/eclipse/xterm/views/TerminalView.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import java.util.concurrent.CompletableFuture;
1414
import java.util.concurrent.ExecutionException;
1515

16-
import javax.inject.Inject;
17-
1816
import org.eclipse.core.resources.ResourcesPlugin;
1917
import org.eclipse.jface.action.Action;
2018
import org.eclipse.jface.action.IMenuManager;
@@ -33,7 +31,6 @@
3331
import org.eclipse.ui.IActionBars;
3432
import org.eclipse.ui.IMemento;
3533
import org.eclipse.ui.IViewSite;
36-
import org.eclipse.ui.IWorkbench;
3734
import org.eclipse.ui.PartInitException;
3835
import org.eclipse.ui.PlatformUI;
3936
import org.eclipse.ui.part.ViewPart;
@@ -54,8 +51,6 @@ public class TerminalView extends ViewPart {
5451
*/
5552
public static final String ID = "org.springframework.ide.eclipse.xterm.views.TerminalView";
5653

57-
@Inject IWorkbench workbench;
58-
5954
private Action refreshAction;
6055

6156
private Browser browser;

‎eclipse-language-servers/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,4 @@ Import-Package: org.eclipse.core.runtime,
4949
com.google.gson.annotations,
5050
com.google.gson.reflect,
5151
com.google.gson.stream,
52-
org.apache.commons.lang3,
53-
javax.inject
52+
org.apache.commons.lang3

‎eclipse-language-servers/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/hover/DescriptionProviders.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,23 @@
1515
import static org.springframework.ide.eclipse.editor.support.util.HtmlSnippet.text;
1616

1717
import java.io.InputStream;
18-
19-
import javax.inject.Provider;
18+
import java.util.function.Supplier;
2019

2120
import org.springframework.ide.eclipse.editor.support.EditorSupportActivator;
2221
import org.springframework.ide.eclipse.editor.support.util.HtmlSnippet;
2322
import org.springsource.ide.eclipse.commons.frameworks.core.util.IOUtil;
2423

2524
/**
26-
* Static methods and convenience constants for creating some 'description providers'.
25+
* Static methods and convenience constants for creating some 'description Suppliers'.
2726
*
2827
* @author Kris De Volder
2928
*/
3029
public class DescriptionProviders {
3130

32-
public static final Provider<HtmlSnippet> NO_DESCRIPTION = snippet(italic(text("no description")));
31+
public static final Supplier<HtmlSnippet> NO_DESCRIPTION = snippet(italic(text("no description")));
3332

34-
public static Provider<HtmlSnippet> snippet(final HtmlSnippet snippet) {
35-
return new Provider<HtmlSnippet>() {
33+
public static Supplier<HtmlSnippet> snippet(final HtmlSnippet snippet) {
34+
return new Supplier<HtmlSnippet>() {
3635
@Override
3736
public String toString() {
3837
return snippet.toString();
@@ -44,8 +43,8 @@ public HtmlSnippet get() {
4443
};
4544
}
4645

47-
public static Provider<HtmlSnippet> fromClasspath(final Class<?> klass, final String resourcePath) {
48-
return new Provider<HtmlSnippet>() {
46+
public static Supplier<HtmlSnippet> fromClasspath(final Class<?> klass, final String resourcePath) {
47+
return new Supplier<HtmlSnippet>() {
4948
@Override
5049
public String toString() {
5150
return "HtmlSnippetFromClassPth(class="+klass.getSimpleName()+", "+resourcePath+")";

‎eclipse-language-servers/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/util/ShellProviders.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010
*******************************************************************************/
1111
package org.springframework.ide.eclipse.editor.support.util;
1212

13-
import javax.inject.Provider;
13+
import java.util.function.Supplier;
1414

1515
import org.eclipse.swt.widgets.Composite;
1616
import org.eclipse.swt.widgets.Shell;
1717
import org.eclipse.ui.texteditor.ITextEditor;
1818

1919
/**
2020
* Convenience methods to addapt various types of objects representing a 'ui context'
21-
* to a Shell{@link Provider}
21+
* to a Shell{@link Supplier}
2222
*
2323
* @author Kris De Volder
2424
*/
2525
public class ShellProviders {
26-
public static Provider<Shell> from(final ITextEditor editor) {
27-
return new Provider<Shell>() {
26+
public static Supplier<Shell> from(final ITextEditor editor) {
27+
return new Supplier<Shell>() {
2828
@Override
2929
public Shell get() {
3030
return editor.getSite().getShell();
3131
}
3232
};
3333
}
3434

35-
public static Provider<Shell> from(final Composite composite) {
36-
return new Provider<Shell>() {
35+
public static Supplier<Shell> from(final Composite composite) {
36+
return new Supplier<Shell>() {
3737
@Override
3838
public Shell get() {
3939
return composite.getShell();

‎eclipse-language-servers/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/yaml/schema/YTypeFactory.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
import java.util.List;
2020
import java.util.Map;
2121
import java.util.Set;
22-
23-
import javax.inject.Provider;
22+
import java.util.function.Supplier;
2423

2524
import org.eclipse.core.runtime.Assert;
2625
import org.springframework.ide.eclipse.editor.support.hover.DescriptionProviders;
@@ -148,7 +147,7 @@ public static abstract class AbstractType implements YType {
148147
private List<YTypedProperty> propertyList = new ArrayList<>();
149148
private final List<YValueHint> hints = new ArrayList<>();
150149
private Map<String, YTypedProperty> cachedPropertyMap;
151-
private Provider<Collection<YValueHint>> hintProvider;
150+
private Supplier<Collection<YValueHint>> hintProvider;
152151
private List<Constraint> constraints = new ArrayList<>(2);
153152

154153
public boolean isSequenceable() {
@@ -171,7 +170,7 @@ public YType getDomainType() {
171170
return null;
172171
}
173172

174-
public void addHintProvider(Provider<Collection<YValueHint>> hintProvider) {
173+
public void addHintProvider(Supplier<Collection<YValueHint>> hintProvider) {
175174
this.hintProvider = hintProvider;
176175
}
177176

@@ -181,15 +180,15 @@ public YValueHint[] getHintValues() {
181180
if (providerHints == null || providerHints.isEmpty()) {
182181
return hints.toArray(new YValueHint[hints.size()]);
183182
} else {
184-
// Only merge if there are provider hints to merge
183+
// Only merge if there are Supplier hints to merge
185184
Set<YValueHint> mergedHints = new LinkedHashSet<>();
186185

187186
// Add type hints first
188187
for (YValueHint val : hints) {
189188
mergedHints.add(val);
190189
}
191190

192-
// merge the provider hints
191+
// merge the Supplier hints
193192
for (YValueHint val : providerHints) {
194193
mergedHints.add(val);
195194
}
@@ -226,7 +225,7 @@ public void addProperty(YTypedProperty p) {
226225
propertyList.add(p);
227226
}
228227

229-
public void addProperty(String name, YType type, Provider<HtmlSnippet> description) {
228+
public void addProperty(String name, YType type, Supplier<HtmlSnippet> description) {
230229
YTypedPropertyImpl prop;
231230
addProperty(prop = new YTypedPropertyImpl(name, type));
232231
prop.setDescriptionProvider(description);
@@ -413,7 +412,7 @@ public static class YTypedPropertyImpl implements YTypedProperty {
413412

414413
final private String name;
415414
final private YType type;
416-
private Provider<HtmlSnippet> descriptionProvider = DescriptionProviders.NO_DESCRIPTION;
415+
private Supplier<HtmlSnippet> descriptionProvider = DescriptionProviders.NO_DESCRIPTION;
417416
private boolean isDeprecated;
418417
private String deprecationMessage;
419418

@@ -442,7 +441,7 @@ public HtmlSnippet getDescription() {
442441
return descriptionProvider.get();
443442
}
444443

445-
public void setDescriptionProvider(Provider<HtmlSnippet> descriptionProvider) {
444+
public void setDescriptionProvider(Supplier<HtmlSnippet> descriptionProvider) {
446445
this.descriptionProvider = descriptionProvider;
447446
}
448447

‎headless-services/commons/commons-util/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@
4040
<artifactId>guava</artifactId>
4141
<version>${guava-version}</version>
4242
</dependency>
43-
<dependency>
44-
<groupId>javax.inject</groupId>
45-
<artifactId>javax.inject</artifactId>
46-
<version>1</version>
47-
</dependency>
4843
<dependency>
4944
<groupId>io.projectreactor</groupId>
5045
<artifactId>reactor-core</artifactId>

‎headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import java.util.Collection;
1414
import java.util.TreeSet;
1515
import java.util.concurrent.Callable;
16-
17-
import javax.inject.Provider;
16+
import java.util.function.Supplier;
1817

1918
import com.google.common.collect.ImmutableSet;
2019

@@ -27,7 +26,7 @@ public class EnumValueParser implements ValueParser {
2726

2827
private String typeName;
2928

30-
private Provider<PartialCollection<String>> values;
29+
private Supplier<PartialCollection<String>> values;
3130
private final boolean longRunning;
3231

3332

@@ -39,19 +38,19 @@ public EnumValueParser(String typeName, Collection<String> values) {
3938
this(typeName, false /* not long running by default */, provider(values));
4039
}
4140

42-
private static <T> Provider<PartialCollection<T>> provider(Collection<T> values) {
41+
private static <T> Supplier<PartialCollection<T>> provider(Collection<T> values) {
4342
return () -> PartialCollection.compute(() -> values);
4443
}
4544

46-
private static <T> Provider<PartialCollection<T>> provider(Callable<Collection<T>> values) {
45+
private static <T> Supplier<PartialCollection<T>> supplier(Callable<Collection<T>> values) {
4746
return () -> PartialCollection.compute(() -> values.call());
4847
}
4948

5049
public EnumValueParser(String typeName, boolean longRunning, Callable<Collection<String>> values) {
51-
this(typeName, longRunning, provider(values));
50+
this(typeName, longRunning, supplier(values));
5251
}
5352

54-
public EnumValueParser(String typeName, boolean longRunning, Provider<PartialCollection<String>> values) {
53+
public EnumValueParser(String typeName, boolean longRunning, Supplier<PartialCollection<String>> values) {
5554
this.typeName = typeName;
5655
this.values = values;
5756
this.longRunning = longRunning;

0 commit comments

Comments
 (0)