Merge pull request #23 from Moesif/refactor-update-dependency

Bump moesifapi version to 1.6.5
Moesif · Aug 28, 2019 · 1193d4c · 1193d4c
2 parents 1fc49b6 + f262ef4
commit 1193d4c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ Add the Moesif dependency to your project's pom.xml file:
 <dependency>
     <groupId>com.moesif.servlet</groupId>
     <artifactId>moesif-servlet</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.2</version>
 </dependency>
 ```
 
@@ -48,7 +48,7 @@ repositories {
 }
  
 dependencies {   
-    compile 'com.moesif.servlet:moesif-servlet:1.6.0'
+    compile 'com.moesif.servlet:moesif-servlet:1.6.2'
 }
 ```
 
@@ -521,7 +521,8 @@ The metadata field can be any custom data you want to set on the user. The `user
 MoesifFilter filter = new MoesifFilter("Your Moesif Application Id", new MoesifConfiguration());
 
 UserModel user = new UserBuilder()
-    .userId("javaapiuser")
+    .userId("12345")
+    .companyId("67890")
     .modifiedTime(new Date())
     .ipAddress("29.80.250.240")
     .sessionToken("di3hd982h3fubv3yfd94egf")
@@ -560,7 +561,8 @@ metadata = APIHelper.deserialize("{" +
     "}");
 
 UserModel userA = new UserBuilder()
-    .userId("javaapiuser")
+    .userId("12345")
+    .companyId("67890")
     .modifiedTime(new Date())
     .ipAddress("29.80.250.240")
     .sessionToken("di3hd982h3fubv3yfd94egf")
@@ -569,7 +571,8 @@ UserModel userA = new UserBuilder()
     .build();
 
 UserModel userB = new UserBuilder()
-		.userId("javaapiuser1")
+		.userId("1234")
+    .companyId("6789")
     .modifiedTime(new Date())
     .ipAddress("29.80.250.240")
     .sessionToken("di3hd982h3fubv3yfd94egf")
@@ -592,7 +595,7 @@ The metadata field can be any custom data you want to set on the company. The `c
 MoesifFilter filter = new MoesifFilter("Your Moesif Application Id", new MoesifConfiguration());
 
 CompanyModel company = new CompanyBuilder()
