From c86a0601707a24bb6ed475f283f7af0b0d35bc73 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 15 Dec 2023 17:45:15 +0100
Subject: [PATCH] remove unused AnalyticsServlet, it's handled directly by the
 client since 3.0

---
 .../com/commafeed/CommaFeedApplication.java   |  2 -
 .../frontend/servlet/AnalyticsServlet.java    | 52 -------------------
 2 files changed, 54 deletions(-)
 delete mode 100644 commafeed-server/src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java

diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
index 86dd24f7..da6e8c92 100644
--- a/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
+++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java
@@ -43,7 +43,6 @@ import com.commafeed.frontend.resource.PubSubHubbubCallbackREST;
 import com.commafeed.frontend.resource.ServerREST;
 import com.commafeed.frontend.resource.UserREST;
 import com.commafeed.frontend.resource.fever.FeverREST;
-import com.commafeed.frontend.servlet.AnalyticsServlet;
 import com.commafeed.frontend.servlet.CustomCssServlet;
 import com.commafeed.frontend.servlet.CustomJsServlet;
 import com.commafeed.frontend.servlet.LogoutServlet;
@@ -171,7 +170,6 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
 		environment.servlets().addServlet("logout", injector.getInstance(LogoutServlet.class)).addMapping("/logout");
 		environment.servlets().addServlet("customCss", injector.getInstance(CustomCssServlet.class)).addMapping("/custom_css.css");
 		environment.servlets().addServlet("customJs", injector.getInstance(CustomJsServlet.class)).addMapping("/custom_js.js");
-		environment.servlets().addServlet("analytics.js", injector.getInstance(AnalyticsServlet.class)).addMapping("/analytics.js");
 		if (Boolean.TRUE.equals(config.getApplicationSettings().getHideFromWebCrawlers())) {
 			environment.servlets()
 					.addServlet("robots.txt", injector.getInstance(RobotsTxtDisallowAllServlet.class))
diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java b/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java
deleted file mode 100644
index 787576e6..00000000
--- a/commafeed-server/src/main/java/com/commafeed/frontend/servlet/AnalyticsServlet.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.commafeed.frontend.servlet;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.commafeed.CommaFeedConfiguration;
-
-@SuppressWarnings("serial")
-@Singleton
-public class AnalyticsServlet extends HttpServlet {
-
-	private final CommaFeedConfiguration config;
-	private final String script;
-
-	@Inject
-	public AnalyticsServlet(CommaFeedConfiguration config) {
-		this.config = config;
-
-		// @formatter:off
-		this.script = "(function(i, s, o, g, r, a, m) {" + 
-				"i['GoogleAnalyticsObject'] = r;" + 
-				"i[r] = i[r] || function() {" + 
-				"(i[r].q = i[r].q || []).push(arguments)" + 
-				"}, i[r].l = 1 * new Date();" + 
-				"a = s.createElement(o), m = s.getElementsByTagName(o)[0];" + 
-				"a.async = 1;" + 
-				"a.src = g;" + 
-				"m.parentNode.insertBefore(a, m)" + 
-				"})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');" + 
-			
-				"ga('create', '" + config.getApplicationSettings().getGoogleAnalyticsTrackingCode() + "');" + 
-				"ga('send', 'pageview');";
-		// @formatter:on
-	}
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		resp.setContentType("text/javascript");
-		if (StringUtils.isNotBlank(config.getApplicationSettings().getGoogleAnalyticsTrackingCode())) {
-			resp.getWriter().write(script);
-		}
-	}
-
-}