Merge pull request #1 from codecentric/codecentric-refactoring

Codecentric refactoring

.github/workflows/maven.yml

@@ -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

.github/workflows/release-to-maven-central.yml

@@ -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/[email protected]
+        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

pom.xml

@@ -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>

src/main/java/de/codecentric/reedelk/file/ModuleDefinition.java

@@ -0,0 +1,8 @@
+package de.codecentric.reedelk.file;
+
+import de.codecentric.reedelk.runtime.api.annotation.Module;
+
+@Module("File Module")
+public class ModuleDefinition {
+}
+

src/main/java/com/reedelk/file/component/FileDelete.java → src/main/java/de/codecentric/reedelk/file/component/FileDelete.java

@@ -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;
@@ -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(

src/main/java/com/reedelk/file/component/FileExists.java → src/main/java/de/codecentric/reedelk/file/component/FileExists.java

@@ -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;
@@ -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")

src/main/java/com/reedelk/file/component/FileRead.java → src/main/java/de/codecentric/reedelk/file/component/FileRead.java

@@ -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;
@@ -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(
@@ -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) {

src/main/java/com/reedelk/file/component/FileReadConfiguration.java → src/main/java/de/codecentric/reedelk/file/component/FileReadConfiguration.java

@@ -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;

src/main/java/com/reedelk/file/component/FileWrite.java → src/main/java/de/codecentric/reedelk/file/component/FileWrite.java

@@ -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;
@@ -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(
@@ -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));
             }
 

src/main/java/com/reedelk/file/component/FileWriteConfiguration.java → src/main/java/de/codecentric/reedelk/file/component/FileWriteConfiguration.java

@@ -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;