Merge branch 'Eilerts_branch' into 'master'

Updated the project structure and added comments

See merge request mesji/bacheloroppgave_2022!15

src/main/java/com/application/Credentials.java

-package com.application;
-
-public class Credentials {
-    String projectId = "sf-drying-optimization";
-}

src/main/java/com/application/DataBase/DB.java → src/main/java/com/application/DB/DB.java

-package com.application.DataBase;
-
-import com.application.Credentials;
+package com.application.DB;
 
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.auth.oauth2.ServiceAccountCredentials;
 import com.google.cloud.bigquery.BigQuery;
-import com.google.cloud.bigquery.BigQueryError;
 import com.google.cloud.bigquery.BigQueryOptions;
 import com.google.cloud.bigquery.FieldValueList;
-import com.google.cloud.bigquery.InsertAllRequest;
-import com.google.cloud.bigquery.InsertAllResponse;
 import com.google.cloud.bigquery.Job;
 import com.google.cloud.bigquery.JobInfo;
 import com.google.cloud.bigquery.QueryJobConfiguration;
-import com.google.cloud.bigquery.JobStatistics;
 import com.google.cloud.bigquery.TableResult;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-
 
 public class DB {
 
-    Credentials credentialsObject;
-
-    private static void insertSampleData() {
-        // Step 1: Initialize BigQuery service
-        BigQuery bigquery = BigQueryOptions.newBuilder().setProjectId("sf-drying-optimization")
-                .build().getService();
-
-        // Step 2: Create insertAll (streaming) request
-        InsertAllRequest insertAllRequest = getInsertRequest();
-
-        // Step 3: Insert data into table
-        InsertAllResponse response = bigquery.insertAll(insertAllRequest);
-
-        // Step 4: Check for errors and print results
-        if (response.hasErrors()) {
-            for (Map.Entry<Long, List<BigQueryError>> entry : response.getInsertErrors()
-                    .entrySet()) {
-                System.out.printf("error in entry %d: %s", entry.getKey(),
-                        entry.getValue().toString());
-            }
-            return;
-        }
-        System.out.println("inserted successfully");
-    }
-
-    // To create a streaming insert request, we need to specify the table and dataset id
-    // and create the rows we want to insert
-    private static InsertAllRequest getInsertRequest() {
-        String datasetId = "sample_dataset";
-        String tableId = "vegetables";
-        return InsertAllRequest.newBuilder(datasetId, tableId).addRow(getRow(1, "carrot"))
-                .addRow(getRow(2, "beans")).build();
-
-    }
-
-    // each row is a map with the row name as the key and row value as the value
-    // since the value type is "Object" it can take any arbitrary type, based on
-    // the datatype of the row defined on BigQuery
-    private static Map<String, Object> getRow(int id, String vegetableName) {
-        Map<String, Object> rowMap = new HashMap<String, Object>();
-        rowMap.put("id", id);
-        rowMap.put("name", vegetableName);
-        return rowMap;
-    }
-
-    public static void main(String... args) throws Exception {
-        getFromExistingTable();
-    }
-
-    public static GoogleCredentials getCredentials() throws Exception {
+    private static GoogleCredentials getCredentials() throws Exception {
         File credentialsPath = new File(".\\src\\main\\resources\\com.application\\sf-drying-optimization-1e234ad2b0f4.json");
 
         // Load credentials from JSON key file. If you can't set the GOOGLE_APPLICATION_CREDENTIALS
@@ -87,7 +28,7 @@ public class DB {
         return credentials;
     }
 
-    private static void getFromExistingTable() throws Exception {
+    public static void getFromExistingTable() throws Exception {
 
         // Step 1: Initialize BigQuery service
         // Here we set our project ID and get the `BigQuery` service object
@@ -134,37 +75,4 @@ public class DB {
             System.out.printf("%s\t%d\n", timeStamp, variantValue);
         }
     }
-
-    private static void insertViaQuery() throws Exception {
-
-        // Step 1: Initialize BigQuery service
-        BigQuery bigquery = BigQueryOptions.newBuilder().setProjectId("sample-project-330313")
-                .build().getService();
-
-        // Step 2: Prepare query job
-        final String INSERT_VEGETABLES =
-                "INSERT INTO `sample-project-330313.sample_dataset.vegetables` (id, name) VALUES (1, 'carrot'), (2, 'beans');";
-        QueryJobConfiguration queryConfig =
-                QueryJobConfiguration.newBuilder(INSERT_VEGETABLES).build();
-
-
-        // Step 3: Run the job on BigQuery
-        Job queryJob = bigquery.create(JobInfo.newBuilder(queryConfig).build());
-        queryJob = queryJob.waitFor();
-        if (queryJob == null) {
-            throw new Exception("job no longer exists");
-        }
-        // once the job is done, check if any error occured
-        if (queryJob.getStatus().getError() != null) {
-            throw new Exception(queryJob.getStatus().getError().toString());
-        }
-
-        // Step 4: Display results
-        // Here, we will print the total number of rows that were inserted
-        JobStatistics.QueryStatistics stats = queryJob.getStatistics();
-        Long rowsInserted = stats.getDmlStats().getInsertedRowCount();
-        System.out.printf("%d rows inserted\n", rowsInserted);
-    }
-
-
 }
\ No newline at end of file

src/main/java/com/application/Main.java

 package com.application;
 
+import com.application.DB.DB;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
 import javafx.stage.Stage;
 
 import java.io.IOException;
 import java.util.Objects;
 
-
+/**
+ * This class launches the application
+ *
+ * @author Eilert Tunheim, Karin Pettersen, Mads Arnesen
+ * @version 1.0.0
+ */
 public class Main extends Application {
-    Button button;
+
+    /**
+     * Starts the application
+     * @param args
+     * @throws IOException
+     */
     public static void main(String[] args) throws IOException {
-        //System.out.println("Hello world!");
-        //Authentication test = explicit();
         launch(args);
     }
 
     /**
-     * Main javafx code
-     * Stage = The whole window
-     * Scene = Content inside the stage. Put buttons and dropdown stuff
+     * Sets the primaryStage and sets the scene for the window.
      * @param primaryStage
      * @throws Exception
      */
     @Override
     public void start(Stage primaryStage) throws Exception {
 
-        // Loading the GUI-fxml file from resources
-        Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/com.application/GUI/graphical_user_interface.fxml")));
+        DB.getFromExistingTable();
 
         // Loading the GUI-fxml file from resources
-         root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/com.application/GUI/input.fxml")));
+        Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/com.application/GUI/graphical_user_interface.fxml")));
 
         // Sets the scene and defines boundaries
         Scene scene = new Scene(root, 1200, 600);