[Misc] Moving deprecated Job APIs to legacy #482
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.xwiki.commons</groupId> | ||
| <artifactId>xwiki-commons-legacy</artifactId> | ||
| <version>15.7-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>xwiki-commons-legacy-extension</artifactId> | ||
| <name>XWiki Commons - Legacy - Extension - Parent POM</name> | ||
| <packaging>pom</packaging> | ||
| <description>Legacy modules for xwiki-commons-extension-*</description> | ||
| <modules> | ||
| <module>xwiki-commons-legacy-extension-api</module> | ||
| </modules> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.xwiki.commons</groupId> | ||
| <artifactId>xwiki-commons-legacy-extension</artifactId> | ||
| <version>15.7-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>xwiki-commons-legacy-extension-api</artifactId> | ||
| <name>XWiki Commons - Legacy - Extension - API</name> | ||
| <packaging>jar</packaging> | ||
| <description>Legacy module for xwiki-commons-extension-api</description> | ||
| <properties> | ||
| <xwiki.jacoco.instructionRatio>0.00</xwiki.jacoco.instructionRatio> | ||
| <!-- The features provided by this module so that it's found when resolving extension --> | ||
| <xwiki.extension.features>org.xwiki.commons:xwiki-commons-extension-api</xwiki.extension.features> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.xwiki.commons</groupId> | ||
| <artifactId>xwiki-commons-extension-api</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.xwiki.commons</groupId> | ||
| <artifactId>xwiki-commons-legacy-job-api</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
| package org.xwiki.extension.job.history.internal; | ||
|
|
||
| import javax.inject.Named; | ||
| import javax.inject.Singleton; | ||
|
|
||
| import org.xwiki.component.annotation.Component; | ||
| import org.xwiki.extension.job.history.ReplayJobStatus; | ||
| import org.xwiki.job.Job; | ||
| import org.xwiki.job.event.JobStartedEvent; | ||
| import org.xwiki.job.internal.AbstractJobStatus; | ||
| import org.xwiki.observation.event.Event; | ||
|
|
||
| /** | ||
| * Legacy implementation of {@link ExtensionJobHistoryRecorder}. | ||
| * | ||
| * @version $Id$ | ||
| * @since 15.7RC1 | ||
| */ | ||
| @Component | ||
| @Named(ExtensionJobHistoryRecorder.NAME) | ||
| @Singleton | ||
| @Deprecated | ||
| public class LegacyExtensionJobHistoryRecorder extends ExtensionJobHistoryRecorder | ||
|
There was a problem hiding this comment. Seems to me this class is actually useless. |
||
| { | ||
| @Override | ||
| public void onEvent(Event event, Object source, Object data) | ||
| { | ||
| boolean ignore = false; | ||
| if (event instanceof JobStartedEvent) { | ||
| Job job = (Job) source; | ||
| if (job.getStatus() instanceof org.xwiki.job.AbstractJobStatus | ||
|
There was a problem hiding this comment. I might have used an aspect for injecting this condition check, but it felt easier to do it like that. |
||
| && isSubJob((AbstractJobStatus<?>) job.getStatus())) { | ||
| // We record only the jobs that have been triggered explicitly or that are part of a replay. | ||
| ignore = true; | ||
| } | ||
| } | ||
| if (!ignore) { | ||
| super.onEvent(event, source, data); | ||
| } | ||
| } | ||
|
|
||
| private <T extends AbstractJobStatus<?>> boolean isSubJob(T jobStatus) | ||
| { | ||
| return jobStatus.isSubJob() && !(jobStatus.getParentJobStatus() instanceof ReplayJobStatus); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 500:org.xwiki.extension.job.history.internal.LegacyExtensionJobHistoryRecorder |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.xwiki.commons</groupId> | ||
| <artifactId>xwiki-commons-legacy</artifactId> | ||
| <version>15.7-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>xwiki-commons-legacy-job</artifactId> | ||
| <name>XWiki Commons - Legacy - Job - Parent POM</name> | ||
| <packaging>pom</packaging> | ||
| <description>Legacy modules for xwiki-commons-job-*</description> | ||
| <modules> | ||
| <module>xwiki-commons-legacy-job-api</module> | ||
| <module>xwiki-commons-legacy-job-default</module> | ||
| </modules> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- | ||
| * See the NOTICE file distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.xwiki.commons</groupId> | ||
| <artifactId>xwiki-commons-legacy-job</artifactId> | ||
| <version>15.7-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>xwiki-commons-legacy-job-api</artifactId> | ||
| <name>XWiki Commons - Legacy - Job - API</name> | ||
| <packaging>jar</packaging> | ||
| <description>Legacy module for xwiki-commons-job-api</description> | ||
| <properties> | ||
| <xwiki.jacoco.instructionRatio>0.00</xwiki.jacoco.instructionRatio> | ||
| <!-- The features provided by this module so that it's found when resolving extension --> | ||
| <xwiki.extension.features>org.xwiki.commons:xwiki-commons-job-api</xwiki.extension.features> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.xwiki.commons</groupId> | ||
| <artifactId>xwiki-commons-job-api</artifactId> | ||
| <version>${project.version}</version> | ||
| </dependency> | ||
| </dependencies> | ||
| </project> |
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This impacts a condition in
#onJobStartedwhich is called from#onEventhence the legacy class I added to support the condition with the old class.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those should have moved to
org.xwiki.job.AbstractJobStatusback when it was introduced. There is no need to introduce any legacy for this change, asorg.xwiki.job.internal.AbstractJobStatusis aorg.xwiki.job.AbstractJobStatustoo.