Fixed POM errors and removed references to Assets

Author: SidneyAllen

pom.xml

@@ -110,13 +110,6 @@
 			<url>file://${project.build.directory}/mvn-repo</url>
 		</repository>
 	</distributionManagement>
-	<properties>
-		<!-- github server corresponds to entry in ~/.m2/settings.xml -->
-		<github.global.server>github</github.global.server>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
 	<build>
 		<finalName>Xero-Java-SDK</finalName>
 		<plugins>
@@ -257,7 +250,11 @@
 		</plugins>
 	</reporting>
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<!-- github server corresponds to entry in ~/.m2/settings.xml -->
+		<github.global.server>github</github.global.server>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
 		<swagger-annotations-version>1.5.17</swagger-annotations-version>
 		<google-api-client-version>1.23.0</google-api-client-version>
 		<jersey-common-version>2.25.1</jersey-common-version>

src/main/java/com/xero/api/XeroClient.java

@@ -4,7 +4,6 @@
 import com.xero.api.exception.XeroExceptionHandler;
 import com.xero.api.jaxb.XeroJAXBMarshaller;
 import com.xero.model.*;
-import com.xero.models.assets.*;
 
 import javax.xml.bind.JAXBElement;
 
@@ -1921,41 +1920,4 @@ public ByteArrayInputStream getAttachmentContentById(String endpoint, String gui
         return getInputStream(endpoint + "/" + guid + "/Attachments/" + attachmentid, null, null, accept);
     }
 
-  //Assets
-    public Assets getAssets() throws XeroApiException, ParseException {
-   
-        try {
-            Map<String, String> params = new HashMap<String, String>();
-
-            params.put("Status","REGISTERED");
-            String resource = "https://api.xero.com/assets.xro/1.0/Assets";
-            String response = this.get2(resource, null, params);
-            
-            TypeReference<Assets> typeRef = new TypeReference<Assets>() {};
-            ApiClient apiClient = new ApiClient();
-			
-            return apiClient.getObjectMapper().readValue(response, typeRef);
-    
-        } catch (IOException e) {
-            throw xeroExceptionHandler.convertException(e);
-        }
-    }
-        
-    protected String get2(String resource, Date modifiedAfter, Map<String, String> params) throws IOException {
-		
-    		OAuthRequestResource req = new OAuthRequestResource(config, signerFactory, resource, "GET", null, params,"application/json");
-        req.setToken(token);
-        req.setTokenSecret(tokenSecret);
-        if (modifiedAfter != null) {
-            req.setIfModifiedSince(modifiedAfter);
-        }
-
-        try {
-       		Map<String, String>  resp = req.execute();
-       		Object r = resp.get("content");
-            return r.toString();
-		} catch (IOException ioe) {
-			 throw xeroExceptionHandler.convertException(ioe);
-		}
-	}
 }

src/main/java/com/xero/example/RequestResourceServlet.java

@@ -33,10 +33,6 @@
 import com.xero.api.OAuthRequestResource;
 import com.xero.api.XeroApiException;
 import com.xero.model.*;
-import com.xero.models.assets.*;
-import com.xero.models.assets.BookDepreciationSetting.AveragingMethodEnum;
-import com.xero.models.assets.BookDepreciationSetting.DepreciationCalculationMethodEnum;
-import com.xero.models.assets.BookDepreciationSetting.DepreciationMethodEnum;
 import com.xero.models.feedconnections.*;
 import com.xero.models.feedconnections.FeedConnection.AccountTypeEnum;
 
@@ -216,13 +212,14 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 			}
 
 		} else if(object.equals("Assets")) {
-
+			/* Asset */
+			/*
 			ApiClient apiClient = new ApiClient(config.getAssetsUrl(),null,null,null);
 			AssetApi assetApi = new AssetApi(apiClient);
 			assetApi.setOAuthToken(token, tokenSecret);
 			
-			/* Asset */
-			/*
+			
+			
 			try {
 				Asset asset = new Asset();
 				asset.setAssetName("Computer" + SampleData.loadRandomNum());
@@ -274,15 +271,15 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 			} catch (Exception e) {
 				System.out.println(e.toString());
 			}
-			*/
+			
 			try {
 				Map<String, String> filter = new HashMap<>();			
 				Setting setting = assetApi.getAssetSettings(filter);
 				messages.add("Asset Setting Start date: " + setting.getAssetStartDate());
 			} catch (Exception e) {
 				System.out.println(e.toString());
 			}
-			
+			*/
 
 		} else if(object.equals("Accounts")) {