Merge pull request #35 from Bandwidth/task/add-workflow

hamermike · web-flow · commit 3ac3351116f4 · 2021-07-30T13:40:43.000-04:00
DX-2005 Update package and add workflow
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,16 @@
+name: Build package using Maven
+on:
+  pull_request:
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,38 @@
+name: Publish package to the Maven Central Repository
+on:
+  release:
+    types:
+      - published
+jobs:
+  publish:
+    if: ${{ !github.event.release.prerelease && github.event.release.target_commitish == 'main' }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
+
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+
+    - uses: actions/checkout@v2
+    - name: Set up Apache Maven Central
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
+        server-id: ossrh
+        server-username: MAVEN_USERNAME
+        server-password: MAVEN_CENTRAL_TOKEN
+        gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
+        gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+    - name: Publish to Apache Maven Central
+      run: mvn deploy
+      env:
+        MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+        MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
+        MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.bandwidth.sdk</groupId>
     <artifactId>bandwidth-java-iris-sdk</artifactId>
-    <version>1.12</version>
+    <version>2.0.0-beta.1</version>
     <packaging>jar</packaging>
     <name>bandwidth-java-iris-sdk</name>
     <description>Java SDK for use with the IRIS API.</description>
@@ -37,12 +37,21 @@
     </developers>
 
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.2</version>
+        </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.2.11</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -67,12 +76,6 @@
             <version>1.10</version>
         </dependency>
 
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/src/main/java/com/bandwidth/iris/sdk/IrisClient.java b/src/main/java/com/bandwidth/iris/sdk/IrisClient.java
@@ -15,9 +15,7 @@
 import org.apache.http.entity.FileEntity;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.EntityUtils;
-import java.io.FileOutputStream;
 
 import javax.xml.stream.XMLInputFactory;
 import java.io.File;
diff --git a/src/main/java/com/bandwidth/iris/sdk/examples/Example.java b/src/main/java/com/bandwidth/iris/sdk/examples/Example.java
@@ -2,24 +2,14 @@
 
 import com.bandwidth.iris.sdk.IrisClient;
 import com.bandwidth.iris.sdk.model.*;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
 
 import java.io.File;
 import java.util.*;
 
 public class Example {
     private static Site SITE = null;
-    private static SipPeer SIP_PEER = null;
-
-    public static void main(String[] args) throws Exception {
-        org.apache.log4j.BasicConfigurator.configure();
-        Logger.getRootLogger().setLevel(Level.INFO);
-        ConsoleAppender a = (ConsoleAppender) Logger.getRootLogger().getAllAppenders().nextElement();
-        a.setLayout(new PatternLayout("%d{ABSOLUTE} %5p %c{1}:%L - [%t] %m%n"));
 
+    public static void main(String[] args) {
         try {
             printCreateSite();
             printCreateAndGetSipPeer();
@@ -37,7 +27,6 @@ public static void main(String[] args) throws Exception {
         } catch (Exception e) {
             System.out.println("Got error: " + e.getMessage());
         }
-
     }
 
     private static void printAvailableNpaNxx() throws Exception {
@@ -209,7 +198,6 @@ private static void printCreateAndGetSipPeer() throws Exception {
 
         peer = SipPeer.create(getClient(), SITE.getId(), peer);
         System.out.println("Created SipPeer: " + peer.getPeerId());
-        SIP_PEER = peer;
 
         printMessage("Ending create and get sip peer");
     }
@@ -244,9 +232,9 @@ private static SipPeer getFirstSipPeer() throws Exception {
 
     private static IrisClient getClient() {
         Map<String, String> env = System.getenv();
-        String accountId = env.get("BANDWIDTH_IRIS_ACCOUNTID");
-        String username = env.get("BANDWIDTH_IRIS_USERNAME");
-        String password = env.get("BANDWIDTH_IRIS_PASSWORD");
+        String accountId = env.get("BW_ACCOUNT_ID");
+        String username = env.get("BW_USERNAME");
+        String password = env.get("BW_PASSWORD");
         String url = env.get("BANDWIDTH_IRIS_URL");
 
         return new IrisClient(url, accountId, username, password, "v1.0");
diff --git a/src/main/java/com/bandwidth/iris/sdk/model/AvailableNpaNxx.java b/src/main/java/com/bandwidth/iris/sdk/model/AvailableNpaNxx.java
@@ -28,7 +28,7 @@ public class AvailableNpaNxx {
     @XmlElement(name = "Quantity")
     private int quantity;
     @XmlElement(name = "State")
-    private int state;
+    private String state;
 
     public static List<AvailableNpaNxx> list(IrisClient client, Map<String, Object> query)
             throws Exception {
@@ -75,11 +75,11 @@ public void setQuantity(int quantity) {
         this.quantity = quantity;
     }
 
-    public int getState() {
+    public String getState() {
         return state;
     }
 
-    public void setState(int state) {
+    public void setState(String state) {
         this.state = state;
     }
 }
diff --git a/src/main/java/com/bandwidth/iris/sdk/model/LATASearchAndOrderType.java b/src/main/java/com/bandwidth/iris/sdk/model/LATASearchAndOrderType.java
@@ -8,7 +8,7 @@
 @XmlRootElement(name = "LATASearchAndOrderType")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class LATASearchAndOrderType {
-    @XmlElement(name = "Lata")
+    @XmlElement(name = "LATA")
     private String lata;
 
     public String getLata() {
diff --git a/src/main/java/com/bandwidth/iris/sdk/model/LidbTnGroup.java b/src/main/java/com/bandwidth/iris/sdk/model/LidbTnGroup.java
@@ -17,7 +17,7 @@ public class LidbTnGroup {
     @XmlElement(name = "UseType")
     private String useType;
 
-    @XmlElement(name = "Visibilty")
+    @XmlElement(name = "Visibility")
     private String visibility;
 
     public List<String> getTelephoneNumberList() {
diff --git a/src/main/java/com/bandwidth/iris/sdk/model/Reservation.java b/src/main/java/com/bandwidth/iris/sdk/model/Reservation.java
@@ -6,7 +6,6 @@
 import com.bandwidth.iris.sdk.utils.XmlUtils;
 
 import org.apache.http.HttpStatus;
-import org.apache.log4j.Logger;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -19,7 +18,6 @@
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Reservation extends BaseModel {
 
-    private static final Logger LOG = Logger.getLogger(Site.class);
     @XmlElement(name = "ReservationId")
     private String reservationId;
     @XmlElement(name = "AccountId")
diff --git a/src/main/java/com/bandwidth/iris/sdk/model/TelephoneNumber.java b/src/main/java/com/bandwidth/iris/sdk/model/TelephoneNumber.java
@@ -16,7 +16,7 @@ public class TelephoneNumber {
     @XmlElement(name = "City")
     protected String city;
 
-    @XmlElement(name = "Lata")
+    @XmlElement(name = "LATA")
     protected String lata;
 
     @XmlElement(name = "State")
diff --git a/src/main/java/com/bandwidth/iris/sdk/utils/XmlUtils.java b/src/main/java/com/bandwidth/iris/sdk/utils/XmlUtils.java
@@ -1,7 +1,5 @@
 package com.bandwidth.iris.sdk.utils;
 
-import org.apache.log4j.Logger;
-
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -14,8 +12,6 @@
 
 public class XmlUtils {
 
-    private static final Logger LOG = Logger.getLogger(XmlUtils.class);
-
     private static XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
 
     public static <T> T fromXml(String responseBody, Class<T> c) throws JAXBException, XMLStreamException {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class AvailableNpaNxx {`
`28`	`28`	`@XmlElement(name = "Quantity")`
`29`	`29`	`private int quantity;`
`30`	`30`	`@XmlElement(name = "State")`
`31`		`- private int state;`
	`31`	`+ private String state;`
`32`	`32`
`33`	`33`	`public static List<AvailableNpaNxx> list(IrisClient client, Map<String, Object> query)`
`34`	`34`	`throws Exception {`
`@@ -75,11 +75,11 @@ public void setQuantity(int quantity) {`
`75`	`75`	`this.quantity = quantity;`
`76`	`76`	`}`
`77`	`77`
`78`		`- public int getState() {`
	`78`	`+ public String getState() {`
`79`	`79`	`return state;`
`80`	`80`	`}`
`81`	`81`
`82`		`- public void setState(int state) {`
	`82`	`+ public void setState(String state) {`
`83`	`83`	`this.state = state;`
`84`	`84`	`}`
`85`	`85`	`}`