Merge pull request #2 from ndkhanh-axonivy/chore/refactor-code

refactor: format code and remove unused code

.gitignore

@@ -1,2 +1,19 @@
+# general
+Thumbs.db
+.DS_Store
+*~
+*.log
 
-ups-oauth-feature/src/com/ups/auth/OAuth.java
+# java
+*.class
+hs_err_pid*
+
+# maven
+target/
+lib/mvn-deps/
+
+# ivy
+classes/
+src_dataClasses/
+src_wsproc/
+logs/

pom.xml

@@ -7,6 +7,7 @@
   <packaging>pom</packaging>
 
   <modules>
+  	<module>ups-oauth-feature</module>
     <module>${project.name}</module>
     <module>${project.name}-demo</module>
     <module>${project.name}-test</module>

ups-connector-demo/src/UpsBean.java

@@ -5,33 +5,20 @@
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ViewScoped;
 
-import com.ups.wwwcie.api.client.PickupCreationRequest;
-import com.ups.wwwcie.api.client.PickupCreationRequestPickupAddress;
-import com.ups.wwwcie.api.client.PickupCreationRequestPickupDateInfo;
 import com.ups.wwwcie.api.client.PickupCreationRequestPickupPiece;
-import com.ups.wwwcie.api.client.PickupCreationRequestShipper;
-import com.ups.wwwcie.api.client.PickupCreationRequestTotalWeight;
 import com.ups.wwwcie.api.client.XAVRequestAddressKeyFormat;
 
 @ViewScoped
 @ManagedBean
 public class UpsBean {
 
-	private DateFormat timeFormatter = new SimpleDateFormat("HH:mm");
-	private DateFormat dateFormatter = new SimpleDateFormat("dd.MM.yyyy");
-	private DateFormat inputDateFormatter = new SimpleDateFormat("yyyyMMdd");
-	private DateFormat inputTimeFormatter = new SimpleDateFormat("HHmmss");
+	private final DateFormat timeFormatter = new SimpleDateFormat("HH:mm");
+	private final DateFormat dateFormatter = new SimpleDateFormat("dd.MM.yyyy");
+	private final DateFormat inputDateFormatter = new SimpleDateFormat("yyyyMMdd");
+	private final DateFormat inputTimeFormatter = new SimpleDateFormat("HHmmss");
 	private XAVRequestAddressKeyFormat addressKeyFormat = new XAVRequestAddressKeyFormat();
 	private PickupCreationRequestPickupPiece pickupPiece = new PickupCreationRequestPickupPiece();
 
-	public void init(PickupCreationRequest pickupCreationRequest) {
-		pickupCreationRequest = new PickupCreationRequest();
-		pickupCreationRequest.setShipper(new PickupCreationRequestShipper());
-		pickupCreationRequest.setPickupDateInfo(new PickupCreationRequestPickupDateInfo());
-		pickupCreationRequest.setPickupAddress(new PickupCreationRequestPickupAddress());
-		pickupCreationRequest.setTotalWeight(new PickupCreationRequestTotalWeight());
-	}
-
 	public String getFormatedDate(String date) throws ParseException {
 		return dateFormatter.format(inputDateFormatter.parse(date));
 	}
@@ -44,18 +31,10 @@ public DateFormat getTimeFormatter() {
 		return timeFormatter;
 	}
 
-	public void setTimeFormatter(DateFormat timeFormatter) {
-		this.timeFormatter = timeFormatter;
-	}
-
 	public DateFormat getDateFormatter() {
 		return dateFormatter;
 	}
 
-	public void setDateFormatter(DateFormat dateFormatter) {
-		this.dateFormatter = dateFormatter;
-	}
-
 	public XAVRequestAddressKeyFormat getAddressKeyFormat() {
 		return addressKeyFormat;
 	}

ups-connector-demo/src_hd/ups/connector/demo/Address/Address.xhtml

@@ -9,12 +9,10 @@
 	<ui:composition template="/layouts/basic-10.xhtml">
 		<ui:define name="title">Address</ui:define>
 		<ui:define name="content">
-
 			<h3>Address Validation</h3>
 			<p>The UPS Address Validation API's database is updated every
 				month with new address information from USPS. Address Validation for
 				City, State, Zip is only available for the United States.</p>
-
 			<h:form id="form">
 				<p:growl id="growl" showDetail="false" />
 				<p:panelGrid columns="2" layout="grid"
@@ -26,16 +24,13 @@
 						value="#{upsBean.addressKeyFormat.consigneeName}" />
 
 					<p:outputLabel for="region" value="Region" />
-					<p:inputText id="region"
-						value="#{upsBean.addressKeyFormat.region}" />
+					<p:inputText id="region" value="#{upsBean.addressKeyFormat.region}" />
 
-					<p:outputLabel for="politicalDivision1"
-						value="State/Province" />
+					<p:outputLabel for="politicalDivision1" value="State/Province" />
 					<p:inputText id="politicalDivision1"
 						value="#{upsBean.addressKeyFormat.politicalDivision1}" />
 
-					<p:outputLabel for="politicalDivision2"
-						value="City or Town name" />
+					<p:outputLabel for="politicalDivision2" value="City or Town name" />
 					<p:inputText id="politicalDivision2"
 						value="#{upsBean.addressKeyFormat.politicalDivision2}" />
 
@@ -49,7 +44,6 @@
 					<p:inputText id="postcodeExtendedLow"
 						value="#{upsBean.addressKeyFormat.postcodeExtendedLow}" />
 
-
 					<p:outputLabel for="urbanization" value="Urbanization" />
 					<p:inputText id="urbanization"
 						value="#{upsBean.addressKeyFormat.urbanization}" />
@@ -61,13 +55,12 @@
 				</p:panelGrid>
 				<br />
 				<div class="command-btns">
-					<p:commandLink id="cancel"
-						actionListener="#{logic.close}" value="Cancel" immediate="true"/>
+					<p:commandLink id="cancel" actionListener="#{logic.close}"
+						value="Cancel" immediate="true" />
 					<p:commandButton id="validate" actionListener="#{logic.validate}"
 						value="Validate" update="form" icon="pi pi-check" />
 				</div>
 			</h:form>
-
 		</ui:define>
 	</ui:composition>
 </h:body>

ups-connector-demo/src_hd/ups/connector/demo/PickupCancel/PickupCancel.xhtml

@@ -10,11 +10,9 @@
 	<ui:composition template="/layouts/basic-10.xhtml">
 		<ui:define name="title">PickupCancel</ui:define>
 		<ui:define name="content">
-
 			<h3>Pickup Cancel</h3>
 			<p>Using the Pickup API, applications can cancel previously
 				scheduled pickups.</p>
-
 			<h:form id="form">
 				<p:growl id="growl" showDetail="false" />
 				<p:panelGrid columns="2" layout="grid"
@@ -23,7 +21,7 @@
 
 					<p:outputLabel for="cancelBy" value="Cancel By" />
 					<p:selectOneMenu id="cancelBy" value="#{data.cancelBy}">
-					<p:ajax event="valueChange" update="form" />
+						<p:ajax event="valueChange" update="form" />
 						<f:selectItem itemLabel="Account Number" itemValue="01" />
 						<f:selectItem itemLabel="PRN" itemValue="02" />
 					</p:selectOneMenu>
@@ -33,29 +31,26 @@
 
 					<p:outputLabel for="transactionSrc" value="Transaction Src" />
 					<p:inputText id="transactionSrc" value="#{data.transactionSrc}" />
-					
+
 					<c:if test="#{data.cancelBy eq 01}">
 						<p:outputLabel for="accountNumber" value="Account number" />
-						<p:inputText id="accountNumber" value="#{data.accountNumber}" required="true"/>
+						<p:inputText id="accountNumber" value="#{data.accountNumber}"
+							required="true" />
 					</c:if>
 
 					<c:if test="#{data.cancelBy eq 02}">
 						<p:outputLabel for="prn" value="PRN" />
-						<p:inputText id="prn" value="#{data.prn}" required="true"/>
+						<p:inputText id="prn" value="#{data.prn}" required="true" />
 					</c:if>
-
-
-
 				</p:panelGrid>
 				<br />
 				<div class="command-btns">
 					<p:commandLink id="cancel" actionListener="#{logic.close}"
 						value="Cancel" immediate="true" />
 					<p:commandButton id="pickupCance" actionListener="#{logic.callAPI}"
-						value="Cancel Pickup" update="form" icon="pi pi-check"/>
+						value="Cancel Pickup" update="form" icon="pi pi-check" />
 				</div>
 			</h:form>
-
 		</ui:define>
 	</ui:composition>
 </h:body>

ups-connector-demo/src_hd/ups/connector/demo/PickupCreation/PickupCreation.xhtml

@@ -10,14 +10,11 @@
 	<ui:composition template="/layouts/basic-10.xhtml">
 		<ui:define name="title">PickupCreation</ui:define>
 		<ui:define name="content">
-			<p:remoteCommand autoRun="true"
-				actionListener="#{upsBean.init(data.pickupCreationRequest)}" />
 			<h3>Pickup Creation</h3>
 			<p>Using the Pickup API, applications can schedule pickups.</p>
 			<p:growl />
-
 			<h:form id="form">
-			<p:growl id="growl" showDetail="false" />
+				<p:growl id="growl" showDetail="false" />
 				<p:fieldset legend="Shipper Info">
 					<p:panelGrid columns="5"
 						styleClass="ui-panelgrid-blank ui-fluid width-100"
@@ -32,7 +29,6 @@
 						<p:inputText id="accountCountryCode" required="true"
 							value="#{data.pickupCreationRequest.shipper.account.accountCountryCode}" />
 					</p:panelGrid>
-
 				</p:fieldset>
 				<p:fieldset legend="Pickup Date Info" styleClass="mt-8">
 					<p:panelGrid columns="5"
@@ -49,11 +45,9 @@
 
 						<p:outputLabel for="pickupDate" value="Pickup Date" />
 						<p:inputText id="pickupDate" required="true"
-							value="#{data.pickupCreationRequest.pickupDateInfo.pickupDate}"  />
+							value="#{data.pickupCreationRequest.pickupDateInfo.pickupDate}" />
 					</p:panelGrid>
-
 				</p:fieldset>
-
 				<p:fieldset legend="Address" styleClass="mt-8">
 					<p:panelGrid columns="5"
 						styleClass="ui-panelgrid-blank ui-fluid width-100"
@@ -119,7 +113,6 @@
 						<p:inputText id="phoneExtension"
 							value="#{data.pickupCreationRequest.pickupAddress.phone.extension}" />
 					</p:panelGrid>
-
 				</p:fieldset>
 				<p:fieldset legend="Pickup Piece" styleClass="mt-8">
 					<p:panelGrid columns="5"
@@ -148,7 +141,6 @@
 							<f:selectItem itemLabel="Pallet" itemValue="03" />
 						</p:selectOneMenu>
 					</p:panelGrid>
-
 				</p:fieldset>
 				<p:fieldset legend="Total weight" styleClass="mt-8">
 					<p:panelGrid columns="5"
@@ -163,7 +155,6 @@
 						<p:inputText id="unitOfMeasurement" required="true"
 							value="#{data.pickupCreationRequest.totalWeight.unitOfMeasurement}" />
 					</p:panelGrid>
-
 				</p:fieldset>
 				<p:fieldset legend="Other Infomation" styleClass="mt-8">
 					<p:panelGrid columns="5"
@@ -222,13 +213,11 @@
 				</p:fieldset>
 				<br />
 				<div class="command-btns">
-					<p:commandLink id="cancel"
-						actionListener="#{logic.close}" value="Cancel" />
+					<p:commandLink id="cancel" actionListener="#{logic.close}"
+						value="Cancel" />
 					<p:commandButton id="proceed" actionListener="#{logic.callAPI}"
 						value="Proceed" update="form" icon="pi pi-check" />
 				</div>
-
-
 				<c:if test="#{data.pickupCreationResponse ne null}">
 					<hr />
 					<h3>Pickup Creation Response</h3>
@@ -247,14 +236,10 @@
 						<p:outputLabel for="rateStatus" value="Rate Status" />
 						<p:inputText id="rateStatus"
 							value="#{data.pickupCreationResponse.rateStatus.description}" />
-
 					</p:panelGrid>
-
 				</c:if>
 			</h:form>
-
 		</ui:define>
 	</ui:composition>
 </h:body>
-
 </html>

ups-connector-demo/src_hd/ups/connector/demo/TrackDetail/TrackDetail.xhtml

@@ -10,40 +10,41 @@
 	<ui:composition template="/layouts/basic-10.xhtml">
 		<ui:define name="title">TrackDetail</ui:define>
 		<ui:define name="content">
-
 			<h3>Get single tracking</h3>
-			<p>UPS uses tracking numbers to identify and track packages in its system. Applications can use this tracking number to track, locate, and verify arrival of a package. A successful query by tracking number returns information for the specific package within a shipment. 
-				For example, if a package shipment contained four individual packages, the query response would show a shipment containing the one package out of four with the associated tracking number.</p>
-
+			<p>UPS uses tracking numbers to identify and track packages in
+				its system. Applications can use this tracking number to track,
+				locate, and verify arrival of a package. A successful query by
+				tracking number returns information for the specific package within
+				a shipment. For example, if a package shipment contained four
+				individual packages, the query response would show a shipment
+				containing the one package out of four with the associated tracking
+				number.</p>
 			<h:form id="form">
 				<p:growl id="growl" showDetail="false" />
 				<p:panelGrid id="request" columns="2" layout="grid"
 					styleClass="ui-panelgrid-blank ui-fluid"
 					columnClasses="ui-g-12 ui-md-3 ui-lg-2, ui-g-12 ui-md-9 ui-lg-4, ui-g-12 ui-md-3 ui-lg-2, ui-g-12 ui-md-9 ui-lg-4">
-
 					<p:outputLabel for="inquiryNumber" value="Tracking number" />
 					<p:inputText id="inquiryNumber"
-						value="#{data.trackingRequest.inquiryNumber}" required="true"/>
+						value="#{data.trackingRequest.inquiryNumber}" required="true" />
 
 					<p:outputLabel for="locale" value="Locale" />
 					<p:inputText id="locale" value="#{data.trackingRequest.locale}" />
 
 					<p:outputLabel for="transId" value="Trans Id" />
 					<p:inputText id="transId" value="#{data.trackingRequest.transId}" />
 
-
 					<p:outputLabel for="transactionSrc" value="Transaction Src" />
 					<p:inputText id="transactionSrc"
 						value="#{data.trackingRequest.transactionSrc}" />
-
 				</p:panelGrid>
 				<br />
 				<div class="command-btns">
-					<p:commandLink id="cancel"
-						actionListener="#{logic.close}" value="Cancel" immediate="true"/>
+					<p:commandLink id="cancel" actionListener="#{logic.close}"
+						value="Cancel" immediate="true" />
 					<p:commandButton id="search"
-						actionListener="#{logic.getTracking(data.trackingRequest)}" value="Search"
-						update="form" icon="pi pi-check" />
+						actionListener="#{logic.getTracking(data.trackingRequest)}"
+						value="Search" update="form" icon="pi pi-check" />
 				</div>
 				<c:if test="#{data.trackApiResponse.trackResponse ne null}">
 					<hr />
@@ -52,7 +53,6 @@
 						rendered="#{data.trackApiResponse ne null}" columns="2"
 						layout="grid" styleClass="ui-panelgrid-blank ui-fluid"
 						columnClasses="ui-g-12 ui-md-3 ui-lg-2, ui-g-12 ui-md-9 ui-lg-4, ui-g-12 ui-md-3 ui-lg-2, ui-g-12 ui-md-9 ui-lg-4">
-
 						<p:outputLabel for="inquiryNumber1" value="Tracking Number" />
 						<p:inputText id="inquiryNumber1"
 							value="#{data.trackApiResponse.trackResponse.shipment[0].package[0].trackingNumber}" />
@@ -67,23 +67,20 @@
 						<p:inputText id="deliveryTime"
 							value="#{upsBean.getFormatedTime(data.trackApiResponse.trackResponse.shipment[0].package[0].deliveryTime.endTime)}" />
 					</p:panelGrid>
-
 					<h4>Package Activity</h4>
 					<p:dataTable id="activity" var="activity"
-						value="#{data.trackApiResponse.trackResponse.shipment[0].package[0].activity}" rendered="#{data.trackApiResponse.trackResponse ne null}">
+						value="#{data.trackApiResponse.trackResponse.shipment[0].package[0].activity}"
+						rendered="#{data.trackApiResponse.trackResponse ne null}">
 						<p:column headerText="Location">
 							<h:outputText
 								value="#{activity.location.address.city} #{activity.location.address.country}" />
 						</p:column>
-
 						<p:column headerText="Status">
 							<h:outputText value="#{activity.status.description}" />
 						</p:column>
-
 						<p:column headerText="Date">
 							<h:outputText value="#{upsBean.getFormatedDate(activity.date)}" />
 						</p:column>
-
 						<p:column headerText="Time">
 							<h:outputText value="#{upsBean.getFormatedTime(activity.time)}" />
 						</p:column>