Skip to content

Chore/introduce property for meetup api #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kapware wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Chore/introduce property for meetup api #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cfcea1
Merge pull request #21 from TorunJUG/develop
wololock Oct 28, 2016
6448c26
Configurable meetup base url
kapware Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
FROM xenia/xenia-ng
FROM openjdk:7

MAINTAINER Jakub Marchwicki <kuba.marchwicki@gmail.com>

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"]
3 changes: 2 additions & 1 deletion src/main/groovy/pl/jug/torun/xenia/MeetupConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
8 changes: 7 additions & 1 deletion src/main/groovy/pl/jug/torun/xenia/meetup/MeetupRestTemplate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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,
Expand Down