Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Xtend error #576

Merged
merged 2 commits into from
Dec 13, 2022
Merged

Fix Xtend error #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21f2fb5
add JUnit to classpath
Dec 12, 2022
3e7a779
replace `collect(Collectors.toList()` with `Stream::toList`
Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...itruv.framework.vsum/src/tools/vitruv/framework/vsum/internal/ResourceRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.stream.Collectors;

import org.apache.log4j.Logger;
import org.eclipse.emf.common.util.URI;
Expand Down Expand Up @@ -102,7 +101,7 @@ public void loadExistingModels() {

private void writeModelsFile() throws IOException {
Files.write(fileSystemLayout.getModelsNamesFilesPath(),
modelsResourceSet.getResources().stream().map(Resource::getURI).map(URI::toString).collect(Collectors.toList()));
modelsResourceSet.getResources().stream().map(Resource::getURI).map(URI::toString).toList());
}

private void readModelsFile() throws IOException {
Expand Down Expand Up @@ -208,7 +207,7 @@ public Iterable<TransactionalChange> recordChanges(Runnable changeApplicator) {
isRecording = false;
fileExtensionRecorderMapping.getRecorders().forEach(ChangeRecorder::endRecording);
return fileExtensionRecorderMapping.getRecorders().stream().map(ChangeRecorder::getChange)
.filter(TransactionalChange::containsConcreteChange).collect(Collectors.toList());
.filter(TransactionalChange::containsConcreteChange).toList();
}

@Override
Expand Down
1 change: 1 addition & 0 deletions bundles/tools.vitruv.testutils.vsum/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xtend-gen"/>
Expand Down
1 change: 1 addition & 0 deletions tests/tools.vitruv.framework.views.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/mockito-core-4.2.0.jar"/>
<classpathentry kind="lib" path="lib/byte-buddy-1.12.4.jar"/>
Expand Down
1 change: 1 addition & 0 deletions tests/tools.vitruv.framework.vsum.tests/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>