Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions AnnotationProcessing/AnnotationProcessing.iml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Annotations" />
<orderEntry type="module" module-name="Util" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: net.jodah:typetools:0.6.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
Expand Down
6 changes: 3 additions & 3 deletions AnnotationProcessing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -47,12 +47,12 @@
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Annotations</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Util</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion Annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
6 changes: 0 additions & 6 deletions ArgParser-Impl/ArgParser-Impl.iml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="ArgParser" />
<orderEntry type="module" module-name="Util" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: net.jodah:typetools:0.6.0" level="project" />
<orderEntry type="module" module-name="Annotations" />
<orderEntry type="module" module-name="ValueTransformer" />
<orderEntry type="module" module-name="Runtime" />
<orderEntry type="module" module-name="IUI" />
<orderEntry type="module" module-name="DomParsing" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
Expand Down
6 changes: 3 additions & 3 deletions ArgParser-Impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,12 +14,12 @@
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>ArgParser</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>ValueTransformer</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void parseArgs(Object obj, String label, String[] args) {
try {
argument.getField().set(obj, result);
} catch (IllegalAccessException e) {
e.printStackTrace();
throw new ArgParseException("Could not access " + obj.getClass().getName() + "#" + argument.getField().getName(), e);
}
}
}
Expand Down
3 changes: 0 additions & 3 deletions ArgParser/ArgParser.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Util" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: net.jodah:typetools:0.6.0" level="project" />
<orderEntry type="module" module-name="Annotations" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
Expand Down
4 changes: 2 additions & 2 deletions ArgParser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,7 +14,7 @@
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Util</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
</dependencies>

Expand Down
6 changes: 0 additions & 6 deletions Automatisation/Automatisation.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Util" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: net.jodah:typetools:0.6.0" level="project" />
<orderEntry type="module" module-name="Annotations" />
<orderEntry type="module" module-name="Runtime" />
<orderEntry type="module" module-name="IUI" />
<orderEntry type="module" module-name="ArgParser" />
<orderEntry type="module" module-name="DomParsing" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
Expand Down
6 changes: 3 additions & 3 deletions Automatisation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,12 +14,12 @@
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Util</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Runtime</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.splotycode.mosaik.automatisation.crawler.site;

import io.github.splotycode.mosaik.automatisation.crawler.Crawler;
import lombok.Getter;
import io.github.splotycode.mosaik.util.io.IOUtil;
import lombok.Getter;

import java.io.IOException;
import java.net.URL;
Expand All @@ -22,9 +22,8 @@ private String getContent0() {
try {
return IOUtil.loadText(url.openConnection().getInputStream());
} catch (IOException e) {
e.printStackTrace();
throw new RuntimeException("Could not load url to text", e);
}
return null;
}

public static final Pattern pattern = Pattern.compile("<a\\s+(?:[^>]*?\\s+)?href=([\"'])(.*?)\\1");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.github.splotycode.mosaik.automatisation.generators;

import io.github.splotycode.mosaik.util.ExceptionUtil;
import io.github.splotycode.mosaik.util.io.IOUtil;

import java.io.IOException;
Expand Down Expand Up @@ -42,15 +43,13 @@ public String getRandom() {
}
return cache.get(ThreadLocalRandom.current().nextInt(0, cache.size()));
} else {
if (count == -1) count = Files.lines(path).count();
try (Stream<String> lines = Files.lines(path)) {
if (count == -1) {
count = lines.count();
}
return lines.skip(ThreadLocalRandom.current().nextLong(0, count)).findFirst().orElse(null);
}
}
} catch (IOException e) {
e.printStackTrace();
ExceptionUtil.throwRuntime(e);
}
return null;
}
Expand Down
7 changes: 0 additions & 7 deletions Console/Console.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="Runtime" />
<orderEntry type="module" module-name="Util" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: net.jodah:typetools:0.6.0" level="project" />
<orderEntry type="module" module-name="Annotations" />
<orderEntry type="module" module-name="IUI" />
<orderEntry type="module" module-name="ArgParser" />
<orderEntry type="module" module-name="DomParsing" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
Expand Down
4 changes: 2 additions & 2 deletions Console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,7 +14,7 @@
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Runtime</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
</dependencies>

