Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Missed Rewrite adoption fixes

Browse Source
This commit is contained in:
aboyko
2023-08-09 23:48:13 -04:00
parent a498484d51
commit 8de18fd4e3
4 changed files with 26 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/reconcile/NoRequestMappingAnnotationCodeAction.java
View File

@@ -48,9 +48,9 @@ public class NoRequestMappingAnnotationCodeAction implements RecipeCodeActionDes
String uri = getCursor().firstEnclosing(SourceFile.class).getSourcePath().toUri().toASCIIString();
FixAssistMarker fixAssistMarker = new FixAssistMarker(Tree.randomId(), getId())
.withFixes(
new FixDescriptor(ID, List.of(uri), RecipeCodeActionDescriptor.buildLabel(LABEL, RecipeScope.NODE))
.withRangeScope(a.getMarkers().findFirst(Range.class).get())
.withRecipeScope(RecipeScope.NODE),
// new FixDescriptor(ID, List.of(uri), RecipeCodeActionDescriptor.buildLabel(LABEL, RecipeScope.NODE))
// .withRangeScope(a.getMarkers().findFirst(Range.class).get())
// .withRecipeScope(RecipeScope.NODE),
new FixDescriptor(ID, List.of(uri), RecipeCodeActionDescriptor.buildLabel(LABEL, RecipeScope.FILE))
.withRecipeScope(RecipeScope.FILE),
new FixDescriptor(ID, List.of(uri), RecipeCodeActionDescriptor.buildLabel(LABEL, RecipeScope.PROJECT))

82
headless-services/spring-boot-language-server/src/test/resources/test-projects/spring-modulith-example-full/src/test/java/org/example/order/EventPublicationRegistryTests.java
View File

@@ -1,82 +0,0 @@
/*
* Copyright 2022-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.example.order;
import static org.assertj.core.api.Assertions.*;
import org.example.order.Order;
import org.example.order.OrderCompleted;
import org.example.order.OrderManagement;
import org.example.order.EventPublicationRegistryTests.FailingAsyncTransactionalEventListener;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import org.springframework.modulith.ApplicationModuleListener;
import org.springframework.modulith.events.EventPublicationRegistry;
import org.springframework.modulith.test.ApplicationModuleTest;
import org.springframework.modulith.test.Scenario;
import org.springframework.test.annotation.DirtiesContext;
/**
* A show case for how the Spring Modulith application event publication registry keeps track of incomplete publications
* for failing transactional event listeners
*
* @author Oliver Drotbohm
*/
@ApplicationModuleTest
@Import(FailingAsyncTransactionalEventListener.class)
@DirtiesContext
@RequiredArgsConstructor
class EventPublicationRegistryTests {
private final OrderManagement orders;
private final EventPublicationRegistry registry;
private final FailingAsyncTransactionalEventListener listener;
@Test
void leavesPublicationIncompleteForFailingListener(Scenario scenario) throws Exception {
var order = new Order();
scenario.stimulate(() -> orders.complete(order))
.andWaitForStateChange(() -> listener.getEx())
.andVerify(__ -> {
assertThat(registry.findIncompletePublications()).hasSize(1);
});
}
static class FailingAsyncTransactionalEventListener {
@Getter Exception ex;
@ApplicationModuleListener
void foo(OrderCompleted event) {
var exception = new IllegalStateException("¯\\_(ツ)_/¯");
try {
throw exception;
} finally {
this.ex = exception;
}
}
}
}