-				.companyId("javaapicompany")
+				.companyId("12345")
 				.companyDomain("acmeinc.com")
 				.metadata(APIHelper.deserialize("{" +
 						"\"email\": \"[email protected]\"," +
@@ -628,13 +631,13 @@ metadata = APIHelper.deserialize("{" +
     "}");
 
   CompanyModel companyA = new CompanyBuilder()
-  		.companyId("javaapicompany")
-  		.companyDomain("nowhere.com")
+  		.companyId("12345")
+  		.companyDomain("acmeinc.com")
   		.metadata(metadata)
   		.build();
 
   CompanyModel companyB = new CompanyBuilder()
-  		.companyId("javaapicompany1")
+  		.companyId("67890")
   		.companyDomain("nowhere.com")
   		.metadata(metadata)
   		.build();
@@ -655,7 +658,7 @@ metadata = APIHelper.deserialize("{" +
 
 ## Other integrations
 
-To view more more documentation on integration options, please visit __[the Integration Options Documentation](https://www.moesif.com/docs/getting-started/integration-options/).__
+To view more documentation on integration options, please visit __[the Integration Options Documentation](https://www.moesif.com/docs/getting-started/integration-options/).__
 
 [ico-built-for]: https://img.shields.io/badge/built%20for-servlet-blue.svg
 [ico-version]: https://api.bintray.com/packages/moesif/maven/moesif-servlet/images/download.svg

diff --git a/moesif-servlet/pom.xml b/moesif-servlet/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.moesif.servlet</groupId>
   <artifactId>moesif-servlet</artifactId>
-  <version>1.6.1</version>
+  <version>1.6.2</version>
   <packaging>jar</packaging>
   <name>moesif-servlet</name>
   <description>Moesif SDK for Java Servlet to log and analyze API calls</description>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.moesif.api</groupId>
       <artifactId>moesifapi</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.5</version>
     </dependency>
     <dependency>
 	  <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/moesif-servlet/src/test/java/com/moesif/servlet/MoesifServletTests.java b/moesif-servlet/src/test/java/com/moesif/servlet/MoesifServletTests.java
@@ -116,7 +116,8 @@ public int read() throws IOException {
 
 	public void testUpdateUser() throws Throwable {
 		UserModel user = new UserBuilder()
-				.userId("javaapiuser")
+				.userId("12345")
+				.companyId("67890")
 				.modifiedTime(new Date())
 				.ipAddress("29.80.250.240")
 				.sessionToken("di3hd982h3fubv3yfd94egf")
@@ -150,7 +151,8 @@ public void testUpdateUsersBatch() throws Throwable {
 				"}");
 
 		UserModel userA = new UserBuilder()
-				.userId("javaapiuser")
+				.userId("12345")
+				.companyId("67890")
 				.modifiedTime(new Date())
 				.ipAddress("29.80.250.240")
 				.sessionToken("di3hd982h3fubv3yfd94egf")
@@ -159,7 +161,8 @@ public void testUpdateUsersBatch() throws Throwable {
 				.build();
 
 		UserModel userB = new UserBuilder()
-				.userId("javaapiuser1")
+				.userId("1234")
+				.companyId("6789")
 				.modifiedTime(new Date())
 				.ipAddress("29.80.250.240")
 				.sessionToken("di3hd982h3fubv3yfd94egf")
@@ -175,7 +178,7 @@ public void testUpdateUsersBatch() throws Throwable {
 
 	public void testUpdateCompany() throws Throwable {
 		CompanyModel company = new CompanyBuilder()
-				.companyId("javaapicompany")
+				.companyId("12345")
 				.companyDomain("acmeinc.com")
 				.metadata(APIHelper.deserialize("{" +
 						"\"email\": \"[email protected]\"," +
@@ -206,13 +209,13 @@ public void testUpdateCompaniesBatch() throws Throwable {
 				"}");
 
 		CompanyModel companyA = new CompanyBuilder()
-				.companyId("javaapicompany")
-				.companyDomain("nowhere.com")
+				.companyId("12345")
+				.companyDomain("acmeinc.com")
 				.metadata(metadata)
 				.build();
 
 		CompanyModel companyB = new CompanyBuilder()
-				.companyId("javaapicompany1")
+				.companyId("67890")
 				.companyDomain("nowhere.com")
 				.metadata(metadata)
 				.build();

diff --git a/moesif-springrequest/README.md b/moesif-springrequest/README.md
@@ -26,7 +26,7 @@ Add the Moesif dependency to your project's pom.xml file:
 <dependency>
     <groupId>com.moesif.springrequest</groupId>
     <artifactId>moesif-springrequest</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.6</version>
 </dependency>
 ```
 
@@ -170,7 +170,7 @@ interceptors.add(new MoesifSpringRequestInterceptor(
 
 ## Other integrations
 
-To view more more documentation on integration options, please visit __[the Integration Options Documentation](https://www.moesif.com/docs/getting-started/integration-options/).__
+To view more documentation on integration options, please visit __[the Integration Options Documentation](https://www.moesif.com/docs/getting-started/integration-options/).__
 
 [ico-built-for]: https://img.shields.io/badge/built%20for-servlet-blue.svg
 [ico-version]: https://api.bintray.com/packages/moesif/maven/moesif-springrequest/images/download.svg

diff --git a/moesif-springrequest/pom.xml b/moesif-springrequest/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.moesif.springrequest</groupId>
   <artifactId>moesif-springrequest</artifactId>
-  <version>1.0.5</version>
+  <version>1.0.6</version>
   <packaging>jar</packaging>
   <name>moesif-springrequest</name>
   <description>Moesif SDK for Java to log and analyze outgoing API calls</description>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>com.moesif.api</groupId>
       <artifactId>moesifapi</artifactId>
-      <version>1.6.4</version>
+      <version>1.6.5</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>