Skip to content

Commit c74f70b

Browse files
committed
refactor(search): 소나큐브 반영
- 불필요한 import 제거 - null 처리 추가
1 parent db60898 commit c74f70b

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/main/java/com/somemore/domains/community/controller/CommunityBoardQueryApiController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.springframework.web.bind.annotation.GetMapping;
1313
import org.springframework.web.bind.annotation.PathVariable;
1414
import org.springframework.web.bind.annotation.RequestMapping;
15-
import org.springframework.web.bind.annotation.RequestParam;
1615
import org.springframework.web.bind.annotation.RestController;
1716

1817
import java.util.UUID;

src/main/java/com/somemore/domains/search/annotation/OnElasticSearchEnabledCondition.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@
33
import org.springframework.context.annotation.Condition;
44
import org.springframework.context.annotation.ConditionContext;
55
import org.springframework.core.type.AnnotatedTypeMetadata;
6-
import org.springframework.util.MultiValueMap;
6+
7+
import java.util.Objects;
78

89
public class OnElasticSearchEnabledCondition implements Condition {
910

1011
@Override
1112
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
12-
MultiValueMap<String, Object> attrs = metadata.getAllAnnotationAttributes(
13-
ConditionalOnElasticSearchEnabled.class.getName());
14-
String propertyName = (String) attrs.getFirst("propertyName");
15-
String havingValue = (String) attrs.getFirst("havingValue");
13+
String propertyName = (String) Objects.requireNonNull(metadata.getAnnotationAttributes(
14+
ConditionalOnElasticSearchEnabled.class.getName())).get("propertyName");
15+
String havingValue = (String) Objects.requireNonNull(metadata.getAnnotationAttributes(
16+
ConditionalOnElasticSearchEnabled.class.getName())).get("havingValue");
1617

1718
String propertyValue = context.getEnvironment().getProperty(propertyName);
18-
return havingValue.equals(propertyValue);
19+
20+
return havingValue.equals(propertyValue != null ? propertyValue : "");
1921
}
20-
}
22+
}

0 commit comments

Comments
 (0)