Skip to content

Commit e79cde2

Browse files
committed
Tiny fixes and make core modules in autoconfigure modules as optional
1 parent da97a2b commit e79cde2

File tree

15 files changed

+22
-8
lines changed
  • cache/spring-boot-python-executor-cache-autoconfigure
  • common/spring-boot-python-executor-common/src/main/java/io/w4t3rcs/python/script
  • core
  • executor
    • grpc/spring-boot-python-executor-grpc-executor-autoconfigure
    • process/spring-boot-python-executor-process-executor-autoconfigure
    • rest/spring-boot-python-executor-rest-executor-autoconfigure
  • other/py4j/spring-boot-python-executor-py4j-autoconfigure
  • resolver
    • pretty
    • restricted/spring-boot-python-executor-restricted-resolver-autoconfigure
    • result/spring-boot-python-executor-result-resolver-autoconfigure
    • spelython/spring-boot-python-executor-spelython-resolver-autoconfigure

15 files changed

+22
-8
lines changed

cache/spring-boot-python-executor-cache-autoconfigure/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<groupId>io.github.w4t3rcs</groupId>
4444
<artifactId>spring-boot-python-executor-cache</artifactId>
4545
<version>${project.version}</version>
46+
<optional>true</optional>
4647
</dependency>
4748
<dependency>
4849
<groupId>org.springframework.boot</groupId>

common/spring-boot-python-executor-common/src/main/java/io/w4t3rcs/python/script/PythonScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public boolean endsWithCode(String codeLine) {
9292
}
9393

9494
public boolean isImportEmpty() {
95-
return this.getCodeLines().isEmpty();
95+
return this.getImportLines().isEmpty();
9696
}
9797

9898
public boolean isCodeEmpty() {

core/spring-boot-python-executor-autoconfigure/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<groupId>io.github.w4t3rcs</groupId>
4545
<artifactId>spring-boot-python-executor-core</artifactId>
4646
<version>${project.version}</version>
47+
<optional>true</optional>
4748
</dependency>
4849
<dependency>
4950
<groupId>org.springframework.boot</groupId>

core/spring-boot-python-executor-core/src/main/java/io/w4t3rcs/python/file/BasicPythonFileReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public PythonScript readScript(PythonScript script) {
4747
Path scriptPath = this.getScriptPath(source);
4848
try (BufferedReader bufferedReader = Files.newBufferedReader(scriptPath)) {
4949
String body = bufferedReader.lines().collect(Collectors.joining("\n"));
50-
script.appendAll(body);
50+
script.getBuilder().appendAll(body);
5151
return script;
5252
} catch (IOException e) {
5353
throw new PythonScriptReadingFromFileException(e);

core/spring-boot-python-executor-starter/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
<artifactId>spring-boot-python-executor-result-resolver-starter</artifactId>
6565
<version>${project.version}</version>
6666
</dependency>
67+
<dependency>
68+
<groupId>io.github.w4t3rcs</groupId>
69+
<artifactId>spring-boot-python-executor-pretty-resolver-starter</artifactId>
70+
<version>${project.version}</version>
71+
</dependency>
6772
</dependencies>
6873
<build>
6974
<plugins>

executor/grpc/spring-boot-python-executor-grpc-executor-autoconfigure/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<groupId>io.github.w4t3rcs</groupId>
4444
<artifactId>spring-boot-python-executor-grpc-executor-core</artifactId>
4545
<version>${project.version}</version>
46+
<optional>true</optional>
4647
</dependency>
4748
<dependency>
4849
<groupId>org.springframework.boot</groupId>

executor/process/spring-boot-python-executor-process-executor-autoconfigure/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<groupId>io.github.w4t3rcs</groupId>
4444
<artifactId>spring-boot-python-executor-process-executor-core</artifactId>
4545
<version>${project.version}</version>
46+
<optional>true</optional>
4647
</dependency>
4748
<dependency>
4849
<groupId>org.springframework.boot</groupId>

executor/rest/spring-boot-python-executor-rest-executor-autoconfigure/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<groupId>io.github.w4t3rcs</groupId>
4444
<artifactId>spring-boot-python-executor-rest-executor-core</artifactId>
4545
<version>${project.version}</version>
46+
<optional>true</optional>
4647
</dependency>
4748
<dependency>
4849
<groupId>org.springframework.boot</groupId>

other/py4j/spring-boot-python-executor-py4j-autoconfigure/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<groupId>io.github.w4t3rcs</groupId>
4545
<artifactId>spring-boot-python-executor-py4j-core</artifactId>
4646
<version>${project.version}</version>
47+
<optional>true</optional>
4748
</dependency>
4849
<dependency>
4950
<groupId>org.springframework.boot</groupId>

resolver/pretty/spring-boot-python-executor-pretty-resolver-autoconfigure/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<groupId>io.github.w4t3rcs</groupId>
4444
<artifactId>spring-boot-python-executor-pretty-resolver-core</artifactId>
4545
<version>${project.version}</version>
46+
<optional>true</optional>
4647
</dependency>
4748
<dependency>
4849
<groupId>org.springframework.boot</groupId>

0 commit comments

Comments
 (0)