From b38a88d5f99684deb8b3cd13791a258f1efdce02 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 23 Jan 2024 13:40:22 +0100 Subject: [PATCH] Jobs: Remove firebird --- Jobs/ADSync/ADSyncJob.vb | 6 +++--- Jobs/GraphQL/GraphQLJob.vb | 9 +-------- Jobs/JobBase.vb | 4 +--- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Jobs/ADSync/ADSyncJob.vb b/Jobs/ADSync/ADSyncJob.vb index 5598f275..145787e3 100644 --- a/Jobs/ADSync/ADSyncJob.vb +++ b/Jobs/ADSync/ADSyncJob.vb @@ -8,8 +8,8 @@ Public Class ADSyncJob Inherits JobBase Implements IJob(Of ADSyncArgs) - Public Sub New(LogConfig As LogConfig, Firebird As Firebird, MSSQL As MSSQLServer) - MyBase.New(LogConfig, Firebird, MSSQL) + Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer) + MyBase.New(LogConfig, MSSQL) End Sub Public Sub Start(Arguments As ADSyncArgs) Implements IJob(Of ADSyncArgs).Start @@ -31,7 +31,7 @@ Public Class ADSyncJob For Each oGroup In oGroups _Logger.Debug("Syncing Group [{0}]", oGroup) - Dim oSyncedUsers = oSync.SyncUsersForGroup(oGroup, oAttributeMappings, _Firebird, _MSSQL, Arguments.UserFilter) + Dim oSyncedUsers = oSync.SyncUsersForGroup(oGroup, oAttributeMappings, _MSSQL, Arguments.UserFilter) If oSyncedUsers Is Nothing Then _Logger.Warn("Group [{0}] could not be synced!", oGroup) diff --git a/Jobs/GraphQL/GraphQLJob.vb b/Jobs/GraphQL/GraphQLJob.vb index 54dbcc86..6bc83c49 100644 --- a/Jobs/GraphQL/GraphQLJob.vb +++ b/Jobs/GraphQL/GraphQLJob.vb @@ -1,17 +1,10 @@ Option Explicit On - -Imports System.Collections.Generic -Imports System.Data Imports System.IO -Imports System.Linq -Imports System.Reflection -Imports DigitalData.Modules.Base Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database Imports DigitalData.Modules.Interfaces Imports DigitalData.Modules.Jobs.GraphQL Imports DigitalData.Modules.Logging -Imports Newtonsoft.Json.Linq Public Class GraphQLJob Inherits JobBase @@ -25,7 +18,7 @@ Public Class GraphQLJob Private Const JOB_NAME = "GraphQL Job" Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer) - MyBase.New(LogConfig, Nothing, MSSQL) + MyBase.New(LogConfig, MSSQL) End Sub Public Sub Start(Args As GraphQLArgs) Implements IJob(Of GraphQLArgs).Start diff --git a/Jobs/JobBase.vb b/Jobs/JobBase.vb index 0f02b631..8dd4668e 100644 --- a/Jobs/JobBase.vb +++ b/Jobs/JobBase.vb @@ -4,13 +4,11 @@ Imports DigitalData.Modules.Logging Public Class JobBase Protected _LogConfig As LogConfig Protected _Logger As Logger - Protected _Firebird As Firebird Protected _MSSQL As MSSQLServer - Public Sub New(LogConfig As LogConfig, Firebird As Firebird, MSSQL As MSSQLServer) + Public Sub New(LogConfig As LogConfig, MSSQL As MSSQLServer) _LogConfig = LogConfig _Logger = LogConfig.GetLogger() - _Firebird = Firebird _MSSQL = MSSQL End Sub End Class