Expand Down
6 changes: 2 additions & 4 deletions Database/Database.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.4.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.junit.jupiter:junit-jupiter-api:5.4.0-RC1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.junit.jupiter:junit-jupiter-api:5.4.0-RC2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.junit.platform:junit-platform-commons:1.4.0-RC1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.junit.platform:junit-platform-commons:1.4.0-RC2" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="module" module-name="Util" />
<orderEntry type="library" name="Maven: net.jodah:typetools:0.6.0" level="project" />
<orderEntry type="module" module-name="Annotations" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
Expand Down
4 changes: 2 additions & 2 deletions Database/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -30,7 +30,7 @@
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Util</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions DomParsing-Impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,12 +14,12 @@
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Runtime</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>ValueTransformer</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package io.github.splotycode.mosaik.domparsingimpl;

import io.github.splotycode.mosaik.util.StringUtil;
import io.github.splotycode.mosaik.util.io.FileUtil;
import lombok.Getter;
import io.github.splotycode.mosaik.domparsing.dom.Document;
import io.github.splotycode.mosaik.domparsing.parsing.ParsingHandle;
import io.github.splotycode.mosaik.domparsing.parsing.ParsingManager;
import io.github.splotycode.mosaik.domparsing.parsing.input.DomFileInput;
import io.github.splotycode.mosaik.domparsing.parsing.input.DomInput;
import io.github.splotycode.mosaik.domparsing.parsing.input.DomStreamInput;
import io.github.splotycode.mosaik.domparsing.parsing.input.DomUrlInput;
import io.github.splotycode.mosaik.domparsing.dom.Document;
import io.github.splotycode.mosaik.util.StringUtil;
import io.github.splotycode.mosaik.util.collection.ArrayUtil;
import io.github.splotycode.mosaik.util.io.FileUtil;
import io.github.splotycode.mosaik.util.io.PathUtil;
import lombok.Getter;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -64,14 +64,13 @@ public <P extends Document> P parseDocument(File file, Class<? extends ParsingHa
@Override
public Document parseDocument(URL url) {
DomUrlInput input = new DomUrlInput(url);
ParsingHandle handle = handles.stream().filter(cHandle -> {
try {
return ArrayUtil.contains(cHandle.getMimeTypes(), input.getConnection().getContentType());
} catch (IOException e) {
e.printStackTrace();
}
return false;
}).findFirst().orElseThrow(NoHandleFoundException::new);
String contentType;
try {
contentType = input.getConnection().getContentType();
} catch (IOException e) {
throw new RuntimeException("Failed to receive content type");
}
ParsingHandle handle = handles.stream().filter(cHandle -> ArrayUtil.contains(cHandle.getMimeTypes(), contentType)).findFirst().orElseThrow(NoHandleFoundException::new);
return parseDocument(input, handle);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public static Object toObject(InputStream stream) {
public static byte[] fromObject(Object object) {
try {
KeyValueDocument document = new KeyValueDocument();
document.addNodeWithInnerText("_clazz__", object.getClass().getName());
for (Map.Entry<String, String> node : getData(object.getClass()).entrySet()) {
Field field = object.getClass().getDeclaredField(node.getValue());
field.setAccessible(true);
Expand Down
4 changes: 2 additions & 2 deletions DomParsing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Mosaik-Framework</artifactId>
<groupId>io.github.splotycode.mosaik</groupId>
<version>2.2.3</version>
<version>2.2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,7 +14,7 @@
<dependency>
<groupId>io.github.splotycode.mosaik</groupId>
<artifactId>Util</artifactId>
<version>2.2.3</version>
<version>2.2.4</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,26 @@ public byte[] getBytes() {
try {
return IOUtil.toByteArray(getStream());
} catch (IOException e) {
e.printStackTrace();
throw new DomInputException("Could not convert stream to byte array", e);
}
return null;
}

@Override
public String getString() {
try {
return IOUtil.loadText(getStream());
} catch (IOException e) {
e.printStackTrace();
throw new DomInputException("Could not convert stream to text", e);
}
return null;
}

@Override
public InputStream getStream() {
try {
return new FileInputStream(file);
} catch (FileNotFoundException e) {
e.printStackTrace();
throw new DomInputException("Could not find file" + file.getAbsolutePath(), e);
}
return null;
}

@Override
Expand Down
Loading