diff --git a/Dockerfile b/Dockerfile index 970deb1..e2ab9fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,10 @@ -FROM xenia/xenia-ng +FROM openjdk:7 MAINTAINER Jakub Marchwicki -RUN \ - apt-get update && \ - apt-get install -y openjdk-7-jdk maven && \ - rm -rf /var/lib/apt/lists/* - -ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 - RUN mkdir /xenia-api EXPOSE 8080 WORKDIR /xenia-api COPY target/xenia-api-0.0.1-SNAPSHOT.jar /xenia-api/ -CMD ["java", "-jar", "xenia-api-0.0.1-SNAPSHOT.jar"] +CMD ["sh", "-c", "java -jar xenia-api-0.0.1-SNAPSHOT.jar"] diff --git a/src/main/groovy/pl/jug/torun/xenia/MeetupConfig.groovy b/src/main/groovy/pl/jug/torun/xenia/MeetupConfig.groovy index 05db4f2..d22eca4 100644 --- a/src/main/groovy/pl/jug/torun/xenia/MeetupConfig.groovy +++ b/src/main/groovy/pl/jug/torun/xenia/MeetupConfig.groovy @@ -9,11 +9,12 @@ import pl.jug.torun.xenia.meetup.MeetupRestTemplate @ConfigurationProperties(prefix = "meetup") class MeetupConfig { + String url String key String groupUrlName @Bean public MeetupRestTemplate meetupRestTemplate() { - return new MeetupRestTemplate(key, groupUrlName) + return new MeetupRestTemplate(url, key, groupUrlName) } } diff --git a/src/main/groovy/pl/jug/torun/xenia/meetup/MeetupRestTemplate.groovy b/src/main/groovy/pl/jug/torun/xenia/meetup/MeetupRestTemplate.groovy index d53ffdb..e6df6d6 100644 --- a/src/main/groovy/pl/jug/torun/xenia/meetup/MeetupRestTemplate.groovy +++ b/src/main/groovy/pl/jug/torun/xenia/meetup/MeetupRestTemplate.groovy @@ -17,13 +17,19 @@ final class MeetupRestTemplate extends RestTemplate { private static final String BASE_URL = "https://api.meetup.com/2"; + final String baseUrl; final String meetupKey; final String meetupGroupNameUrl; public MeetupRestTemplate(final String meetupKey, final String meetupGroupNameUrl, final ClientHttpRequestFactory requestFactory = null) { + this(BASE_URL, meetupKey, meetupGroupNameUrl, requestFactory); + } + + public MeetupRestTemplate(String baseUrl, final String meetupKey, final String meetupGroupNameUrl, final ClientHttpRequestFactory requestFactory = null) { log.debug 'Initializing REST template for Meetup group name = {}', meetupGroupNameUrl + this.baseUrl = baseUrl this.meetupKey = meetupKey this.meetupGroupNameUrl = meetupGroupNameUrl @@ -40,7 +46,7 @@ final class MeetupRestTemplate extends RestTemplate { URI meetupUri = null; try { meetupUri = new URI(String.format("%s%s%skey=%s&group_urlname=%s", - BASE_URL, + baseUrl, uri.toString(), uri.toString().contains("?") ? "&" : "?", meetupKey,