Changed package to nl.ikoodi base

pvdissel · pvdissel · commit 54a638a001e1 · 2014-05-04T00:41:53.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -11,8 +11,6 @@ buildscript {
 }
 
 description = 'Bol.com OpenAPI java client'
-group = 'nl.ikoodi.bol.openapi'
-version = '4.0.0-SNAPSHOT'
 
 allprojects {
     repositories {
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+group=nl.ikoodi.bol.openapi
+version=4.0.0-SNAPSHOT
diff --git a/subprojects/api/src/integrationTest/groovy/nl/ikoodi/bol/openapi/OpenApiHttpClientIntegrationSpec.groovy b/subprojects/api/src/integrationTest/groovy/nl/ikoodi/bol/openapi/OpenApiHttpClientIntegrationSpec.groovy
@@ -1,11 +1,11 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
-import static com.bol.api.openapi.QueryDataTypes.DataType.PRODUCTS
-import static com.bol.api.openapi.QueryOfferTypes.OfferType.SECONDHAND
-import static com.bol.api.openapi.QuerySortingMethod.SortingBy.PRICE
-import static com.bol.api.openapi.QuerySortingMethod.SortingOrder.ASCENDING
+import static nl.ikoodi.bol.openapi.QueryDataTypes.DataType.PRODUCTS
+import static nl.ikoodi.bol.openapi.QueryOfferTypes.OfferType.SECONDHAND
+import static nl.ikoodi.bol.openapi.QuerySortingMethod.SortingBy.PRICE
+import static nl.ikoodi.bol.openapi.QuerySortingMethod.SortingOrder.ASCENDING
 import static org.hamcrest.Matchers.isEmptyString
 import static org.hamcrest.Matchers.not
 import static spock.util.matcher.HamcrestSupport.that
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/OpenApi.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/OpenApi.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 import com.bol.api.openapi_4_0.Pong;
 import com.bol.api.openapi_4_0.SearchResults;
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/OpenApiHttpClient.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/OpenApiHttpClient.java
@@ -1,12 +1,12 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
-import com.bol.api.openapi.internal.interceptor.JsonFormatRequestInterceptor;
-import com.bol.api.openapi.internal.interceptor.OpenApiV4AuthenticationRequestInterceptor;
 import feign.Feign;
 import feign.RequestInterceptor;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
 import feign.jaxrs.JAXRSModule;
+import nl.ikoodi.bol.openapi.internal.interceptor.JsonFormatRequestInterceptor;
+import nl.ikoodi.bol.openapi.internal.interceptor.OpenApiV4AuthenticationRequestInterceptor;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryCategoryIds.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryCategoryIds.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryDataTypes.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryDataTypes.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryIncludeAttributes.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryIncludeAttributes.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 public class QueryIncludeAttributes {
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryLimit.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryLimit.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 public class QueryLimit {
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryOfferTypes.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryOfferTypes.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryOffset.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryOffset.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 public class QueryOffset {
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryProductIds.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QueryProductIds.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QuerySearch.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QuerySearch.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QuerySearchField.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QuerySearchField.java
@@ -1,6 +1,6 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
-import static com.bol.api.openapi.QuerySearchField.SearchField.NONE;
+import static nl.ikoodi.bol.openapi.QuerySearchField.SearchField.NONE;
 
 public class QuerySearchField {
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QuerySortingMethod.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/QuerySortingMethod.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi;
+package nl.ikoodi.bol.openapi;
 
 public class QuerySortingMethod {
 
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/internal/interceptor/JsonFormatRequestInterceptor.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/internal/interceptor/JsonFormatRequestInterceptor.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi.internal.interceptor;
+package nl.ikoodi.bol.openapi.internal.interceptor;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
diff --git a/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/internal/interceptor/OpenApiV4AuthenticationRequestInterceptor.java b/subprojects/api/src/main/java/nl/ikoodi/bol/openapi/internal/interceptor/OpenApiV4AuthenticationRequestInterceptor.java
@@ -1,4 +1,4 @@
-package com.bol.api.openapi.internal.interceptor;
+package nl.ikoodi.bol.openapi.internal.interceptor;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/OpenApiHttpClientSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/OpenApiHttpClientSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import com.bol.api.openapi_4_0.Pong
 import com.fasterxml.jackson.annotation.JsonInclude
@@ -9,9 +9,9 @@ import com.squareup.okhttp.mockwebserver.MockWebServer
 import com.squareup.okhttp.mockwebserver.RecordedRequest
 import spock.lang.Specification
 
-import static com.bol.api.openapi.internal.interceptor.JsonFormatRequestInterceptor.QUERY_FORMAT_JSON
-import static com.bol.api.openapi.internal.interceptor.JsonFormatRequestInterceptor.QUERY_FORMAT_KEY
-import static com.bol.api.openapi.internal.interceptor.OpenApiV4AuthenticationRequestInterceptor.QUERY_AUTH_KEY
+import static nl.ikoodi.bol.openapi.internal.interceptor.JsonFormatRequestInterceptor.QUERY_FORMAT_JSON
+import static nl.ikoodi.bol.openapi.internal.interceptor.JsonFormatRequestInterceptor.QUERY_FORMAT_KEY
+import static nl.ikoodi.bol.openapi.internal.interceptor.OpenApiV4AuthenticationRequestInterceptor.QUERY_AUTH_KEY
 
 class OpenApiHttpClientSpec extends Specification {
 
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryCategoryIdsSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryCategoryIdsSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryDataTypesSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryDataTypesSpec.groovy
@@ -1,8 +1,8 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
-import static com.bol.api.openapi.QueryDataTypes.DataType.*
+import static nl.ikoodi.bol.openapi.QueryDataTypes.DataType.*
 
 class QueryDataTypesSpec extends Specification {
     def 'Add one type results in a single query value'() {
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryIncludeAttributesSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryIncludeAttributesSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryLimitSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryLimitSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryOfferTypesSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryOfferTypesSpec.groovy
@@ -1,8 +1,8 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
-import static com.bol.api.openapi.QueryOfferTypes.OfferType.*
+import static nl.ikoodi.bol.openapi.QueryOfferTypes.OfferType.*
 
 class QueryOfferTypesSpec extends Specification {
 
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryOffsetSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryOffsetSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryProductIdsSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QueryProductIdsSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QuerySearchFieldSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QuerySearchFieldSpec.groovy
@@ -1,9 +1,9 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import static com.bol.api.openapi.QuerySearchField.SearchField.*
+import static nl.ikoodi.bol.openapi.QuerySearchField.SearchField.*
 
 class QuerySearchFieldSpec extends Specification {
 
@@ -16,7 +16,7 @@ class QuerySearchFieldSpec extends Specification {
         searchField.toString() == result
 
         where:
-        field || result
+        field     || result
         NONE      || 'none'
         AUTHOR    || 'author'
         ARTIST    || 'artist'
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QuerySearchSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QuerySearchSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QuerySortingMethodSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/QuerySortingMethodSpec.groovy
@@ -1,11 +1,11 @@
-package com.bol.api.openapi
+package nl.ikoodi.bol.openapi
 
 import spock.lang.Specification
 import spock.lang.Unroll
 
-import static com.bol.api.openapi.QuerySortingMethod.SortingBy.*
-import static com.bol.api.openapi.QuerySortingMethod.SortingOrder.ASCENDING
-import static com.bol.api.openapi.QuerySortingMethod.SortingOrder.DESCENDING
+import static nl.ikoodi.bol.openapi.QuerySortingMethod.SortingBy.*
+import static nl.ikoodi.bol.openapi.QuerySortingMethod.SortingOrder.ASCENDING
+import static nl.ikoodi.bol.openapi.QuerySortingMethod.SortingOrder.DESCENDING
 
 class QuerySortingMethodSpec extends Specification {
 
@@ -18,7 +18,7 @@ class QuerySortingMethodSpec extends Specification {
         method.toString() == result
 
         where:
-        by | order || result
+        by     | order      || result
         RANK   | ASCENDING  || 'rankasc'
         RANK   | DESCENDING || 'rankdesc'
         PRICE  | ASCENDING  || 'priceasc'
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/internal/interceptor/JsonFormatRequestInterceptorSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/internal/interceptor/JsonFormatRequestInterceptorSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi.internal.interceptor
+package nl.ikoodi.bol.openapi.internal.interceptor
 
 import feign.RequestTemplate
 import spock.lang.Specification
diff --git a/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/internal/interceptor/OpenApiV4AuthenticationRequestInterceptorSpec.groovy b/subprojects/api/src/test/groovy/nl/ikoodi/bol/openapi/internal/interceptor/OpenApiV4AuthenticationRequestInterceptorSpec.groovy
@@ -1,4 +1,4 @@
-package com.bol.api.openapi.internal.interceptor
+package nl.ikoodi.bol.openapi.internal.interceptor
 
 import feign.RequestTemplate
 import spock.lang.Specification
diff --git a/subprojects/client/src/integrationTest/groovy/nl/ikoodi/bol/openapi/OpenApiClientIntegrationSpec.groovy b/subprojects/client/src/integrationTest/groovy/nl/ikoodi/bol/openapi/OpenApiClientIntegrationSpec.groovy
@@ -1,6 +1,5 @@
 package nl.ikoodi.bol.openapi
 
-import com.bol.api.openapi.client.OpenApiClient
 import spock.lang.Ignore
 import spock.lang.Specification
 
@@ -31,7 +30,6 @@ class OpenApiClientIntegrationSpec extends Specification {
         results.refinementGroups.size() == 0
     }
 
-
     def 'Search by multiple terms'() {
         def results = OpenApiClient.withDefaultClient(apiKey).searchBuilder()
                 .term("harry potter")
diff --git a/subprojects/client/src/main/java/nl/ikoodi/bol/openapi/HealthStatus.java b/subprojects/client/src/main/java/nl/ikoodi/bol/openapi/HealthStatus.java
@@ -1,7 +1,7 @@
-package com.bol.api.openapi.client;
+package nl.ikoodi.bol.openapi;
 
-import static com.bol.api.openapi.client.HealthStatus.Status.HEALTHY;
-import static com.bol.api.openapi.client.HealthStatus.Status.UNHEALTY;
+import static nl.ikoodi.bol.openapi.HealthStatus.Status.HEALTHY;
+import static nl.ikoodi.bol.openapi.HealthStatus.Status.UNHEALTY;
 
 public class HealthStatus {
 
@@ -15,11 +15,7 @@ enum Status {
     private String message;
 
     public HealthStatus(Status status) {
-        if (HEALTHY.equals(status)) {
-            healthy = true;
-        } else {
-            healthy = false;
-        }
+        healthy = HEALTHY.equals(status);
         this.message = "";
     }
 
diff --git a/subprojects/client/src/main/java/nl/ikoodi/bol/openapi/OpenApiClient.java b/subprojects/client/src/main/java/nl/ikoodi/bol/openapi/OpenApiClient.java
@@ -1,12 +1,11 @@
-package com.bol.api.openapi.client;
+package nl.ikoodi.bol.openapi;
 
-import com.bol.api.openapi.*;
 import com.bol.api.openapi_4_0.Pong;
 import com.bol.api.openapi_4_0.SearchResults;
 
-import static com.bol.api.openapi.QueryOfferTypes.OfferType.*;
-import static com.bol.api.openapi.QuerySortingMethod.SortingBy.PRICE;
-import static com.bol.api.openapi.QuerySortingMethod.SortingOrder.ASCENDING;
+import static nl.ikoodi.bol.openapi.QueryOfferTypes.OfferType.*;
+import static nl.ikoodi.bol.openapi.QuerySortingMethod.SortingBy.PRICE;
+import static nl.ikoodi.bol.openapi.QuerySortingMethod.SortingOrder.ASCENDING;
 
 public class OpenApiClient {
 
diff --git a/subprojects/schema/schema.gradle b/subprojects/schema/schema.gradle
@@ -1,9 +1,6 @@
 apply from: script('jaxb')
 apply plugin: 'groovy'
 
-group = 'com.bol.api.openapi'
-version = '4.0.0'
-
 description = """OpenAPI v4 Schema"""
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ buildscript {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`description = 'Bol.com OpenAPI java client'`
`14`		`-group = 'nl.ikoodi.bol.openapi'`
`15`		`-version = '4.0.0-SNAPSHOT'`
`16`	`14`
`17`	`15`	`allprojects {`
`18`	`16`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+group=nl.ikoodi.bol.openapi`
	`2`	`+version=4.0.0-SNAPSHOT`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.bol.api.openapi;`
	`1`	`+package nl.ikoodi.bol.openapi;`
`2`	`2`
`3`	`3`	`import com.bol.api.openapi_4_0.Pong;`
`4`	`4`	`import com.bol.api.openapi_4_0.SearchResults;`