Skip to content

Commit 931d2fd

Browse files
authored
Merge pull request #301 from netgrif/NAE-2093
[NAE-2093] Remove dependency on plugin-core
2 parents 34fd69b + 20fe016 commit 931d2fd

20 files changed

Lines changed: 15 additions & 1080 deletions

application-engine/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@
103103
<artifactId>nae-user-common</artifactId>
104104
<version>${project.version}</version>
105105
</dependency>
106-
<dependency>
107-
<groupId>com.netgrif</groupId>
108-
<artifactId>plugin-core</artifactId>
109-
<version>0.2.0-SNAPSHOT</version>
110-
<scope>compile</scope>
111-
</dependency>
112106

113107
<!-- Loader -->
114108
<dependency>

application-engine/src/main/groovy/com/netgrif/application/engine/integration/plugin/injector/PluginHolder.groovy

Lines changed: 0 additions & 7 deletions
This file was deleted.

application-engine/src/main/groovy/com/netgrif/application/engine/integration/plugin/injector/PluginInjector.groovy

Lines changed: 0 additions & 66 deletions
This file was deleted.

application-engine/src/main/groovy/com/netgrif/application/engine/integration/plugin/injector/meta/EntryPointMeta.groovy

Lines changed: 0 additions & 8 deletions
This file was deleted.

application-engine/src/main/groovy/com/netgrif/application/engine/integration/plugin/injector/meta/PluginMeta.groovy

Lines changed: 0 additions & 8 deletions
This file was deleted.

application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.netgrif.application.engine.petrinet.domain.dataset.logic.action
22

3-
import com.netgrif.application.engine.auth.service.GroupService
4-
import com.netgrif.application.engine.auth.service.UserService
5-
import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetService
3+
import com.netgrif.application.engine.AsyncRunner
64
import com.netgrif.application.engine.adapter.spring.petrinet.service.ProcessRoleService
75
import com.netgrif.application.engine.adapter.spring.workflow.domain.QCase
86
import com.netgrif.application.engine.adapter.spring.workflow.domain.QTask
9-
import com.netgrif.application.engine.AsyncRunner
7+
import com.netgrif.application.engine.auth.service.GroupService
108
import com.netgrif.application.engine.auth.service.UserDetailsServiceImpl
9+
import com.netgrif.application.engine.auth.service.UserService
1110
import com.netgrif.application.engine.auth.service.interfaces.IRegistrationService
1211
import com.netgrif.application.engine.auth.web.requestbodies.NewUserRequest
1312
import com.netgrif.application.engine.configuration.ApplicationContextProvider
@@ -21,7 +20,6 @@ import com.netgrif.application.engine.export.domain.ExportDataConfig
2120
import com.netgrif.application.engine.export.service.interfaces.IExportService
2221
import com.netgrif.application.engine.impersonation.service.interfaces.IImpersonationService
2322
import com.netgrif.application.engine.importer.service.FieldFactory
24-
import com.netgrif.application.engine.integration.plugin.injector.PluginInjector
2523
import com.netgrif.application.engine.mail.domain.MailDraft
2624
import com.netgrif.application.engine.mail.interfaces.IMailAttemptService
2725
import com.netgrif.application.engine.mail.interfaces.IMailService
@@ -47,7 +45,6 @@ import com.netgrif.application.engine.objects.petrinet.domain.dataset.logic.vali
4745
import com.netgrif.application.engine.objects.petrinet.domain.dataset.logic.validation.Validation
4846
import com.netgrif.application.engine.objects.petrinet.domain.roles.ProcessRole
4947
import com.netgrif.application.engine.objects.petrinet.domain.version.Version
50-
5148
import com.netgrif.application.engine.objects.workflow.domain.Case
5249
import com.netgrif.application.engine.objects.workflow.domain.Task
5350
import com.netgrif.application.engine.objects.workflow.domain.eventoutcomes.EventOutcome
@@ -59,10 +56,20 @@ import com.netgrif.application.engine.objects.workflow.domain.eventoutcomes.task
5956
import com.netgrif.application.engine.objects.workflow.domain.menu.MenuItemBody
6057
import com.netgrif.application.engine.objects.workflow.domain.menu.MenuItemConstants
6158
import com.netgrif.application.engine.objects.workflow.service.InitValueExpressionEvaluator
59+
import com.netgrif.application.engine.pdf.generator.config.PdfResource
60+
import com.netgrif.application.engine.pdf.generator.service.interfaces.IPdfGenerator
61+
import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetService
62+
import com.netgrif.application.engine.petrinet.service.interfaces.IUriService
63+
import com.netgrif.application.engine.startup.ImportHelper
64+
import com.netgrif.application.engine.startup.runner.DefaultFiltersRunner
65+
import com.netgrif.application.engine.startup.runner.FilterRunner
66+
import com.netgrif.application.engine.utils.FullPageRequest
67+
import com.netgrif.application.engine.workflow.service.FileFieldInputStream
68+
import com.netgrif.application.engine.workflow.service.TaskService
69+
import com.netgrif.application.engine.workflow.service.interfaces.*
6270
import com.netgrif.application.engine.workflow.web.responsebodies.MessageResource
6371
import com.netgrif.application.engine.workflow.web.responsebodies.TaskReference
6472
import com.querydsl.core.types.Predicate
65-
import groovy.time.TimeCategory
6673
import groovy.transform.NamedVariant
6774
import org.bson.types.ObjectId
6875
import org.quartz.Scheduler
@@ -76,11 +83,11 @@ import org.springframework.core.io.FileSystemResource
7683
import org.springframework.data.domain.Page
7784
import org.springframework.data.domain.PageRequest
7885
import org.springframework.data.domain.Pageable
79-
import com.netgrif.application.engine.integration.plugin.injector.PluginHolder
8086

8187
import java.text.Normalizer
8288
import java.time.ZoneId
8389
import java.util.stream.Collectors
90+
8491
/**
8592
* ActionDelegate class contains Actions API methods.
8693
*/
@@ -193,13 +200,8 @@ class ActionDelegate {
193200
@Autowired
194201
PublicViewProperties publicViewProperties
195202

196-
@Autowired
197-
PluginInjector pluginInjector
198-
199203
FrontendActionOutcome Frontend
200204

201-
PluginHolder Plugin
202-
203205
/**
204206
* Reference of case and task in which current action is taking place.
205207
*/
@@ -221,7 +223,6 @@ class ActionDelegate {
221223
this.initTransitionsMap(action.transitionIds)
222224
this.outcomes = new ArrayList<>()
223225
this.Frontend = new FrontendActionOutcome(this.useCase, this.task, this.outcomes)
224-
this.Plugin = new PluginHolder()
225226
}
226227

227228
def initFieldsMap(Map<String, String> fieldIds) {

application-engine/src/main/java/com/netgrif/application/engine/integration/plugins/config/PluginEngineServicesConfiguration.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

application-engine/src/main/java/com/netgrif/application/engine/integration/plugins/exceptions/IncompatibleClassLoaderException.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

application-engine/src/main/java/com/netgrif/application/engine/integration/plugins/exceptions/IncompatiblePluginException.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

application-engine/src/main/java/com/netgrif/application/engine/integration/plugins/exceptions/InvalidRequestException.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)