Skip to content

Commit

Permalink
refactor(core): remove name Class from Type- and PayloadExtractor
Browse files Browse the repository at this point in the history
  • Loading branch information
@timonback
timonback committed Oct 11, 2024
1 parent 9cd9410 commit b43a1db
Show file tree
Hide file tree
Showing 18 changed files with 83 additions and 83 deletions.
6 changes: 3 additions & 3 deletions ...github/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package io.github.springwolf.core.asyncapi.scanners.common.payload;

import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
import lombok.RequiredArgsConstructor;

Expand All @@ -12,13 +12,13 @@

@RequiredArgsConstructor
public class PayloadAsyncOperationService {
private final PayloadClassExtractor payloadClassExtractor;
private final PayloadExtractor payloadExtractor;
private final PayloadService payloadService;

public PayloadSchemaObject extractSchema(AsyncOperation operationData, Method method) {
Optional<Type> payloadType = operationData.payloadType() != Object.class
? Optional.of(operationData.payloadType())
: payloadClassExtractor.extractFrom(method);
: payloadExtractor.extractFrom(method);

String contentType = operationData.message().contentType();

Expand Down
6 changes: 3 additions & 3 deletions ...ithub/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterService.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: Apache-2.0
package io.github.springwolf.core.asyncapi.scanners.common.payload;

import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
import lombok.RequiredArgsConstructor;

Expand All @@ -11,11 +11,11 @@

@RequiredArgsConstructor
public class PayloadMethodParameterService implements PayloadMethodService {
private final PayloadClassExtractor payloadClassExtractor;
private final PayloadExtractor payloadExtractor;
private final PayloadService payloadService;

public PayloadSchemaObject extractSchema(Method method) {
Optional<Type> payloadType = payloadClassExtractor.extractFrom(method);
Optional<Type> payloadType = payloadExtractor.extractFrom(method);

return payloadType.map(payloadService::buildSchema).orElseGet(payloadService::useUnusedPayload);
}
Expand Down
4 changes: 2 additions & 2 deletions ...yload/internal/PayloadClassExtractor.java → ...on/payload/internal/PayloadExtractor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import java.util.Optional;

@Slf4j
public class PayloadClassExtractor {
public class PayloadExtractor {
private final Map<String, Integer> extractableClassToArgumentIndex;

public PayloadClassExtractor(SpringwolfConfigProperties properties) {
public PayloadExtractor(SpringwolfConfigProperties properties) {
if (properties.getPayload() != null) {
extractableClassToArgumentIndex = properties.getPayload().getExtractableClasses();
} else {
Expand Down
4 changes: 2 additions & 2 deletions ...ayload/internal/TypeToClassConverter.java → ...ommon/payload/internal/TypeExtractor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
import java.util.Map;

@Slf4j
public class TypeToClassConverter {
public class TypeExtractor {

private final Map<String, Integer> extractableClassToArgumentIndex;

public TypeToClassConverter(SpringwolfConfigProperties properties) {
public TypeExtractor(SpringwolfConfigProperties properties) {
if (properties.getPayload() != null) {
extractableClassToArgumentIndex = properties.getPayload().getExtractableClasses();
} else {
Expand Down
20 changes: 10 additions & 10 deletions ...re/src/main/java/io/github/springwolf/core/configuration/SpringwolfAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodParameterService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodReturnService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.utils.StringValueResolverProxy;
import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
Expand Down Expand Up @@ -186,14 +186,14 @@ public SchemaWalker yamlSchemaWalker(

@Bean
@ConditionalOnMissingBean
public TypeToClassConverter typeToClassConverter(SpringwolfConfigProperties springwolfConfigProperties) {
return new TypeToClassConverter(springwolfConfigProperties);
public TypeExtractor typeToClassConverter(SpringwolfConfigProperties springwolfConfigProperties) {
return new TypeExtractor(springwolfConfigProperties);
}

@Bean
@ConditionalOnMissingBean
public PayloadClassExtractor payloadClassExtractor(SpringwolfConfigProperties springwolfConfigProperties) {
return new PayloadClassExtractor(springwolfConfigProperties);
public PayloadExtractor payloadClassExtractor(SpringwolfConfigProperties springwolfConfigProperties) {
return new PayloadExtractor(springwolfConfigProperties);
}

@Bean
Expand All @@ -212,15 +212,15 @@ public PayloadService payloadService(
@Bean
@ConditionalOnMissingBean
public PayloadAsyncOperationService payloadAsyncOperationService(
PayloadClassExtractor payloadClassExtractor, PayloadService payloadService) {
return new PayloadAsyncOperationService(payloadClassExtractor, payloadService);
PayloadExtractor payloadExtractor, PayloadService payloadService) {
return new PayloadAsyncOperationService(payloadExtractor, payloadService);
}

@Bean
@ConditionalOnMissingBean
public PayloadMethodParameterService payloadMethodParameterService(
PayloadClassExtractor payloadClassExtractor, PayloadService payloadService) {
return new PayloadMethodParameterService(payloadClassExtractor, payloadService);
PayloadExtractor payloadExtractor, PayloadService payloadService) {
return new PayloadMethodParameterService(payloadExtractor, payloadService);
}

@Bean
Expand Down
8 changes: 4 additions & 4 deletions ...anners/channels/annotations/SpringAnnotationClassLevelChannelsScannerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodParameterService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
Expand Down Expand Up @@ -64,9 +64,9 @@
PayloadMethodParameterService.class,
PayloadAsyncOperationService.class,
PayloadService.class,
PayloadClassExtractor.class,
PayloadExtractor.class,
HeaderClassExtractor.class,
TypeToClassConverter.class,
TypeExtractor.class,
DefaultSchemaWalker.class,
SchemaWalkerProvider.class,
ExampleJsonValueGenerator.class,
Expand Down
8 changes: 4 additions & 4 deletions ...nners/channels/annotations/SpringAnnotationMethodLevelChannelsScannerIntegrationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadAsyncOperationService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodParameterService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeToClassConverter;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.TypeExtractor;
import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaService;
import io.github.springwolf.core.asyncapi.schemas.SwaggerSchemaUtil;
import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
Expand Down Expand Up @@ -66,9 +66,9 @@
PayloadMethodParameterService.class,
PayloadAsyncOperationService.class,
PayloadService.class,
PayloadClassExtractor.class,
PayloadExtractor.class,
HeaderClassExtractor.class,
TypeToClassConverter.class,
TypeExtractor.class,
DefaultSchemaWalker.class,
SchemaWalkerProvider.class,
ExampleJsonValueGenerator.class,
Expand Down
10 changes: 5 additions & 5 deletions ...ub/springwolf/core/asyncapi/scanners/common/payload/PayloadAsyncOperationServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import io.github.springwolf.core.asyncapi.annotations.AsyncMessage;
import io.github.springwolf.core.asyncapi.annotations.AsyncOperation;
import io.github.springwolf.core.asyncapi.components.ComponentsService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -25,7 +25,7 @@
import static org.mockito.Mockito.when;

class PayloadAsyncOperationServiceTest {
private PayloadClassExtractor payloadClassExtractor = mock(PayloadClassExtractor.class);
private PayloadExtractor payloadExtractor = mock(PayloadExtractor.class);
private ComponentsService componentsService = mock(ComponentsService.class);
private SpringwolfConfigProperties properties = mock(SpringwolfConfigProperties.class);

Expand All @@ -35,7 +35,7 @@ class PayloadAsyncOperationServiceTest {
@BeforeEach
void setUp() {
payloadService = new PayloadService(componentsService, properties);
payloadAsyncOperationService = new PayloadAsyncOperationService(payloadClassExtractor, payloadService);
payloadAsyncOperationService = new PayloadAsyncOperationService(payloadExtractor, payloadService);
}

@Test
Expand Down Expand Up @@ -73,7 +73,7 @@ public void shouldExtractPayloadFromMethodWithAnnotation() {
when(asyncOperation.message()).thenReturn(asyncMessage);

Method method = mock(Method.class);
when(payloadClassExtractor.extractFrom(method)).thenReturn(Optional.of(String.class));
when(payloadExtractor.extractFrom(method)).thenReturn(Optional.of(String.class));

String schemaName = "my-schema-name";
when(componentsService.getSchemaName(String.class)).thenReturn(schemaName);
Expand All @@ -100,7 +100,7 @@ public void shouldReturnPayloadNotUsed() {
when(asyncOperation.message()).thenReturn(asyncMessage);

Method method = mock(Method.class);
when(payloadClassExtractor.extractFrom(method)).thenReturn(Optional.empty());
when(payloadExtractor.extractFrom(method)).thenReturn(Optional.empty());

// when
var result = payloadAsyncOperationService.extractSchema(asyncOperation, method);
Expand Down
8 changes: 4 additions & 4 deletions ...b/springwolf/core/asyncapi/scanners/common/payload/PayloadMethodParameterServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import io.github.springwolf.asyncapi.v3.model.components.ComponentSchema;
import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject;
import io.github.springwolf.core.asyncapi.components.ComponentsService;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadClassExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadExtractor;
import io.github.springwolf.core.asyncapi.scanners.common.payload.internal.PayloadService;
import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -20,7 +20,7 @@
import static org.mockito.Mockito.when;

class PayloadMethodParameterServiceTest {
private PayloadClassExtractor payloadClassExtractor = mock(PayloadClassExtractor.class);
private PayloadExtractor payloadExtractor = mock(PayloadExtractor.class);
private ComponentsService componentsService = mock(ComponentsService.class);
private SpringwolfConfigProperties.ConfigDocket docket = mock(SpringwolfConfigProperties.ConfigDocket.class);
private SpringwolfConfigProperties properties = mock(SpringwolfConfigProperties.class);
Expand All @@ -31,7 +31,7 @@ class PayloadMethodParameterServiceTest {
@BeforeEach
void setUp() {
payloadService = new PayloadService(componentsService, properties);
payloadMethodParameterService = new PayloadMethodParameterService(payloadClassExtractor, payloadService);
payloadMethodParameterService = new PayloadMethodParameterService(payloadExtractor, payloadService);
}

@Test
Expand All @@ -41,7 +41,7 @@ public void shouldExtractPayloadFromMethod() {
when(docket.getDefaultContentType()).thenReturn("application/json");

Method method = mock(Method.class);
when(payloadClassExtractor.extractFrom(method)).thenReturn(Optional.of(String.class));
when(payloadExtractor.extractFrom(method)).thenReturn(Optional.of(String.class));

String schemaName = "my-schema-name";
when(componentsService.getSchemaName(String.class)).thenReturn(schemaName);
Expand Down
4 changes: 2 additions & 2 deletions ...d/internal/PayloadClassExtractorTest.java → ...ayload/internal/PayloadExtractorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;

class PayloadClassExtractorTest {
class PayloadExtractorTest {

private final PayloadClassExtractor extractor = new PayloadClassExtractor(new SpringwolfConfigProperties());
private final PayloadExtractor extractor = new PayloadExtractor(new SpringwolfConfigProperties());

@Test
void getPayloadType() throws NoSuchMethodException {
Expand Down
Loading

0 comments on commit b43a1db

Please sign in to comment.