Log4J removed

Author: Jan Lolling (Klöckner

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.jlo.talendcomp.google</groupId>
 	<artifactId>jlo-talendcomp-google-analytics4</artifactId>
-	<version>2.3</version>
+	<version>2.4</version>
 	<name>GoogleAnalytics Talend Component for GA4</name>
 		<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/components/tGoogleAnalytics4Input/tGoogleAnalytics4Input_begin.javajet

@@ -198,6 +198,7 @@
 	    }
 	    // next row from results
 		java.util.List<String> dataset_<%=cid%> = <%=cid%>.getNextPlainRecord();
+		globalMap.put("<%=cid%>_ROW_NUM", <%=cid%>.getOverAllCountRows());
 	   countLines_<%=cid%>++;
 <%  if (conn != null) { %>
 		// create a new row, thats avoid the need of setting attributes to null

src/main/components/tGoogleAnalytics4Input/tGoogleAnalytics4Input_java.xml

@@ -147,6 +147,7 @@
     <RETURN AVAILABILITY="AFTER" NAME="NB_LINE_METRICS" TYPE="id_Integer"/>  
     <RETURN AVAILABILITY="AFTER" NAME="TOTAL_AFFECTED_ROWS" TYPE="id_Integer"/>  
     <RETURN AVAILABILITY="FLOW" NAME="CURRENT_DATE" TYPE="id_Date"/>  
+    <RETURN AVAILABILITY="FLOW" NAME="ROW_NUM" TYPE="id_Integer"/>  
     <RETURN AVAILABILITY="AFTER" NAME="ERROR_CODE" TYPE="id_Integer"/> 
   </RETURNS>
 </COMPONENT>

src/main/components/tGoogleAnalytics4Input/tGoogleAnalytics4Input_messages.properties

@@ -14,6 +14,7 @@ NB_LINE.NAME=Number of fetched lines
 ERROR_MESSAGE.NAME=Error Message
 NUMBERFORMAT_LOCALE.NAME=Locale for Numbers (2-char-ISO code)
 TOTAL_AFFECTED_ROWS.NAME=Total affected rows used to calculate result
+ROW_NUM.NAME=Current received Row Index
 KEEP_CLIENT.NAME=Keep client for repeated processing
 FETCH_SIZE.NAME=Max. rows (empty or 0 for no limit which means also no pagination)
 DIE_ON_ERROR.NAME=Die on Error

src/main/java/de/jlo/talendcomp/google/analytics/ga4/DimensionValue.java

@@ -1,7 +1,7 @@
 package de.jlo.talendcomp.google.analytics.ga4;
 
 /**
- * Copyright 2015 Jan Lolling [email protected]
+ * Copyright 2022 Jan Lolling [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/jlo/talendcomp/google/analytics/ga4/GoogleAnalyticsBase.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Jan Lolling [email protected]
+ * Copyright 2022 Jan Lolling [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/jlo/talendcomp/google/analytics/ga4/MetricValue.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Jan Lolling [email protected]
+ * Copyright 2022 Jan Lolling [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/jlo/talendcomp/google/analytics/ga4/Util.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Jan Lolling [email protected]
+ * Copyright 2022 Jan Lolling [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/jlo/talendcomp/google/analytics/ga4/v1/FilterExpressionBuilder.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2023 Jan Lolling [email protected]
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package de.jlo.talendcomp.google.analytics.ga4.v1;
 
 import org.apache.logging.log4j.LogManager;

src/main/java/de/jlo/talendcomp/google/analytics/ga4/v1/GoogleAnalyticsInput.java

@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Jan Lolling [email protected]
+ * Copyright 2023 Jan Lolling [email protected]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
 import com.google.analytics.data.v1beta.DateRange;
 import com.google.analytics.data.v1beta.Dimension;
 import com.google.analytics.data.v1beta.FilterExpression;
@@ -44,11 +41,9 @@
 import de.jlo.talendcomp.google.analytics.ga4.GoogleAnalyticsBase;
 import de.jlo.talendcomp.google.analytics.ga4.MetricValue;
 import de.jlo.talendcomp.google.analytics.ga4.Util;
-import io.grpc.StatusRuntimeException;
 
 public class GoogleAnalyticsInput extends GoogleAnalyticsBase {
 
-	private static Logger log = LogManager.getLogger(GoogleAnalyticsInput.class); 
 	private static final Map<String, GoogleAnalyticsInput> clientCache = new HashMap<String, GoogleAnalyticsInput>();
 	private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	private String startDate = null;