Skip to content

Commit 2b37cb4

Browse files
authored
Merge pull request #173 from anderslindho/fix_swagger
Fix swagger UI and do not require SSL
2 parents 2194e5f + c7ecb1e commit 2b37cb4

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,11 @@
199199
<artifactId>micrometer-registry-prometheus</artifactId>
200200
<scope>runtime</scope>
201201
</dependency>
202+
<dependency>
203+
<groupId>io.swagger.core.v3</groupId>
204+
<artifactId>swagger-core</artifactId>
205+
<version>2.2.20</version>
206+
</dependency>
202207
</dependencies>
203208
<build>
204209
<!-- read properties from the pom file and add them to the application.properties -->

src/main/java/org/phoebus/channelfinder/Application.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.logging.Level;
2121
import java.util.logging.Logger;
2222

23+
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
24+
import io.swagger.v3.oas.annotations.servers.Server;
2325
import org.phoebus.channelfinder.example.PopulateService;
2426
import org.phoebus.channelfinder.processors.ChannelProcessor;
2527
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +40,11 @@
3840
@EnableAutoConfiguration
3941
@ComponentScan(basePackages="org.phoebus.channelfinder")
4042
@EnableScheduling
43+
@OpenAPIDefinition(
44+
servers = {
45+
@Server(url = "/")
46+
}
47+
)
4148
@SpringBootApplication
4249
public class Application implements ApplicationRunner {
4350

src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ server.ssl.key-store=classpath:keystore/newcf.p12
1111
server.ssl.key-store-password=password
1212
server.ssl.key-alias=cf
1313

14-
security.require-ssl=true
14+
security.require-ssl=false
1515

1616
server.compression.enabled=true
1717
# opt in to content types

0 commit comments

Comments
 (0)