From aa21c345d2337efde3f6d8ddf2876fe5ee4d69a0 Mon Sep 17 00:00:00 2001 From: Yasin Date: Fri, 6 Oct 2017 23:50:01 +0530 Subject: [PATCH 1/4] Removed unintentionally commented code --- .../src/main/java/com/baeldung/jira/MyJiraClient.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java b/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java index 17e223b2046b..62cce56532a4 100644 --- a/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java +++ b/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java @@ -33,13 +33,12 @@ public static void main(String[] args) throws IOException { MyJiraClient myJiraClient = new MyJiraClient("user.name", "pass", "http://jira.company.com"); -// final String issueKey = myJiraClient.createIssue("ABCD", 1L, "Issue created from JRJC"); - final String issueKey = "BAEL-1139"; -// myJiraClient.updateIssueDescription(issueKey, "This is description from my Jira Client"); + final String issueKey = myJiraClient.createIssue("ABCD", 1L, "Issue created from JRJC"); + myJiraClient.updateIssueDescription(issueKey, "This is description from my Jira Client"); Issue issue = myJiraClient.getIssue(issueKey); System.out.println(issue.getDescription()); - /*myJiraClient.voteForAnIssue(issue); + myJiraClient.voteForAnIssue(issue); System.out.println(myJiraClient.getTotalVotesCount(issueKey)); @@ -49,7 +48,7 @@ public static void main(String[] args) throws IOException { comments.forEach(c -> System.out.println(c.getBody())); myJiraClient.deleteIssue(issueKey, true); -*/ + myJiraClient.restClient.close(); } From 6821d50baf98b3a0669ac77b77a03c2dfc737bae Mon Sep 17 00:00:00 2001 From: Yasin Date: Mon, 9 Oct 2017 21:56:47 +0530 Subject: [PATCH 2/4] BAEL-1139 move jira API to a new saas module --- libraries/pom.xml | 20 ----- pom.xml | 1 + saas/.gitignore | 26 ++++++ saas/pom.xml | 84 +++++++++++++++++++ .../com/baeldung/saas}/jira/MyJiraClient.java | 13 +-- 5 files changed, 118 insertions(+), 26 deletions(-) create mode 100644 saas/.gitignore create mode 100644 saas/pom.xml rename {libraries/src/main/java/com/baeldung => saas/src/main/java/com/baeldung/saas}/jira/MyJiraClient.java (87%) diff --git a/libraries/pom.xml b/libraries/pom.xml index c7c5da95a6b7..e539c0916fe8 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -575,22 +575,6 @@ hazelcast ${hazelcast.version} - - com.atlassian.jira - jira-rest-java-client-core - 4.0.0 - - - com.atlassian.fugue - fugue - 2.6.1 - - - org.jgrapht jgrapht-core @@ -626,10 +610,6 @@ bintray http://dl.bintray.com/cuba-platform/main - - atlassian-public - https://packages.atlassian.com/maven/repository/public - 0.1.0 diff --git a/pom.xml b/pom.xml index ff4b490c6b35..29afd9e69ab6 100644 --- a/pom.xml +++ b/pom.xml @@ -248,6 +248,7 @@ mockserver undertow vertx-and-rxjava + saas diff --git a/saas/.gitignore b/saas/.gitignore new file mode 100644 index 000000000000..3de4cc647e48 --- /dev/null +++ b/saas/.gitignore @@ -0,0 +1,26 @@ +*.class + +0.* + +#folders# +/target +/neoDb* +/data +/src/main/webapp/WEB-INF/classes +*/META-INF/* +.resourceCache + +# Packaged files # +*.jar +*.war +*.ear + +# Files generated by integration tests +*.txt +backup-pom.xml +/bin/ +/temp + +#IntelliJ specific +.idea/ +*.iml \ No newline at end of file diff --git a/saas/pom.xml b/saas/pom.xml new file mode 100644 index 000000000000..7c8745910fe7 --- /dev/null +++ b/saas/pom.xml @@ -0,0 +1,84 @@ + + 4.0.0 + com.baeldung + saas + 0.1.0-SNAPSHOT + jar + saas + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + + com.atlassian.jira + jira-rest-java-client-core + 4.0.0 + + + com.atlassian.fugue + fugue + 2.6.1 + + + com.google.guava + guava + 19.0 + + + + + + saas + + + src/main/resources + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + java + com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed + + -Xmx300m + -XX:+UseParallelGC + -classpath + + com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed + + + + + + + + + atlassian-public + https://packages.atlassian.com/maven/repository/public + + + + + 3.6.0 + + \ No newline at end of file diff --git a/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java b/saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java similarity index 87% rename from libraries/src/main/java/com/baeldung/jira/MyJiraClient.java rename to saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java index ea1d73f52af5..13d16d4c5603 100644 --- a/libraries/src/main/java/com/baeldung/jira/MyJiraClient.java +++ b/saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java @@ -1,4 +1,4 @@ -package com.baeldung.jira; +package com.baeldung.saas.jira; import com.atlassian.jira.rest.client.api.IssueRestClient; import com.atlassian.jira.rest.client.api.JiraRestClient; @@ -31,14 +31,15 @@ private MyJiraClient(String username, String password, String jiraUrl) { public static void main(String[] args) throws IOException { - MyJiraClient myJiraClient = new MyJiraClient("user.name", "pass", "http://jira.company.com"); + MyJiraClient myJiraClient = new MyJiraClient("yasin.bhojawala", "jira@P455", "http://jira.baeldung.com"); - final String issueKey = myJiraClient.createIssue("ABCD", 1L, "Issue created from JRJC"); - myJiraClient.updateIssueDescription(issueKey, "This is description from my Jira Client"); +// final String issueKey = myJiraClient.createIssue("ABCD", 1L, "Issue created from JRJC"); + final String issueKey = "BAEL-1139"; +// myJiraClient.updateIssueDescription(issueKey, "This is description from my Jira Client"); Issue issue = myJiraClient.getIssue(issueKey); System.out.println(issue.getDescription()); - myJiraClient.voteForAnIssue(issue); + /*myJiraClient.voteForAnIssue(issue); System.out.println(myJiraClient.getTotalVotesCount(issueKey)); @@ -47,7 +48,7 @@ public static void main(String[] args) throws IOException { List comments = myJiraClient.getAllComments(issueKey); comments.forEach(c -> System.out.println(c.getBody())); - myJiraClient.deleteIssue(issueKey, true); + myJiraClient.deleteIssue(issueKey, true);*/ myJiraClient.restClient.close(); } From d70b70ec30e16da57fb33843ca01994711725e1e Mon Sep 17 00:00:00 2001 From: Yasin Date: Mon, 9 Oct 2017 21:58:07 +0530 Subject: [PATCH 3/4] no tabs only spaces --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29afd9e69ab6..bed04a97617f 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,7 @@ mockserver undertow vertx-and-rxjava - saas + saas From e6339d161809811833754c7e8deccaba38e9ca3e Mon Sep 17 00:00:00 2001 From: Yasin Date: Mon, 9 Oct 2017 21:59:55 +0530 Subject: [PATCH 4/4] changes --- .../java/com/baeldung/saas/jira/MyJiraClient.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java b/saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java index 13d16d4c5603..ff1de5a6d0f0 100644 --- a/saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java +++ b/saas/src/main/java/com/baeldung/saas/jira/MyJiraClient.java @@ -31,15 +31,14 @@ private MyJiraClient(String username, String password, String jiraUrl) { public static void main(String[] args) throws IOException { - MyJiraClient myJiraClient = new MyJiraClient("yasin.bhojawala", "jira@P455", "http://jira.baeldung.com"); + MyJiraClient myJiraClient = new MyJiraClient("user.name", "pass", "http://jira.company.com"); -// final String issueKey = myJiraClient.createIssue("ABCD", 1L, "Issue created from JRJC"); - final String issueKey = "BAEL-1139"; -// myJiraClient.updateIssueDescription(issueKey, "This is description from my Jira Client"); + final String issueKey = myJiraClient.createIssue("ABCD", 1L, "Issue created from JRJC"); + myJiraClient.updateIssueDescription(issueKey, "This is description from my Jira Client"); Issue issue = myJiraClient.getIssue(issueKey); System.out.println(issue.getDescription()); - /*myJiraClient.voteForAnIssue(issue); + myJiraClient.voteForAnIssue(issue); System.out.println(myJiraClient.getTotalVotesCount(issueKey)); @@ -48,7 +47,7 @@ public static void main(String[] args) throws IOException { List comments = myJiraClient.getAllComments(issueKey); comments.forEach(c -> System.out.println(c.getBody())); - myJiraClient.deleteIssue(issueKey, true);*/ + myJiraClient.deleteIssue(issueKey, true); myJiraClient.restClient.close(); }