Skip to content

changes for v2.9.1 #9

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

Merged
merged 1 commit into from
May 8, 2017
Merged

changes for v2.9.1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ipp-java-qbapihelper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<parent>
<artifactId>ipp-v3-java-devkit-pom</artifactId>
<groupId>com.intuit.quickbooks-online</groupId>
<version>2.9.0</version>
<version>2.9.1</version>
</parent>
<artifactId>ipp-java-qbapihelper</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
<packaging>jar</packaging>
<name>Quickbooks API Helper for Oauth</name>
<description>Quickbooks API Helper Project for OAuth, Disconnect and Reconnect</description>
Expand Down
18 changes: 9 additions & 9 deletions ipp-v3-java-data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<parent>
<groupId>com.intuit.quickbooks-online</groupId>
<artifactId>ipp-v3-java-devkit-pom</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</parent>

<artifactId>ipp-v3-java-data</artifactId>
<name>IPP V3 Java - Data Project</name>
<description>IPP Java V3 DevKit Data project - FMS Entities generation</description>
<version>2.9.0</version>
<version>2.9.1</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -40,15 +40,15 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.13</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.8.8</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
</dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.8</version>
</dependency>
</dependencies>

<build>
Expand Down
3 changes: 2 additions & 1 deletion ipp-v3-java-data/src/main/java/com/intuit/ipp/data/DataChangeEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import java.util.List;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@JsonIgnoreProperties(ignoreUnknown = true)
public class DataChangeEvent {
Expand All @@ -34,3 +34,4 @@ public void setEntities(List<Entity> entities) {


}

2 changes: 1 addition & 1 deletion ipp-v3-java-data/src/main/java/com/intuit/ipp/data/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*******************************************************************************/
package com.intuit.ipp.data;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@JsonIgnoreProperties(ignoreUnknown = true)
public class Entity {
Expand Down
3 changes: 2 additions & 1 deletion ipp-v3-java-data/src/main/java/com/intuit/ipp/data/EventNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*******************************************************************************/
package com.intuit.ipp.data;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

@JsonIgnoreProperties(ignoreUnknown = true)
public class EventNotification {
Expand All @@ -38,3 +38,4 @@ public void setDataChangeEvent(DataChangeEvent dataChangeEvent) {


}

3 changes: 2 additions & 1 deletion ipp-v3-java-data/src/main/java/com/intuit/ipp/data/WebhooksEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import java.util.List;

import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

/**
* Wrapper class for the webhooks payload
Expand All @@ -37,3 +37,4 @@ public void setEventNotifications(List<EventNotification> eventNotifications) {
}

}

8 changes: 4 additions & 4 deletions ipp-v3-java-devkit-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<parent>
<groupId>com.intuit.quickbooks-online</groupId>
<artifactId>ipp-v3-java-devkit-pom</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</parent>

<artifactId>ipp-v3-java-devkit-assembly</artifactId>
<packaging>pom</packaging>
<name>IPP Java Devkit Assembly (${project.version})</name>
<description>IPP Java V3 DevKit assembly</description>
<version>2.9.0</version>
<version>2.9.1</version>
<properties>
<release.devkit.version>2.9.0</release.devkit.version>
<release.data.version>2.9.0</release.data.version>
<release.devkit.version>2.9.1</release.devkit.version>
<release.data.version>2.9.1</release.data.version>
</properties>
<dependencies>
<!-- Main artifacts -->
Expand Down
8 changes: 4 additions & 4 deletions ipp-v3-java-devkit-shaded-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<parent>
<groupId>com.intuit.quickbooks-online</groupId>
<artifactId>ipp-v3-java-devkit-pom</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</parent>

<artifactId>ipp-v3-java-devkit-shaded-assembly</artifactId>
<packaging>pom</packaging>
<name>IPP Java Devkit Assembly Shaded (${project.version})</name>
<description>IPP Java V3 DevKit assembly</description>
<version>2.9.0</version>
<version>2.9.1</version>
<properties>
<release.devkit.version>2.9.0</release.devkit.version>
<release.data.version>2.9.0</release.data.version>
<release.devkit.version>2.9.1</release.devkit.version>
<release.data.version>2.9.1</release.data.version>
</properties>
<dependencies>
<!-- Main artifacts -->
Expand Down
28 changes: 14 additions & 14 deletions ipp-v3-java-devkit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<artifactId>ipp-v3-java-devkit-pom</artifactId>
<groupId>com.intuit.quickbooks-online</groupId>
<version>2.9.0</version>
<version>2.9.1</version>
</parent>

<artifactId>ipp-v3-java-devkit</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
<packaging>jar</packaging>
<name>IPP V3 Java Devkit - Development Project</name>
<description>IPP Java V3 DevKit Project - Core</description>
Expand All @@ -22,22 +22,22 @@
</properties>

<dependencies>
<dependency>
<dependency>
<groupId>com.intuit.quickbooks-online</groupId>
<artifactId>ipp-v3-java-data</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.6</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.6</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.10</version>
<scope>test</scope>
</dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.9.10</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
3 changes: 2 additions & 1 deletion ipp-v3-java-devkit/src/main/java/com/intuit/ipp/interceptors/PrepareRequestInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,8 @@ private boolean isKeyValueExpected(String key) {
|| key.equals(RequestElements.REPORT_PARAM_QZURL)
|| key.equals(RequestElements.REPORT_PARAM_AGING_PERIOD)
|| key.equals(RequestElements.REPORT_PARAM_NUM_PERIOD)
|| key.equals(RequestElements.REPORT_PARAM_REPORT_DT);
|| key.equals(RequestElements.REPORT_PARAM_REPORT_DT)
|| key.equals(RequestElements.REPORT_PARAM_COLUMNS);
}

/**
Expand Down
11 changes: 9 additions & 2 deletions ipp-v3-java-devkit/src/main/java/com/intuit/ipp/security/OAuthAuthorizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,16 @@ private OAuthAuthorizer(String consumerKey, String consumerSecret) {
* @param accessTokenSecret the access token secret
*/
public OAuthAuthorizer(String consumerKey, String consumerSecret, String accessToken, String accessTokenSecret) {
this(consumerKey, consumerSecret);
oAuthConsumer.setTokenWithSecret(accessToken, accessTokenSecret);
this(trim(consumerKey), trim(consumerSecret));
oAuthConsumer.setTokenWithSecret(trim(accessToken), trim(accessTokenSecret));
oAuthConsumer.setSigningStrategy(new AuthorizationHeaderSigningStrategy());
}

private static String trim(String key) {
if (key == null) {
return null;
}
return key.trim();
}

}
32 changes: 17 additions & 15 deletions ...ava-devkit/src/main/java/com/intuit/ipp/serialization/AttachableResponseDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@
import java.io.IOException;
import java.util.Iterator;

import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.map.AnnotationIntrospector;
import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.JsonDeserializer;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector;
import org.codehaus.jackson.xc.JaxbAnnotationIntrospector;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.DeserializationConfig;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
import com.fasterxml.jackson.databind.DeserializationFeature;

import com.intuit.ipp.data.Attachable;
import com.intuit.ipp.data.AttachableResponse;
Expand Down Expand Up @@ -59,9 +61,9 @@ public AttachableResponse deserialize(JsonParser jp, DeserializationContext desC
//Make the mapper JAXB annotations aware
AnnotationIntrospector primary = new JaxbAnnotationIntrospector();
AnnotationIntrospector secondary = new JacksonAnnotationIntrospector();
AnnotationIntrospector pair = new AnnotationIntrospector.Pair(primary, secondary);
mapper.getDeserializationConfig().setAnnotationIntrospector(pair);
mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
AnnotationIntrospector pair = new AnnotationIntrospectorPair(primary, secondary);
mapper.setAnnotationIntrospector(pair);
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

//Read the QueryResponse as a tree
JsonNode jn = jp.readValueAsTree();
Expand All @@ -70,16 +72,16 @@ public AttachableResponse deserialize(JsonParser jp, DeserializationContext desC
AttachableResponse qr = new AttachableResponse();

//Iterate over the field names
Iterator<String> ite = jn.getFieldNames();
Iterator<String> ite = jn.fieldNames();

while (ite.hasNext()) {
String key = ite.next();

//Attributes
if (key.equalsIgnoreCase(FAULT)) {
qr.setFault(mapper.readValue(jn.get(FAULT), Fault.class));
qr.setFault(mapper.treeToValue(jn.get(FAULT), Fault.class));
} else if (key.equalsIgnoreCase(ATTACHABLE)) {
qr.setAttachable(mapper.readValue(jn.get(ATTACHABLE), Attachable.class));
qr.setAttachable(mapper.treeToValue(jn.get(ATTACHABLE), Attachable.class));
}
}
return qr;
Expand Down
21 changes: 11 additions & 10 deletions ...v3-java-devkit/src/main/java/com/intuit/ipp/serialization/BatchItemRequestSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@

import java.io.IOException;

import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.map.AnnotationIntrospector;
import org.codehaus.jackson.map.JsonSerializer;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializerProvider;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector;
import org.codehaus.jackson.xc.JaxbAnnotationIntrospector;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;

import com.intuit.ipp.data.BatchItemRequest;
import com.intuit.ipp.data.CDCQuery;
Expand Down Expand Up @@ -163,10 +164,10 @@ private ObjectMapper getObjectMapper() {
ObjectMapper mapper = new ObjectMapper();
AnnotationIntrospector primary = new JacksonAnnotationIntrospector();
AnnotationIntrospector secondary = new JaxbAnnotationIntrospector();
AnnotationIntrospector pair = new AnnotationIntrospector.Pair(primary, secondary);
AnnotationIntrospector pair = new AnnotationIntrospectorPair(primary, secondary);

mapper.setAnnotationIntrospector(pair);
mapper.setSerializationInclusion(Inclusion.NON_NULL);
mapper.setSerializationInclusion(Include.NON_NULL);

return mapper;
}
Expand Down
Loading