Skip to content

Commit 254239c

Browse files
sobychackomarkpollack
authored andcommitted
More checkstyle fixes
1 parent 12ff83b commit 254239c

File tree

4 files changed

+6
-23
lines changed

4 files changed

+6
-23
lines changed

models/spring-ai-ollama/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<maven.compiler.source>17</maven.compiler.source>
3535
<maven.compiler.target>17</maven.compiler.target>
3636
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
37-
<disable.checks>true</disable.checks>
37+
<disable.checks>false</disable.checks>
3838
</properties>
3939

4040
<dependencies>

spring-ai-spring-boot-autoconfigure/pom.xml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
~ Copyright 2023-2024 the original author or authors.
4-
~
5-
~ Licensed under the Apache License, Version 2.0 (the "License");
6-
~ you may not use this file except in compliance with the License.
7-
~ You may obtain a copy of the License at
8-
~
9-
~ https://www.apache.org/licenses/LICENSE-2.0
10-
~
11-
~ Unless required by applicable law or agreed to in writing, software
12-
~ distributed under the License is distributed on an "AS IS" BASIS,
13-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
~ See the License for the specific language governing permissions and
15-
~ limitations under the License.
16-
-->
17-
182
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
193
xmlns="http://maven.apache.org/POM/4.0.0"
204
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -37,7 +21,7 @@
3721
</scm>
3822

3923
<properties>
40-
<disable.checks>true</disable.checks>
24+
<disable.checks>false</disable.checks>
4125
</properties>
4226

4327
<dependencies>

spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,17 @@
1616

1717
package org.springframework.ai.autoconfigure.ollama;
1818

19+
import java.time.Duration;
20+
1921
import org.junit.jupiter.api.AfterAll;
2022
import org.junit.jupiter.api.BeforeAll;
2123
import org.testcontainers.ollama.OllamaContainer;
2224

23-
import java.time.Duration;
24-
2525
import org.springframework.ai.ollama.api.OllamaApi;
2626
import org.springframework.ai.ollama.management.ModelManagementOptions;
2727
import org.springframework.ai.ollama.management.OllamaModelManager;
2828
import org.springframework.ai.ollama.management.PullModelStrategy;
2929

30-
import static org.springframework.ai.autoconfigure.ollama.BaseOllamaIT.isDisabled;
31-
3230
public class BaseOllamaIT {
3331

3432
private static OllamaContainer ollamaContainer;
@@ -38,7 +36,7 @@ public class BaseOllamaIT {
3836

3937
@BeforeAll
4038
public static void setUp() {
41-
if (useTestcontainers && !BaseOllamaIT.isDisabled()) {
39+
if (useTestcontainers && !isDisabled()) {
4240
ollamaContainer = new OllamaContainer(OllamaImage.IMAGE).withReuse(true);
4341
ollamaContainer.start();
4442
}

src/checkstyle/checkstyle-suppressions.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@
2828
<suppress files="FiltersParser\.java" checks="AvoidNestedBlocks"/>
2929
<suppress files="FiltersParser\.java" checks="MultipleVariableDeclarations"/>
3030
<suppress files="FiltersLexer\.java" checks="MultipleVariableDeclarations"/>
31+
<suppress files="BaseOllamaIT.java" checks="HideUtilityClassConstructor"/>
3132

3233
</suppressions>

0 commit comments

Comments
 (0)