[KNOWAGE-8921] Java libraries pruning - deleted NotifierServlet

Author: masseb974

knowage-core/src/main/java/it/eng/spagobi/tools/dataset/strategy/CachedEvaluationStrategy.java

@@ -65,14 +65,12 @@ protected IDataStore execute(List<AbstractSelectionField> projections, Filter fi
 		IDataStore dataStore;
 		try {
 			dataStore = cache.get(profile, dataSet, projections, filter, groups, sortings, summaryRowProjections, offset, fetchSize, maxRowCount, indexes);
-			if (dataSet.isRealtime())
+			if (dataSet.isRealtime()) {
 				unsetNgsiConsumer();
+			}
 
 			if (dataStore == null) {
 				dataStore = manageDatasetNotInCache(projections, filter, groups, sortings, summaryRowProjections, offset, fetchSize, maxRowCount, indexes);
-			} else {
-				if (dataSet.isRealtime())
-					subscribeNGSI();
 			}
 
 			dataStore.adjustMetadata(dataSet.getMetadata());
@@ -128,11 +126,6 @@ private void unsetNgsiConsumer() {
 		restDataSet.setRealtimeNgsiConsumer(false);
 	}
 
-	private void subscribeNGSI() {
-		RESTDataSet restDataSet = dataSet.getImplementation(RESTDataSet.class);
-		restDataSet.subscribeNGSI();
-	}
-
 	protected DatasetEvaluationStrategyType getEvaluationStrategy() {
 		return DatasetEvaluationStrategyType.CACHED;
 	}

knowage/src/main/webapp/WEB-INF/web.xml

@@ -279,23 +279,6 @@
 		<servlet-class>it.eng.spagobi.commons.services.ChangePwdServlet</servlet-class>
 	</servlet>
 
-	<!-- Notifications and CometD servlets-->
-	<servlet>
-		<servlet-name>NotifierServlet</servlet-name>
-		<servlet-class>it.eng.spagobi.tools.dataset.notifier.NotifierServlet</servlet-class>
-
-		<init-param>
-			<param-name>notifyUrl</param-name>
-			<param-value>http://192.168.28.183:8080/knowage/datasetNotifier</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>NotifierServlet</servlet-name>
-		<url-pattern>/datasetNotifier</url-pattern>
-	</servlet-mapping>
-	<!-- Notifications and CometD servlets end-->
-
 	<servlet>
 		<servlet-name>ExtendSessionServlet</servlet-name>
 		<servlet-class>it.eng.spagobi.utilities.servlet.session.ExtendSessionServlet</servlet-class>

knowageutils/src/main/java/it/eng/spagobi/tools/dataset/bo/RESTDataSet.java

@@ -47,9 +47,7 @@
 import it.eng.spagobi.tools.dataset.exceptions.ParametersNotValorizedException;
 import it.eng.spagobi.tools.dataset.listener.DataSetListenerManager;
 import it.eng.spagobi.tools.dataset.listener.DataSetListenerManagerFactory;
-import it.eng.spagobi.tools.dataset.notifier.NotifierServlet;
 import it.eng.spagobi.tools.dataset.notifier.fiware.OAuth2Utils;
-import it.eng.spagobi.tools.dataset.notifier.fiware.OrionContextSubscriber;
 import it.eng.spagobi.tools.dataset.utils.ParametersResolver;
 import it.eng.spagobi.tools.datasource.bo.IDataSource;
 import it.eng.spagobi.user.UserProfileManager;
@@ -110,17 +108,6 @@ public RESTDataSet(JSONObject jsonConf) {
 	public void loadData(int offset, int fetchSize, int maxResults) {
 
 		super.loadData(offset, fetchSize, maxResults);
-
-		if (isNgsi()) {
-			// notify for all listeners
-			notifyListeners();
-
-			// after the first datastore initialization
-			if (NotifierServlet.isNotifiable()) {
-				logger.info(String.format("Subscribe NGSI dataset with label %s to orion notifications.", getLabel()));
-				subscribeNGSI();
-			}
-		}
 	}
 
 	private void notifyListeners() {
@@ -142,17 +129,6 @@ private void notifyListeners() {
 		logger.debug("OUT");
 	}
 
-	public void subscribeNGSI() {
-		try {
-			OrionContextSubscriber subscriber = new OrionContextSubscriber(this, getCurrentUserProfile());
-			subscriber.subscribeNGSI();
-			notifiable = true;
-		} catch (Exception e) {
-			logger.error("Errror in Orion subscription", e);
-			notifiable = false;
-		}
-	}
-
 	public boolean isNotifiable() {
 		return notifiable;
 	}