Automatic code cleanup (#1)

* Add gitignore * Automatic code reformat * Minor code cleaning
AliceO2Group · Aug 22, 2024 · b185af6 · b185af6
1 parent a2c846a
commit b185af6
Show file tree

Hide file tree

Showing 16 changed files with 204 additions and 230 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 bin
-AliDip2BK.jar
+AliDip2BK.jar
+.idea
+STATE
+AliDip2BK.iml
+RunsHistory
diff --git a/AliDip2BK.properties b/AliDip2BK.properties
@@ -1,5 +1,4 @@
-#DNSnode=192.168.1.133
-DNSnode=dipnsgpn1.cern.ch
+DNSnode=dipnsdev.cern.ch
 #in this file we list the Dip Data Providers to subscribe
 DipDataProvidersSubscritionFile=TselectLHC.txt
 # this option will list all the Data Providers than mach this pattern

diff --git a/src/alice/dip/AliDip2BK.java b/src/alice/dip/AliDip2BK.java
@@ -1,10 +1,10 @@
 /*************
-* cil 
-**************/
+ * cil
+ **************/
 
 /*
- *  Main Class 
- *  
+ *  Main Class
+ *
  */
 
 package alice.dip;
@@ -21,58 +21,40 @@
 public class AliDip2BK implements Runnable {
 
 	public static String Version = "2.0  14-Nov-2023";
-	String confFile = "AliDip2BK.properties";
-
-	public static String DNSnode = "dipnsgpn1,dipnsgpn2";
-
-	public static String[] endFillCases = { "CUCU" };
-
+	public static String DNSnode = "dipnsdev.cern.ch";
+	public static String[] endFillCases = {"CUCU"};
 	public static boolean LIST_PARAM = false;
 	static public String LIST_PARAM_PAT = "*";
-
 	static public int DEBUG_LEVEL = 1;
-
 	static public String OUTPUT_FILE = null;
-
-	public static String BKURL = "http://aliecs-kafka-1.cern.ch:4000";
+	public static String BKURL = "http://localhost:4000";
 	public static String BKP_TOKEN = null;
-
 	public static boolean SAVE_PARAMETERS_HISTORY_PER_RUN = false;
-
 	public static String KEEP_RUNS_HISTORY_DIRECTORY = null;
 	public static String KEEP_FILLS_HISTORY_DIRECTORY = null;
-
 	public static String KEEP_STATE_DIR = "STATE/";
-
 	public static String bootstrapServers = "127.0.0.1:9092";
 	public static String KAFKAtopic_SOR = "aliecs.env_state.RUNNING";
 	public static String KAFKAtopic_EOR = "aliecs.env_leave_state.RUNNING";
-
 	public static String KAFKA_group_id = "AliDip";
-
 	public static String STORE_HIST_FILE_DIR = "HistFiles";
-	public String DipParametersFile = null;
-
 	public static boolean SIMULATE_DIP_EVENTS = false;
-
 	public static SimpleDateFormat myDateFormat = new SimpleDateFormat("dd-MM-yy HH:mm");
 	public static SimpleDateFormat logDateFormat = new SimpleDateFormat("dd-MM HH:mm:ss");
-
 	public static double DIFF_ENERGY = 5;
 	public static double DIFF_BETA = 0.001;
 	public static double DIFF_CURRENT = 5;
-
+	public static String ProgPath;
+	public String DipParametersFile = null;
+	String confFile = "AliDip2BK.properties";
 	DipClient client;
 	ProcData process;
 	BKwriter dbw;
 	KC_SOR kcs;
 	KC_EOR kce;
-
 	private long startDate;
 	private long stopDate;
 
-	public static String ProgPath;
-
 	public AliDip2BK() {
 
 		startDate = (new Date()).getTime();
@@ -107,11 +89,26 @@ public AliDip2BK() {
 
 	}
 
+	static public void log(int level, String module, String mess) {
+		if (level >= DEBUG_LEVEL) {
+			String date = logDateFormat.format((new Date()).getTime());
+
+			System.out.println("#" + level + " [" + date + "] " + module + " =>" + mess);
+		}
+	}
+
+	public static void main(String[] args) {
+
+		@SuppressWarnings("unused")
+		AliDip2BK service = new AliDip2BK();
+
+	}
+
 	public void run() {
 
 		int stat_count = 0;
 
-		for (;;) {
+		for (; ; ) {
 
 			try {
 				Thread.sleep(10000);
@@ -210,7 +207,7 @@ public void loadConf(String filename) {
 
 			} else {
 				log(4, "AliDip2BK.loadConf ",
-						"  List DIP Data Providers  Pattern is undefined ! The DIP broswer will not start ");
+					"  List DIP Data Providers  Pattern is undefined ! The DIP broswer will not start ");
 
 			}
 
@@ -300,14 +297,6 @@ public void loadConf(String filename) {
 
 	}
 
-	static public void log(int level, String module, String mess) {
-		if (level >= DEBUG_LEVEL) {
-			String date = logDateFormat.format((new Date()).getTime());
-
-			System.out.println("#" + level + " [" + date + "] " + module + " =>" + mess);
-		}
-	}
-
 	public void writeStat(String file, boolean final_report) {
 
 		String full_file = ProgPath + AliDip2BK.KEEP_STATE_DIR + file;
@@ -373,11 +362,4 @@ public void verifyDir(String name) {
 		}
 	}
 
-	public static void main(String[] args) {
-
-		@SuppressWarnings("unused")
-		AliDip2BK service = new AliDip2BK();
-
-	}
-
 }
diff --git a/src/alice/dip/AliceInfoObj.java b/src/alice/dip/AliceInfoObj.java
@@ -1,8 +1,8 @@
 /*************
-* cil 
-**************/
+ * cil
+ **************/
 /*
- * Keeps ALICE specific information 
+ * Keeps ALICE specific information
  */
 package alice.dip;
 

diff --git a/src/alice/dip/BKwriter.java b/src/alice/dip/BKwriter.java
@@ -1,10 +1,10 @@
 /*************
-* cil 
-**************/
+ * cil
+ **************/
 
 /*
- * This class is used to write the Dip information into the 
- * Bookkeeping Data Base 
+ * This class is used to write the Dip information into the
+ * Bookkeeping Data Base
  */
 package alice.dip;
 
@@ -23,9 +23,9 @@ public BKwriter() {
 		// path = getClass().getClassLoader().getResource(".").getPath();
 
 		httpClient = HttpClient.newBuilder()
-				.version(HttpClient.Version.HTTP_2)
-				.connectTimeout(Duration.ofSeconds(10))
-				.build();
+			.version(HttpClient.Version.HTTP_2)
+			.connectTimeout(Duration.ofSeconds(10))
+			.build();
 
 	}
 
@@ -35,7 +35,7 @@ public void X_InsertLHC(LhcInfoObj lhc) {
 
 		if (ok) {
 			AliDip2BK.log(3, "BKwriter.InserFill",
-					"INSERT FILL ... BUT Fill No=" + lhc.fillNo + " is in BK ... trying to update record");
+				"INSERT FILL ... BUT Fill No=" + lhc.fillNo + " is in BK ... trying to update record");
 			XUpdateFill(lhc);
 			return;
 		}
@@ -58,10 +58,10 @@ public void X_InsertLHC(LhcInfoObj lhc) {
 			furl += "?token=" + AliDip2BK.BKP_TOKEN;
 		}
 		HttpRequest request = HttpRequest.newBuilder()
-				.uri(URI.create(furl))
-				.header("Content-Type", "application/json")
-				.method("POST", HttpRequest.BodyPublishers.ofString(mydata))
-				.build();
+			.uri(URI.create(furl))
+			.header("Content-Type", "application/json")
+			.method("POST", HttpRequest.BodyPublishers.ofString(mydata))
+			.build();
 
 		HttpResponse<String> response;
 
@@ -86,9 +86,9 @@ public boolean XTestFillNo(LhcInfoObj lhc) {
 		}
 
 		HttpRequest request = HttpRequest.newBuilder()
-				.uri(URI.create(furl))
-				.GET() // default
-				.build();
+			.uri(URI.create(furl))
+			.GET() // default
+			.build();
 
 		HttpResponse<String> response;
 		try {
@@ -127,9 +127,9 @@ public boolean TestRunNo(int N) {
 		}
 
 		HttpRequest request = HttpRequest.newBuilder()
-				.uri(URI.create(furl))
-				.GET() // default
-				.build();
+			.uri(URI.create(furl))
+			.GET() // default
+			.build();
 
 		HttpResponse<String> response;
 		try {
@@ -147,7 +147,7 @@ public boolean TestRunNo(int N) {
 
 			} else {
 				AliDip2BK.log(3, "BKwriter.TestRunNo",
-						" Reguest error =" + response.statusCode() + " Mesage=" + response.body());
+					" Reguest error =" + response.statusCode() + " Mesage=" + response.body());
 				return false;
 			}
 		} catch (Exception e) {
@@ -257,10 +257,10 @@ public void UpdateRun(RunInfoObj runObj) {
 		}
 
 		HttpRequest request = HttpRequest.newBuilder()
-				.uri(URI.create(furl))
-				.header("Content-Type", "application/json")
-				.method("PATCH", HttpRequest.BodyPublishers.ofString(mydata))
-				.build();
+			.uri(URI.create(furl))
+			.header("Content-Type", "application/json")
+			.method("PATCH", HttpRequest.BodyPublishers.ofString(mydata))
+			.build();
 
 		HttpResponse<String> response;
 		try {
@@ -270,7 +270,7 @@ public void UpdateRun(RunInfoObj runObj) {
 				AliDip2BK.log(2, "BKwriter.UpdateRun", "Succesful Update for RUN=" + runObj.RunNo);
 			} else {
 				AliDip2BK.log(3, "BKwriter.UpdateRun",
-						"ERROR for RUN=" + runObj.RunNo + " Code=" + +response.statusCode() + " Message=" + response.body());
+					"ERROR for RUN=" + runObj.RunNo + " Code=" + +response.statusCode() + " Message=" + response.body());
 			}
 
 		} catch (Exception e) {
@@ -340,10 +340,10 @@ public void XUpdateFill(LhcInfoObj cfill) {
 		}
 
 		HttpRequest request = HttpRequest.newBuilder()
-				.uri(URI.create(furl))
-				.header("Content-Type", "application/json")
-				.method("PATCH", HttpRequest.BodyPublishers.ofString(mydata))
-				.build();
+			.uri(URI.create(furl))
+			.header("Content-Type", "application/json")
+			.method("PATCH", HttpRequest.BodyPublishers.ofString(mydata))
+			.build();
 
 		HttpResponse<String> response;
 		try {
@@ -353,7 +353,7 @@ public void XUpdateFill(LhcInfoObj cfill) {
 				AliDip2BK.log(2, "BKwriter.UpdateFILL", "Succesful Update for FILL=" + cfill.fillNo);
 			} else {
 				AliDip2BK.log(3, "BKwriter.UpdateFILL",
-						"ERROR for FILL=" + cfill.fillNo + " Code=" + +response.statusCode() + " Message=" + response.body());
+					"ERROR for FILL=" + cfill.fillNo + " Code=" + +response.statusCode() + " Message=" + response.body());
 			}
 
 		} catch (Exception e) {