Skip to content
This repository was archived by the owner on Sep 21, 2021. It is now read-only.

Commit 02794cf

Browse files
author
mInTRuns
committed
added OutputMessages.java
log file's will be created with this format "SameLogger_dd-MM-yyyy HH;mm"
1 parent b050360 commit 02794cf

File tree

8 files changed

+149
-55
lines changed

8 files changed

+149
-55
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>de.mint.logger</groupId>
88
<artifactId>SameLogger</artifactId>
9-
<version>v0.0.2</version>
9+
<version>v0.0.3</version>
1010
<organization>
1111
<name>https://github.com/mInT-runs</name>
1212
</organization>

‎src/main/java/de/mint/logger/mainservice/SameLogger.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22

33
import de.mint.logger.objectservice.SameLoggerObject;
44

5+
import java.util.Objects;
6+
57
public class SameLogger {
68

79
public static void main(final String... strings) {
8-
SameLoggerObject.getSameLoggerObject().getSameLoggerBootStrap().initializedLogo();
9-
SameLoggerObject.getSameLoggerObject().getSameLoggerBootStrap().bootStrap(strings);
10-
SameLoggerObject.getSameLoggerObject().getShutdownHook().initializedShutdownHook();
10+
if (Objects.requireNonNull(strings).length != 0){
11+
SameLoggerObject.getSameLoggerObject().getSameLoggerBootStrap().initializedLogo();
12+
SameLoggerObject.getSameLoggerObject().getSameLoggerBootStrap().bootStrap(strings);
13+
SameLoggerObject.getSameLoggerObject().getShutdownHook().initializedShutdownHook();
14+
} else {
15+
System.exit(-1);
16+
}
1117
}
1218

1319

‎src/main/java/de/mint/logger/mainservice/SameLoggerBootStrap.java‎

Lines changed: 45 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,29 @@
44
import de.mint.logger.utilservice.Logger;
55

66
import java.io.*;
7-
import java.util.Arrays;
8-
import java.util.Timer;
9-
import java.util.TimerTask;
10-
import java.util.UUID;
7+
import java.text.DateFormat;
8+
import java.text.SimpleDateFormat;
9+
import java.util.*;
1110
import java.util.stream.Collectors;
1211

1312
public class SameLoggerBootStrap {
1413

1514
private FileWriter fileWriter;
16-
private final UUID uuid = UUID.randomUUID();
17-
private final String fileName = "SameLogger/SameLogger_" + this.uuid + ".log";
15+
private final Date date = Calendar.getInstance().getTime();
16+
private final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH;mm");
17+
private final String fileName = "SameLogger/SameLogger_" + this.dateFormat.format(this.date) + ".log";
18+
private final String replaceFolderName = "%folderName";
19+
private final String replaceFileName = "%fileName%";
20+
1821

1922
private boolean initializedLoggerFolder() {
2023
final String folderName = "SameLogger/";
2124
if (!SameLoggerObject.getSameLoggerObject().getFileInterpreter().isLoggerFolderExist(folderName)) {
2225
if (SameLoggerObject.getSameLoggerObject().getFileInterpreter().createLoggerFolder(folderName)) {
23-
SameLoggerObject.getSameLoggerObject().getLogger().info("The folder '" + folderName + "' was successfully created");
26+
SameLoggerObject.getSameLoggerObject().getLogger().info(SameLoggerObject.getSameLoggerObject().getOutputMessages().getFolderCreatedSuccessful().replace(this.replaceFolderName, folderName));
2427
return true;
2528
} else {
26-
SameLoggerObject.getSameLoggerObject().getLogger().warning("Error the folder '" + folderName + "' could not be created");
29+
SameLoggerObject.getSameLoggerObject().getLogger().warning(SameLoggerObject.getSameLoggerObject().getOutputMessages().getFolderNoCreatedSuccessful().replace(this.replaceFolderName, folderName));
2730
return false;
2831
}
2932
} else {
@@ -34,10 +37,10 @@ private boolean initializedLoggerFolder() {
3437
private boolean initializedLoggerFile() {
3538
if (!SameLoggerObject.getSameLoggerObject().getFileInterpreter().isLoggerFileExist(this.fileName)) {
3639
if (SameLoggerObject.getSameLoggerObject().getFileInterpreter().createLoggerFile(this.fileName)) {
37-
SameLoggerObject.getSameLoggerObject().getLogger().info("The file '" + this.fileName + "' was successfully created");
40+
SameLoggerObject.getSameLoggerObject().getLogger().info(SameLoggerObject.getSameLoggerObject().getOutputMessages().getFileCreatedSuccessful().replace(this.replaceFileName, this.fileName));
3841
return true;
3942
} else {
40-
SameLoggerObject.getSameLoggerObject().getLogger().warning("Error the file '" + this.fileName + "' could not be created");
43+
SameLoggerObject.getSameLoggerObject().getLogger().warning(SameLoggerObject.getSameLoggerObject().getOutputMessages().getFileNoCreatedSuccessful().replace(this.replaceFileName, this.fileName));
4144
return false;
4245
}
4346
} else {
@@ -75,12 +78,24 @@ public void run() {
7578
void bootStrap(final String... command) {
7679

7780
if (this.initializedLoggerFolder() && this.initializedLoggerFile()) {
78-
SameLoggerObject.getSameLoggerObject().getLogger().info("The folder and file's initialization was successful");
81+
SameLoggerObject.getSameLoggerObject().getLogger().info(SameLoggerObject.getSameLoggerObject().getOutputMessages().getFolderFileInitialisationSuccessful());
7982
if (command.length == 1) {
80-
SameLoggerObject.getSameLoggerObject().getProcessManager().executeProcess(command[0]);
83+
if (!SameLoggerObject.getSameLoggerObject().getProcessManager().executeProcess(command[0])) {
84+
SameLoggerObject.getSameLoggerObject().getLogger().warning(SameLoggerObject.getSameLoggerObject().getOutputMessages().getExecuteNoSuccessful());
85+
SameLoggerObject.getSameLoggerObject().getLogger().warning(SameLoggerObject.getSameLoggerObject().getOutputMessages().getPoweredDown());
86+
System.exit(-1);
87+
} else {
88+
SameLoggerObject.getSameLoggerObject().getLogger().info(SameLoggerObject.getSameLoggerObject().getOutputMessages().getExecuteSuccessful()+"\n");
89+
}
8190
} else {
8291
final String stringBuilder = Arrays.stream(command).map(strings -> strings + " ").collect(Collectors.joining());
83-
SameLoggerObject.getSameLoggerObject().getProcessManager().executeProcess(stringBuilder);
92+
if (!SameLoggerObject.getSameLoggerObject().getProcessManager().executeProcess(stringBuilder)) {
93+
SameLoggerObject.getSameLoggerObject().getLogger().warning(SameLoggerObject.getSameLoggerObject().getOutputMessages().getExecuteNoSuccessful());
94+
SameLoggerObject.getSameLoggerObject().getLogger().warning(SameLoggerObject.getSameLoggerObject().getOutputMessages().getPoweredDown());
95+
System.exit(-1);
96+
} else {
97+
SameLoggerObject.getSameLoggerObject().getLogger().info(SameLoggerObject.getSameLoggerObject().getOutputMessages().getExecuteSuccessful()+"\n");
98+
}
8499
}
85100
try {
86101
this.initializedLoggerRunnable(this.checkIsJarFile(command) ? SameLoggerObject.getSameLoggerObject().getProcessManager().inputStream() : SameLoggerObject.getSameLoggerObject().getProcessManager().errorStream());
@@ -92,9 +107,9 @@ void bootStrap(final String... command) {
92107
}
93108
}
94109

95-
private boolean checkIsJarFile(final String... command){
96-
for (String strings: command) {
97-
if (strings.contains("-jar") || strings.contains("java") || strings.contains(".jar")){
110+
private boolean checkIsJarFile(final String... command) {
111+
for (final String strings : command) {
112+
if (strings.contains("-jar") || strings.contains("java") || strings.contains(".jar")) {
98113
return true;
99114
}
100115
}
@@ -109,22 +124,27 @@ public FileWriter getFileWriter() {
109124
return this.fileWriter;
110125
}
111126

127+
public Date getDate() {
128+
return this.date;
129+
}
130+
131+
public DateFormat getDateFormat() {
132+
return this.dateFormat;
133+
}
134+
112135
void initializedLogo() {
113136
SameLoggerObject.getSameLoggerObject().getLogger().info("\n ____ _ \n" +
114137
" / ___| __ _ _ __ ___ ___| | ___ __ _ __ _ ___ _ __ \n" +
115138
" \\___ \\ / _` | '_ ` _ \\ / _ \\ | / _ \\ / _` |/ _` |/ _ \\ '__|\n" +
116139
" ___) | (_| | | | | | | __/ |__| (_) | (_| | (_| | __/ | \n" +
117140
" |____/ \\__,_|_| |_| |_|\\___|_____\\___/ \\__, |\\__, |\\___|_| \n" +
118141
" |___/ |___/ \n");
119-
SameLoggerObject.getSameLoggerObject().getLogger().info(SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.DESCRIPTION).toString()+"\n");
120-
SameLoggerObject.getSameLoggerObject().getLogger().info("Developer: "+SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.DEVELOPERS).toString());
121-
SameLoggerObject.getSameLoggerObject().getLogger().info("ArtifactID: "+SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.ARTIFACT_ID).toString());
122-
SameLoggerObject.getSameLoggerObject().getLogger().info("Version: "+SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.VERSION).toString());
123-
SameLoggerObject.getSameLoggerObject().getLogger().info("GroupID: "+SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.GROUP_ID).toString());
124-
SameLoggerObject.getSameLoggerObject().getLogger().info("Github: "+SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.ORGANISATION).toString()+"\n");
142+
SameLoggerObject.getSameLoggerObject().getLogger().info(SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.DESCRIPTION).toString() + "\n");
143+
SameLoggerObject.getSameLoggerObject().getLogger().info("Developer: " + SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.DEVELOPERS).toString());
144+
SameLoggerObject.getSameLoggerObject().getLogger().info("ArtifactID: " + SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.ARTIFACT_ID).toString());
145+
SameLoggerObject.getSameLoggerObject().getLogger().info("Version: " + SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.VERSION).toString());
146+
SameLoggerObject.getSameLoggerObject().getLogger().info("GroupID: " + SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.GROUP_ID).toString());
147+
SameLoggerObject.getSameLoggerObject().getLogger().info("Github: " + SameLoggerObject.getSameLoggerObject().getLogger().getPOMInformation(Logger.PomAllocation.ORGANISATION).toString() + "\n");
125148
}
126149

127-
public UUID getUuid() {
128-
return uuid;
129-
}
130150
}

‎src/main/java/de/mint/logger/objectservice/SameLoggerObject.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
import de.mint.logger.handlerservice.JarHandler;
44
import de.mint.logger.mainservice.SameLoggerBootStrap;
5-
import de.mint.logger.utilservice.FileInterpreter;
6-
import de.mint.logger.utilservice.Logger;
7-
import de.mint.logger.utilservice.ProcessManager;
8-
import de.mint.logger.utilservice.ShutdownHook;
5+
import de.mint.logger.utilservice.*;
96

107
public class SameLoggerObject {
118

@@ -23,6 +20,12 @@ public class SameLoggerObject {
2320

2421
private final JarHandler jarHandler = new JarHandler();
2522

23+
private final OutputMessages outputMessages = new OutputMessages();
24+
25+
public OutputMessages getOutputMessages() {
26+
return outputMessages;
27+
}
28+
2629
public JarHandler getJarHandler() {
2730
return jarHandler;
2831
}

‎src/main/java/de/mint/logger/utilservice/Logger.java‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,40 @@
66
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
77

88
import java.io.IOException;
9-
import java.util.Calendar;
109

1110
public class Logger {
1211

13-
private final Calendar calendar = Calendar.getInstance();
1412
private final MavenXpp3Reader mavenXpp3Reader = new MavenXpp3Reader();
1513
private final StringBuilder stringBuilder = new StringBuilder();
1614

1715
public void info(final String message) {
18-
System.out.println("|" + Level.INFO.name() + "|" + this.calendar.getTime() + " | " + message);
16+
System.out.println("|" + Level.INFO.name() + "|" + SameLoggerObject.getSameLoggerObject().getSameLoggerBootStrap().getDate() + " | " + message);
1917
}
2018

2119
public void warning(final String message) {
22-
System.out.println("|" + Level.WARNING.name() + "|" + this.calendar.getTime() + " | " + message);
20+
System.out.println("|" + Level.WARNING.name() + "|" + SameLoggerObject.getSameLoggerObject().getSameLoggerBootStrap().getDate() + " | " + message);
2321
}
2422

2523
public String stringRework(final String message) {
26-
return "|" + Level.LOG.name() + "|" + this.calendar.getTime() + " | " + message;
24+
return "|" + Level.LOG.name() + "|" + SameLoggerObject.getSameLoggerObject().getSameLoggerBootStrap().getDate() + " | " + message;
2725
}
2826

2927
public Object getPOMInformation(final PomAllocation pomAllocation) {
3028
try {
3129
final Model model = this.mavenXpp3Reader.read(SameLoggerObject.getSameLoggerObject().getJarHandler().getPomFromJar());
3230
switch (pomAllocation) {
3331
case VERSION:
34-
return model.getVersion() != null ? model.getVersion() : "No version available";
32+
return model.getVersion() != null ? model.getVersion() : SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
3533
case URL:
36-
return model.getUrl() != null ? model.getUrl() : "No url available";
34+
return model.getUrl() != null ? model.getUrl() : SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
3735
case DEVELOPERS:
3836
if (model.getDevelopers() != null) {
3937
for (final Developer developer : model.getDevelopers()) {
4038
this.stringBuilder.append(developer.getId());
4139
}
4240
return this.stringBuilder.toString();
4341
} else {
44-
return "No developer available";
42+
return SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
4543
}
4644
case LICENSE:
4745
if (model.getLicenses() != null) {
@@ -50,28 +48,28 @@ public Object getPOMInformation(final PomAllocation pomAllocation) {
5048
}
5149
return this.stringBuilder.toString();
5250
} else {
53-
return "No license available";
51+
return SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
5452
}
5553
case ID:
56-
return model.getId() != null ? model.getId() : "No id available";
54+
return model.getId() != null ? model.getId() : SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
5755
case GROUP_ID:
58-
return model.getGroupId() != null ? model.getGroupId() : "No group-id available";
56+
return model.getGroupId() != null ? model.getGroupId() : SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
5957
case DESCRIPTION:
60-
return model.getDescription() != null ? model.getDescription() : "No description available";
58+
return model.getDescription() != null ? model.getDescription() : SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
6159
case DEPENDENCIES:
6260
if (model.getDependencies() != null) {
6361
for (final Dependency dependency : model.getDependencies()) {
6462
this.stringBuilder.append(dependency.getGroupId()).append(dependency.getArtifactId()).append(dependency.getVersion());
6563
}
6664
return this.stringBuilder.toString();
6765
} else {
68-
return "No dependency available";
66+
return SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
6967
}
7068
case ORGANISATION:
7169
if (model.getOrganization() != null) {
7270
return model.getOrganization().getName();
7371
} else {
74-
return "No organization available";
72+
return SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
7573
}
7674
case REPOSITORIES:
7775
if (model.getRepositories() != null) {
@@ -80,10 +78,10 @@ public Object getPOMInformation(final PomAllocation pomAllocation) {
8078
}
8179
return this.stringBuilder.toString();
8280
} else {
83-
return "No repository available";
81+
return SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
8482
}
8583
case ARTIFACT_ID:
86-
return model.getArtifactId() != null ? model.getArtifactId() : "No artifact-id available";
84+
return model.getArtifactId() != null ? model.getArtifactId() : SameLoggerObject.getSameLoggerObject().getOutputMessages().getPomInformationNoAvailable().replace("%allocation%" , pomAllocation.name());
8785
}
8886
return null;
8987
} catch (final XmlPullParserException | IOException e) {

‎src/main/java/de/mint/logger/utilservice/OutputMessages.java‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
package de.mint.logger.utilservice;
2+
3+
public class OutputMessages {
4+
5+
final String executeSuccessful = "The program was started successfully";
6+
final String executeNoSuccessful = "The program could not be executed";
7+
final String poweredDown = "The logger is now powered down";
8+
final String processTerminated = "The process will be terminated";
9+
final String processNeverStarted = "The process was never started";
10+
final String pomInformationNoAvailable = "No %allocation% available";
11+
final String fileSavedSuccessful = "The file '%fileName%' was saved successfully";
12+
final String folderCreatedSuccessful = "The folder '%folderName%' was successfully created";
13+
final String folderNoCreatedSuccessful = "Error the folder '%folderName%' could not be created";
14+
final String fileCreatedSuccessful = "The file '%fileName%' was successfully created";
15+
final String fileNoCreatedSuccessful = "Error the file '%fileName%' could not be created";
16+
final String folderFileInitialisationSuccessful = "The folder and file's initialization was successful";
17+
18+
public String getExecuteSuccessful() {
19+
return executeSuccessful;
20+
}
21+
22+
public String getExecuteNoSuccessful() {
23+
return this.executeNoSuccessful;
24+
}
25+
26+
public String getPoweredDown() {
27+
return this.poweredDown;
28+
}
29+
30+
public String getProcessTerminated() {
31+
return this.processTerminated;
32+
}
33+
34+
public String getProcessNeverStarted() {
35+
return this.processNeverStarted;
36+
}
37+
38+
public String getPomInformationNoAvailable() {
39+
return this.pomInformationNoAvailable;
40+
}
41+
42+
public String getFileSavedSuccessful() {
43+
return this.fileSavedSuccessful;
44+
}
45+
46+
public String getFolderCreatedSuccessful() {
47+
return this.folderCreatedSuccessful;
48+
}
49+
50+
public String getFolderNoCreatedSuccessful() {
51+
return this.folderNoCreatedSuccessful;
52+
}
53+
54+
public String getFileCreatedSuccessful() {
55+
return this.fileCreatedSuccessful;
56+
}
57+
58+
public String getFileNoCreatedSuccessful() {
59+
return this.fileNoCreatedSuccessful;
60+
}
61+
62+
public String getFolderFileInitialisationSuccessful() {
63+
return this.folderFileInitialisationSuccessful;
64+
}
65+
}

0 commit comments

Comments
 (0)