Skip to content

Commit

Permalink
Removing unused code. Adding docker file
Browse files Browse the repository at this point in the history
  • Loading branch information
jenga201 committed Jun 10, 2019
1 parent b3b66ae commit f2d9403
Show file tree
Hide file tree
Showing 19 changed files with 12 additions and 1,953 deletions.
9 changes: 9 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM maven:3.5-jdk-8 AS build
COPY src /usr/src/app/src
COPY pom.xml /usr/src/app
RUN mvn -f /usr/src/app/pom.xml clean package

FROM gcr.io/distroless/java
COPY --from=build /usr/src/app/target/nibl-api.jar /usr/app/nibl-api.jar

ENTRYPOINT ["java","-jar","/usr/app/nibl-api.jar"]
62 changes: 0 additions & 62 deletions src/main/java/com/nibl/api/ApplicationConfiguration.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
package com.nibl.api;

import java.util.ArrayList;
import java.util.List;

import org.apache.catalina.connector.Connector;
import org.apache.commons.lang3.StringUtils;
import org.apache.coyote.http11.Http11NioProtocol;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
Expand All @@ -22,59 +13,6 @@ public class ApplicationConfiguration {

private static Logger log = LoggerFactory.getLogger(ApplicationConfiguration.class);

public class EmbeddedTomcatConfiguration {

@Value("${server.additionalPorts}")
private String additionalPorts;

@Value("${server.ssl.key-store}")
private String absoluteKeyStore;

@Value("${server.ssl.key-store-password}")
private String keystorePass;

@Value("${server.ssl.keyStoreType}")
private String keystoreType;

@Value("${server.ssl.keyAlias}")
private String keyAlias;

@Bean
public EmbeddedServletContainerFactory servletContainer() {
TomcatEmbeddedServletContainerFactory tomcat = new TomcatEmbeddedServletContainerFactory();
Connector[] additionalConnectors = this.additionalConnector();
if (additionalConnectors != null && additionalConnectors.length > 0) {
tomcat.addAdditionalTomcatConnectors(additionalConnectors);
}
return tomcat;
}

private Connector[] additionalConnector() {
if (StringUtils.isBlank(this.additionalPorts)) {
return null;
}
String[] ports = this.additionalPorts.split(",");
List<Connector> result = new ArrayList<>();
for (String port : ports) {
Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
Http11NioProtocol protocol = (Http11NioProtocol) connector.getProtocolHandler();

connector.setScheme("https");
connector.setPort(Integer.valueOf(port));
connector.setSecure(true);

protocol.setSSLEnabled(true);
protocol.setKeystoreFile(absoluteKeyStore);
protocol.setKeystorePass(keystorePass);
protocol.setKeystoreType(keystoreType);
protocol.setKeyAlias(keyAlias);

result.add(connector);
}
return result.toArray(new Connector[] {});
}
}

@Bean
public WebMvcConfigurer corsConfigurer() {
return new WebMvcConfigurerAdapter() {
Expand Down

This file was deleted.

75 changes: 0 additions & 75 deletions src/main/java/com/nibl/api/anilist/domain/AccessToken.java

This file was deleted.

44 changes: 0 additions & 44 deletions src/main/java/com/nibl/api/anilist/domain/Airing.java

This file was deleted.

108 changes: 0 additions & 108 deletions src/main/java/com/nibl/api/anilist/domain/Episode.java

This file was deleted.

Loading

0 comments on commit f2d9403

Please sign in to comment.