Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Codecentric refactoring #1

Merged
merged 3 commits into from
Mar 15, 2021
Merged

Codecentric refactoring #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fedc09
refactored and set version to 1.1.0
danielkocot Mar 2, 2021
74492d8
prepared for release of version 2.0.0
danielkocot Mar 15, 2021
21266fb
added github actions
danielkocot Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Maven Build

on: [push]

jobs:
build:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11

- name: Build with Maven
run: mvn -B install --no-transfer-progress --file pom.xml
56 changes: 56 additions & 0 deletions .github/workflows/release-to-maven-central.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: release-to-maven-central
on:
workflow_dispatch:
inputs:
releaseversion:
description: 'Release version'
required: true
default: '2.0.0'
jobs:
publish:
runs-on: ubuntu-latest
steps:
- run: echo "Will start a Maven Central upload with version ${{ github.event.inputs.releaseversion }}"

- uses: actions/checkout@v2

- name: Set up settings.xml for Maven Central Repository
uses: actions/setup-java@v1
with:
java-version: 11
server-id: oss.sonatype.org
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Set projects Maven version to GitHub Action GUI set version
run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress

- name: Publish package
run: mvn --batch-mode clean deploy --no-transfer-progress -P central-deploy -DskipTests=true
env:
MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

- name: Generate changelog
id: changelog
uses: metcalfc/changelog-generator@v0.4.4
with:
myToken: ${{ secrets.GITHUB_TOKEN }}

- name: Create GitHub Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.event.inputs.releaseversion }}
release_name: ${{ github.event.inputs.releaseversion }}
body: |
Grab the new version from Maven central https://repo1.maven.org/maven2/de/codecentric/reedelk/module-file/${{ github.event.inputs.releaseversion }}/
### Things that changed in this release
${{ steps.changelog.outputs.changelog }}
draft: false
prerelease: false
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.reedelk</groupId>
<groupId>de.codecentric.reedelk</groupId>
<artifactId>module-parent</artifactId>
<version>1.0.6</version>
<version>2.0.0</version>
</parent>

<packaging>bundle</packaging>
<version>1.0.6</version>
<version>2.0.0</version>
<artifactId>module-file</artifactId>

<properties>
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/reedelk/file/ModuleDefinition.java
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions src/main/java/com/reedelk/file/internal/attribute/FileAttribute.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/java/com/reedelk/file/internal/commons/FileOperation.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/java/com/reedelk/file/internal/commons/LockType.java
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/java/com/reedelk/file/internal/read/ReadMode.java
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions src/main/java/de/codecentric/reedelk/file/ModuleDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package de.codecentric.reedelk.file;

import de.codecentric.reedelk.runtime.api.annotation.Module;

@Module("File Module")
public class ModuleDefinition {
}

32 changes: 16 additions & 16 deletions ...om/reedelk/file/component/FileDelete.java → ...ic/reedelk/file/component/FileDelete.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.reedelk.file.component;

import com.reedelk.file.internal.attribute.FileAttribute;
import com.reedelk.file.internal.exception.FileDeleteException;
import com.reedelk.file.internal.exception.NotValidFileException;
import com.reedelk.runtime.api.annotation.*;
import com.reedelk.runtime.api.component.ProcessorSync;
import com.reedelk.runtime.api.flow.FlowContext;
import com.reedelk.runtime.api.message.Message;
import com.reedelk.runtime.api.message.MessageBuilder;
import com.reedelk.runtime.api.message.content.MimeType;
import com.reedelk.runtime.api.script.ScriptEngineService;
import com.reedelk.runtime.api.script.dynamicvalue.DynamicString;
package de.codecentric.reedelk.file.component;

import de.codecentric.reedelk.file.internal.attribute.FileAttribute;
import de.codecentric.reedelk.file.internal.exception.FileDeleteException;
import de.codecentric.reedelk.file.internal.exception.NotValidFileException;
import de.codecentric.reedelk.runtime.api.annotation.*;
import de.codecentric.reedelk.runtime.api.component.ProcessorSync;
import de.codecentric.reedelk.runtime.api.flow.FlowContext;
import de.codecentric.reedelk.runtime.api.message.Message;
import de.codecentric.reedelk.runtime.api.message.MessageBuilder;
import de.codecentric.reedelk.runtime.api.message.content.MimeType;
import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicString;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ServiceScope;
Expand All @@ -20,9 +20,9 @@
import java.nio.file.Paths;
import java.util.Optional;

import static com.reedelk.file.internal.commons.Messages.FileDelete.ERROR_FILE_DELETE;
import static com.reedelk.file.internal.commons.Messages.FileDelete.FILE_NAME_ERROR;
import static com.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotNull;
import static de.codecentric.reedelk.file.internal.commons.Messages.FileDelete.ERROR_FILE_DELETE;
import static de.codecentric.reedelk.file.internal.commons.Messages.FileDelete.FILE_NAME_ERROR;
import static de.codecentric.reedelk.runtime.api.commons.ComponentPrecondition.Configuration.requireNotNull;

