Merge pull request #20 from nsharpe/ISMDS-349

Expose an endpoint by source using PathModifier

Author: ledor473

.gitignore

@@ -103,28 +103,6 @@ gradle-app.setting
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-
-# Sensitive or high-churn files:
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-
-# Gradle:
-.idea/gradle.xml
-.idea/libraries
-
-# Mongo Explorer plugin:
-.idea/mongoSettings.xml
-
 ## File-based project format:
 *.iws
 
@@ -147,3 +125,10 @@ fabric.properties
 
 ### Intellij Patch ###
 *.iml
+
+### Ignore all intellij project files
+.idea/
+
+# Enabling compile time annotations may add this folder in intelij and thus should be ignored
+classes/
+

build.gradle

@@ -12,6 +12,7 @@ buildscript {
     }
 }
 subprojects {
+  apply plugin: 'idea'
   apply plugin: 'java'
   apply plugin: 'nebula.optional-base'
   apply plugin: 'nebula.provided-base'

discovery-model/gradle.properties

@@ -1,4 +1,4 @@
-VERSION=0.1.1
+VERSION=0.1.3
 
 GROUP_ID=com.ticketmaster.api
 DESCRIPTION=Ticketmaster Discovery Model - Java

discovery-model/src/main/java/com/ticketmaster/discovery/model/Event.java

@@ -38,6 +38,7 @@ public class Event extends ResourceSupport {
   private String pleaseNote;
   private Place place;
   private Set<PriceRange> priceRanges;
+  private Source source;
 
   public List<Venue> getVenues() {
     return embedded != null ? embedded.getVenues() : null;

discovery-model/src/main/java/com/ticketmaster/discovery/model/Venue.java

@@ -49,6 +49,7 @@ public class Venue extends ResourceSupport {
   private Social social;
   private Map<String, Extension> extensions = new HashMap<>();
   private Set<Relationship> relationships = new HashSet<>();
+  private List<Image> images;
 
   @ToString(callSuper = true)
   @Getter

discovery/gradle.properties

@@ -1,4 +1,4 @@
-VERSION=0.1.2
+VERSION=0.1.3
 
 GROUP_ID=com.ticketmaster.api
 DESCRIPTION=Ticketmaster Discovery API SDK - Java

discovery/src/main/java/com/ticketmaster/api/Version.java

@@ -2,7 +2,7 @@
 
 public class Version {
 
-    public static final String SDK_VERSION = "0.1.2";
+    public static final String SDK_VERSION = "0.1.3";
 
   public static final String getUserAgent() {
     return "Ticketmaster Discovery Java SDK/" + SDK_VERSION;

discovery/src/main/java/com/ticketmaster/api/discovery/DiscoveryApi.java

@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
@@ -145,7 +146,8 @@ private Builder baseUrlBuilder() {
     return builder;
   }
 
-  private Builder urlBuilder(String path) {
+  // Package protected for testing purposess
+  Builder urlBuilder(String path) {
     Builder builder =
         baseUrlBuilder().addPathSegment(configuration.getApiPackage())
             .addPathSegment(configuration.getApiVersion()).addPathSegment(path);

discovery/src/main/java/com/ticketmaster/api/discovery/DiscoveryApiConfiguration.java

@@ -4,6 +4,8 @@
 import lombok.Getter;
 import lombok.ToString;
 
+import java.util.Locale;
+
 import static com.ticketmaster.api.discovery.util.Preconditions.*;
 
 @Getter
@@ -16,6 +18,11 @@ public class DiscoveryApiConfiguration {
 
   public enum PathModifier {
     LEGACY("legacy"),
+    TICKETMASTER_US("ticketmaster-us"),
+    TICKETMASTER_UK("ticketmaster-uk"),
+    UNIVERSE("universe"),
+    FRONTGATE("frontgate"),
+    TMR("tmr"),
     NONE("");
 
     private String modifier;
@@ -95,7 +102,11 @@ public DiscoveryApiConfigurationBuilder defaultLocale(String locale) {
 
     public DiscoveryApiConfigurationBuilder pathModifier(String newPathModifier) {
       checkNotNull(newPathModifier);
-      pathModifier = PathModifier.fromString(newPathModifier);
+      return pathModifier( PathModifier.fromString(newPathModifier) );
+    }
+
+    public DiscoveryApiConfigurationBuilder pathModifier(PathModifier newPathModifier) {
+      pathModifier = newPathModifier == null ? PathModifier.NONE : newPathModifier;
       return this;
     }
 

discovery/src/test/java/com/ticketmaster/api/discovery/DiscoveryApiITest.java

@@ -1,9 +1,10 @@
 package com.ticketmaster.api.discovery;
 
 import java.lang.reflect.Field;
+import java.util.Locale;
 import java.util.Map;
 
-import org.assertj.core.api.Assertions;
+import okhttp3.HttpUrl;
 import org.junit.Test;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.ReflectionUtils.FieldCallback;
@@ -21,6 +22,9 @@
 import com.ticketmaster.discovery.model.Venue;
 import com.ticketmaster.discovery.model.Venues;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 
 public class DiscoveryApiITest {
 
@@ -66,9 +70,35 @@ public void whenCallingSearchVenues_ensureAllFieldsAreInTheModel() throws Except
     }
   }
 
+  @Test
+  public void testPathModifierLocalized() throws Exception {
+    DiscoveryApiConfiguration configuration = DiscoveryApiConfiguration.builder()
+            .pathModifier(DiscoveryApiConfiguration.PathModifier.TICKETMASTER_UK)
+            .build();
+
+    DiscoveryApi api = new DiscoveryApi("aKey",configuration);
+
+    HttpUrl url = api.urlBuilder("event").build();
+
+    assertThat(url.encodedPath(),is("/discovery/v2/event/ticketmaster-uk"));
+  }
+
+  @Test
+  public void testPathModifierNotLocalized() throws Exception {
+    DiscoveryApiConfiguration configuration = DiscoveryApiConfiguration.builder()
+            .pathModifier(DiscoveryApiConfiguration.PathModifier.NONE)
+            .build();
+
+    DiscoveryApi api = new DiscoveryApi("aKey",configuration);
+
+    HttpUrl url = api.urlBuilder("event").build();
+
+    assertThat(url.encodedPath(),is("/discovery/v2/event"));
+  }
+
   private void validateEmptyOtherProperties(final Object object) {
     if (object != null && BaseModel.class.isAssignableFrom(object.getClass())) {
-      Assertions.assertThat(getOtherProperties(object)).isEmpty();
+      assertThat(getOtherProperties(object).isEmpty(),is(true));
       recursiveValidate(object);
     }
     return;