Cleanup (#72)

milismsft · web-flow · commit f331d99c1890 · 2019-10-05T14:27:56.000-07:00
diff --git a/dashboard-web-app/pom.xml b/dashboard-web-app/pom.xml
@@ -16,9 +16,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.1.7.RELEASE</version>
-        <!--
-        <version>1.5.8.RELEASE</version>
-        -->
     </parent>
 
     <properties>
@@ -325,39 +322,6 @@
                 </configuration>
             </plugin>
 
-
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
-                <executions>
-                    <execution>
-                        <id>validate</id>
-                        <phase>validate</phase>
-                        <configuration>
-                            <configLocation>${project.basedir}/checkstyle.xml</configLocation>
-                            <encoding>UTF-8</encoding>
-                            <consoleOutput>true</consoleOutput>
-                            <failsOnError>true</failsOnError>
-                            <failOnViolation>true</failOnViolation>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <resourceIncludes>**/*</resourceIncludes>
-                        </configuration>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <linkXRef>false</linkXRef>
-                </configuration>
-                <inherited>true</inherited>
-            </plugin>
-
-            -->
-
-
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/controller/ProductsInventoryController.java b/dashboard-web-app/src/main/java/org/inventory/hub/controller/ProductsInventoryController.java
@@ -41,9 +41,6 @@ public Map<String, Object> home() {
         return model;
     }
 
-    /**
-     * HTTP GET
-     */
     @RequestMapping(value = "/api/products/{productName}",
             method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_VALUE})
     public ResponseEntity<?> getProduct(@PathVariable("productName") String productName) {
@@ -88,9 +85,6 @@ private static <E> Collection<E> makeCollection(Iterable<E> iter) {
         return list;
     }
 
-    /**
-     * HTTP GET ALL
-     */
     @RequestMapping(value = "/api/products", method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_VALUE})
     public ResponseEntity<?> getProducts() {
         try {
@@ -165,9 +159,6 @@ public ResponseEntity<?> getProducts() {
         }
     }
 
-    /**
-     * HTTP GET ALL
-     */
     @RequestMapping(value = "/api/locations", method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_VALUE})
     public ResponseEntity<?> getLocations() {
         try {
diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/controller/TransactionsController.java b/dashboard-web-app/src/main/java/org/inventory/hub/controller/TransactionsController.java
@@ -21,9 +21,6 @@ public class TransactionsController {
     public TransactionsController() {
     }
 
-    /**
-     * HTTP GET ALL
-     */
     @RequestMapping(value = "/api/transactions", method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_VALUE})
     public ResponseEntity<?> getTransactions() {
 
diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/dao/ProductsInventoryRepository.java b/dashboard-web-app/src/main/java/org/inventory/hub/dao/ProductsInventoryRepository.java
@@ -9,9 +9,6 @@
 import org.inventory.hub.model.ProductsInventory;
 import org.springframework.stereotype.Repository;
 
-// import java.util.List;
-
 @Repository
 public interface ProductsInventoryRepository extends ReactiveCosmosRepository<ProductsInventory, String> {
-    // List<ProductsInventory> findByProductName(String productName);
 }
diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/event/PointOfTransaction.java b/dashboard-web-app/src/main/java/org/inventory/hub/event/PointOfTransaction.java
@@ -10,9 +10,6 @@
 
 public class PointOfTransaction {
 
-//    @JsonProperty(value = "id")
-//    private String id;
-
     @JsonProperty(value = "location")
     private String location;
 
@@ -29,14 +26,6 @@ public PointOfTransaction(){
 
     }
 
-//    public String getId(){
-//        return id;
-//    }
-//
-//    public void setId(String id){
-//        this.id = id;
-//    }
-
     public String getLocation(){
         return location;
     }
diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/event/TransactionsFIFO.java b/dashboard-web-app/src/main/java/org/inventory/hub/event/TransactionsFIFO.java
@@ -41,7 +41,6 @@ public void addFirst (Transaction transaction) {
         if (webSocket != null) {
             String message = "{ \"name\":\"" + transaction.toString() + "\"}";
             System.out.println("Sending to /topic/reply with message = " + message);
-            //webSocket.convertAndSend("/app/message", message);
             webSocket.convertAndSend("/topic/reply", message);
         }
 		else
diff --git a/dashboard-web-app/src/main/java/org/inventory/hub/event/WebSocketController.java b/dashboard-web-app/src/main/java/org/inventory/hub/event/WebSocketController.java
@@ -24,7 +24,6 @@ public class WebSocketController {
     @SendTo("/topic/reply")
 	public String processMessageFromClient(@Payload String message) throws Exception {
 		System.out.println("Process Message From Client == " + message);
-        // String name = new Gson().fromJson(message, Map.class).get("name").toString();
 		return message;
 	}
 	
diff --git a/dashboard-web-app/src/main/resources/static/Views/Home.html b/dashboard-web-app/src/main/resources/static/Views/Home.html
@@ -47,9 +47,6 @@
                     </div>
                 </div>
                 <table id="product-table" cellpadding="10" cellspacing="5" border="2" valign="top" style="text-align:right; padding-right: 5px; padding-left: 5px">
-                    <!--
-                    <tr><td>There are no items...</td></tr>
-                    -->
                     <tr>
                         <th ng-hide="locations === null"></th>
                         <th ng-repeat="(key, value) in locations | orderBy:key:true">  {{key}}  </th>
diff --git a/dashboard-web-app/src/main/resources/static/app.js b/dashboard-web-app/src/main/resources/static/app.js
@@ -43,7 +43,6 @@ function disconnect() {
 
 function showGreeting(message) {
     console.log("Received = " + message);
-    // $("#greetings").append("<tr><td>" + message + "</td></tr>");
     $("#greetings").prepend("<tr><td>" + message + "</td></tr>");
 
 }
diff --git a/dashboard-web-app/src/main/resources/static/index.html b/dashboard-web-app/src/main/resources/static/index.html
@@ -64,7 +64,6 @@
     <script src="libs/sockjs/sockjs.min.js" type="text/javascript"></script>
     <script src="libs/stomp-websocket/lib/stomp.min.js" type="text/javascript"></script>
     <script src="libs/lodash/dist/lodash.min.js"></script> 
-<!--    <script src="Scripts/receiver.js" type="text/javascript"></script>-->
     <script src="Scripts/receiverCtrl.js" type="text/javascript"></script>
     <script src="Scripts/receiverSvc.js" type="text/javascript"></script>
 
diff --git a/function-apps/Notify-Inventory/src/main/java/org/inventory/hub/NotifyInventoryUpdate.java b/function-apps/Notify-Inventory/src/main/java/org/inventory/hub/NotifyInventoryUpdate.java
@@ -73,20 +73,3 @@ static final class PointOfTransactionLocation {
     }
 
 }
-
-/*
-//        @EventHubTrigger(name = "dataInput", eventHubName = "TRANSACTIONS_EVENT_HUB_NAME",
-//            connection = "TRANSACTIONS_EVENT_HUB_CONNECTION_STRING",
-//            consumerGroup = "TRANSACTIONS_EVENT_HUB_CONSUMER_GROUP_NAME") String dataInput,
-//
-//        context.getLogger().info("Java Event Hub Notification trigger processed a request: " + dataInput);
-//
-//        JSONObject eventHubMessage = new JSONObject(dataInput);
-//        eventHubMessage.put("id", java.util.UUID.randomUUID().toString());
-//        context.getLogger().info("message: " + eventHubMessage.toString());
-//        dataOutput.setValue(eventHubMessage.toString());
-//
-//        JSONArray jsonArray = new JSONArray(document);
-//        JSONObject eventHubMessage = jsonArray.getJSONObject(0);
-
- */
diff --git a/function-apps/Point-Of-Transaction/pom.xml b/function-apps/Point-Of-Transaction/pom.xml
@@ -56,16 +56,6 @@
             <artifactId>gson</artifactId>
             <version>2.8.2</version>
         </dependency>
-        <!--<dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-eventhubs</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-documentdb</artifactId>
-            <version>LATEST</version>
-        </dependency>-->
 
         <!-- Test -->
         <dependency>
@@ -85,11 +75,6 @@
             <artifactId>json</artifactId>
             <version>20171018</version>
         </dependency>
-        <!--<dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.2</version>
-        </dependency>-->
     </dependencies>
 
     <build>
diff --git a/function-apps/Point-Of-Transaction/src/main/java/org/inventory/hub/POT.java b/function-apps/Point-Of-Transaction/src/main/java/org/inventory/hub/POT.java
@@ -47,9 +47,6 @@ public void sell(@TimerTrigger(name = "timerInfo", schedule = "*/30 * * * * *")
         Output.setValue(gson.toJson(transactionEvent));
     }
 
-    /**
-     * actual application-payload, ex: a telemetry event
-     */
     /**
      * actual application-payload, ex: an inventory update
      */

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@ public class TransactionsController {`
`21`	`21`	`public TransactionsController() {`
`22`	`22`	`}`
`23`	`23`
`24`		`- /**`
`25`		`- * HTTP GET ALL`
`26`		`- */`
`27`	`24`	`@RequestMapping(value = "/api/transactions", method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_VALUE})`
`28`	`25`	`public ResponseEntity<?> getTransactions() {`
`29`	`26`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,6 @@`
`9`	`9`	`import org.inventory.hub.model.ProductsInventory;`
`10`	`10`	`import org.springframework.stereotype.Repository;`
`11`	`11`
`12`		`-// import java.util.List;`
`13`		`-`
`14`	`12`	`@Repository`
`15`	`13`	`public interface ProductsInventoryRepository extends ReactiveCosmosRepository<ProductsInventory, String> {`
`16`		`- // List<ProductsInventory> findByProductName(String productName);`
`17`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public void addFirst (Transaction transaction) {`
`41`	`41`	`if (webSocket != null) {`
`42`	`42`	`String message = "{ \"name\":\"" + transaction.toString() + "\"}";`
`43`	`43`	`System.out.println("Sending to /topic/reply with message = " + message);`
`44`		`- //webSocket.convertAndSend("/app/message", message);`
`45`	`44`	`webSocket.convertAndSend("/topic/reply", message);`
`46`	`45`	`}`
`47`	`46`	`else`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public class WebSocketController {`
`24`	`24`	`@SendTo("/topic/reply")`
`25`	`25`	`public String processMessageFromClient(@Payload String message) throws Exception {`
`26`	`26`	`System.out.println("Process Message From Client == " + message);`
`27`		`- // String name = new Gson().fromJson(message, Map.class).get("name").toString();`
`28`	`27`	`return message;`
`29`	`28`	`}`
`30`	`29`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ function disconnect() {`
`43`	`43`
`44`	`44`	`function showGreeting(message) {`
`45`	`45`	`console.log("Received = " + message);`
`46`		`- // $("#greetings").append("<tr><td>" + message + "</td></tr>");`
`47`	`46`	`$("#greetings").prepend("<tr><td>" + message + "</td></tr>");`
`48`	`47`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,6 @@ public void sell(@TimerTrigger(name = "timerInfo", schedule = "/30 * * * *")`
`47`	`47`	`Output.setValue(gson.toJson(transactionEvent));`
`48`	`48`	`}`
`49`	`49`
`50`		`- /**`
`51`		`- * actual application-payload, ex: a telemetry event`
`52`		`- */`
`53`	`50`	`/**`
`54`	`51`	`* actual application-payload, ex: an inventory update`
`55`	`52`	`*/`