@ModuleComponent("File Delete")
@ComponentOutput(
Expand Down
28 changes: 14 additions & 14 deletions ...om/reedelk/file/component/FileExists.java → ...ic/reedelk/file/component/FileExists.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.reedelk.file.component;

import com.reedelk.file.internal.attribute.FileAttribute;
import com.reedelk.file.internal.exception.NotValidFileException;
import com.reedelk.runtime.api.annotation.*;
import com.reedelk.runtime.api.commons.DynamicValueUtils;
import com.reedelk.runtime.api.component.ProcessorSync;
import com.reedelk.runtime.api.flow.FlowContext;
import com.reedelk.runtime.api.message.Message;
import com.reedelk.runtime.api.message.MessageBuilder;
import com.reedelk.runtime.api.script.ScriptEngineService;
import com.reedelk.runtime.api.script.dynamicvalue.DynamicString;
package de.codecentric.reedelk.file.component;

import de.codecentric.reedelk.file.internal.attribute.FileAttribute;
import de.codecentric.reedelk.file.internal.exception.NotValidFileException;
import de.codecentric.reedelk.runtime.api.annotation.*;
import de.codecentric.reedelk.runtime.api.commons.DynamicValueUtils;
import de.codecentric.reedelk.runtime.api.component.ProcessorSync;
import de.codecentric.reedelk.runtime.api.flow.FlowContext;
import de.codecentric.reedelk.runtime.api.message.Message;
import de.codecentric.reedelk.runtime.api.message.MessageBuilder;
import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicString;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ServiceScope;
Expand All @@ -19,8 +19,8 @@
import java.nio.file.Paths;
import java.util.Optional;

import static com.reedelk.file.internal.commons.Messages.FileRead.FILE_NAME_ERROR;
import static com.reedelk.runtime.api.commons.StringUtils.isBlank;
import static de.codecentric.reedelk.file.internal.commons.Messages.FileRead.FILE_NAME_ERROR;
import static de.codecentric.reedelk.runtime.api.commons.StringUtils.isBlank;


@ModuleComponent("File Exists")
Expand Down
34 changes: 17 additions & 17 deletions .../com/reedelk/file/component/FileRead.java → ...tric/reedelk/file/component/FileRead.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package com.reedelk.file.component;

import com.reedelk.file.internal.attribute.FileAttribute;
import com.reedelk.file.internal.exception.NotValidFileException;
import com.reedelk.file.internal.read.*;
import com.reedelk.runtime.api.annotation.*;
import com.reedelk.runtime.api.commons.MimeTypeUtils;
import com.reedelk.runtime.api.component.ProcessorSync;
import com.reedelk.runtime.api.flow.FlowContext;
import com.reedelk.runtime.api.message.Message;
import com.reedelk.runtime.api.message.MessageBuilder;
import com.reedelk.runtime.api.message.content.MimeType;
import com.reedelk.runtime.api.script.ScriptEngineService;
import com.reedelk.runtime.api.script.dynamicvalue.DynamicString;
package de.codecentric.reedelk.file.component;

import de.codecentric.reedelk.file.internal.attribute.FileAttribute;
import de.codecentric.reedelk.file.internal.exception.NotValidFileException;
import de.codecentric.reedelk.runtime.api.annotation.*;
import de.codecentric.reedelk.runtime.api.commons.MimeTypeUtils;
import de.codecentric.reedelk.runtime.api.component.ProcessorSync;
import de.codecentric.reedelk.runtime.api.flow.FlowContext;
import de.codecentric.reedelk.runtime.api.message.Message;
import de.codecentric.reedelk.runtime.api.message.MessageBuilder;
import de.codecentric.reedelk.runtime.api.message.content.MimeType;
import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicString;
import de.codecentric.reedelk.file.internal.commons.Messages;
import de.codecentric.reedelk.file.internal.read.*;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ServiceScope;
Expand All @@ -20,8 +21,7 @@
import java.nio.file.Paths;
import java.util.Optional;

import static com.reedelk.file.internal.commons.Messages.FileRead.FILE_NAME_ERROR;
import static com.reedelk.runtime.api.commons.StringUtils.isBlank;
import static de.codecentric.reedelk.runtime.api.commons.StringUtils.isBlank;

@ModuleComponent("File Read")
@ComponentOutput(
Expand Down Expand Up @@ -115,7 +115,7 @@ public Message apply(FlowContext flowContext, Message message) {
.attributes(attributes)
.build();

}).orElseThrow(() -> new NotValidFileException(FILE_NAME_ERROR.format(fileName.toString())));
}).orElseThrow(() -> new NotValidFileException(Messages.FileRead.FILE_NAME_ERROR.format(fileName.toString())));
}

public void setConfiguration(FileReadConfiguration configuration) {
Expand Down
6 changes: 3 additions & 3 deletions ...file/component/FileReadConfiguration.java → ...file/component/FileReadConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.reedelk.file.component;
package de.codecentric.reedelk.file.component;

import com.reedelk.runtime.api.annotation.*;
import com.reedelk.runtime.api.component.Implementor;
import de.codecentric.reedelk.runtime.api.annotation.*;
import de.codecentric.reedelk.runtime.api.component.Implementor;
import org.osgi.service.component.annotations.Component;

import static org.osgi.service.component.annotations.ServiceScope.PROTOTYPE;
Expand Down
45 changes: 22 additions & 23 deletions ...com/reedelk/file/component/FileWrite.java → ...ric/reedelk/file/component/FileWrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
package com.reedelk.file.component;

import com.reedelk.file.internal.attribute.FileAttribute;
import com.reedelk.file.internal.exception.FileWriteException;
import com.reedelk.file.internal.write.WriteConfiguration;
import com.reedelk.file.internal.write.WriteMode;
import com.reedelk.file.internal.write.Writer;
import com.reedelk.runtime.api.annotation.*;
import com.reedelk.runtime.api.component.OnResult;
import com.reedelk.runtime.api.component.ProcessorAsync;
import com.reedelk.runtime.api.converter.ConverterService;
import com.reedelk.runtime.api.exception.PlatformException;
import com.reedelk.runtime.api.flow.FlowContext;
import com.reedelk.runtime.api.message.Message;
import com.reedelk.runtime.api.message.content.TypedPublisher;
import com.reedelk.runtime.api.script.ScriptEngineService;
import com.reedelk.runtime.api.script.dynamicvalue.DynamicString;
package de.codecentric.reedelk.file.component;

import de.codecentric.reedelk.file.internal.attribute.FileAttribute;
import de.codecentric.reedelk.file.internal.exception.FileWriteException;
import de.codecentric.reedelk.file.internal.write.WriteConfiguration;
import de.codecentric.reedelk.file.internal.write.WriteMode;
import de.codecentric.reedelk.file.internal.write.Writer;
import de.codecentric.reedelk.runtime.api.annotation.*;
import de.codecentric.reedelk.runtime.api.component.OnResult;
import de.codecentric.reedelk.runtime.api.component.ProcessorAsync;
import de.codecentric.reedelk.runtime.api.converter.ConverterService;
import de.codecentric.reedelk.runtime.api.exception.PlatformException;
import de.codecentric.reedelk.runtime.api.flow.FlowContext;
import de.codecentric.reedelk.runtime.api.message.Message;
import de.codecentric.reedelk.runtime.api.message.content.TypedPublisher;
import de.codecentric.reedelk.runtime.api.script.ScriptEngineService;
import de.codecentric.reedelk.runtime.api.script.dynamicvalue.DynamicString;
import de.codecentric.reedelk.file.internal.commons.Messages;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ServiceScope;
Expand All @@ -24,10 +25,8 @@
import java.nio.file.Paths;
import java.util.Optional;

import static com.reedelk.file.internal.commons.Messages.FileWrite.ERROR_FILE_WRITE;
import static com.reedelk.file.internal.commons.Messages.FileWrite.ERROR_FILE_WRITE_WITH_PATH;
import static com.reedelk.runtime.api.commons.StackTraceUtils.rootCauseMessageOf;
import static com.reedelk.runtime.api.commons.StringUtils.isBlank;
import static de.codecentric.reedelk.runtime.api.commons.StackTraceUtils.rootCauseMessageOf;
import static de.codecentric.reedelk.runtime.api.commons.StringUtils.isBlank;

@ModuleComponent("File Write")
@ComponentOutput(
Expand Down Expand Up @@ -103,8 +102,8 @@ public void apply(FlowContext flowContext, Message message, OnResult callback) {

} catch (Exception exception) {
String errorMessage = finalPath != null ?
ERROR_FILE_WRITE_WITH_PATH.format(finalPath.toString(), rootCauseMessageOf(exception)) :
ERROR_FILE_WRITE.format(rootCauseMessageOf(exception));
Messages.FileWrite.ERROR_FILE_WRITE_WITH_PATH.format(finalPath.toString(), rootCauseMessageOf(exception)) :
Messages.FileWrite.ERROR_FILE_WRITE.format(rootCauseMessageOf(exception));
callback.onError(flowContext, new FileWriteException(errorMessage, exception));
}

Expand Down
6 changes: 3 additions & 3 deletions ...ile/component/FileWriteConfiguration.java → ...ile/component/FileWriteConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.reedelk.file.component;
package de.codecentric.reedelk.file.component;

import com.reedelk.runtime.api.annotation.*;
import com.reedelk.runtime.api.component.Implementor;
import de.codecentric.reedelk.runtime.api.annotation.*;
import de.codecentric.reedelk.runtime.api.component.Implementor;
import org.osgi.service.component.annotations.Component;

import static org.osgi.service.component.annotations.ServiceScope.PROTOTYPE;
Expand Down
Loading