Skip to content

Commit 07765cd

Browse files
author
Joe Alphonso
committed
spotless
1 parent c860cba commit 07765cd

90 files changed

Lines changed: 168 additions & 398 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/check-formatting.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Format code
4343
run: |
4444
if [[ "${{ github.event_name }}" != "merge_group" ]]; then
45-
mvn --show-version --batch-mode --errors --no-transfer-progress "-Dstyle.color=always" clean formatter:format sortpom:sort impsort:sort -Dmaven.build.cache.enabled=false -Pautoformat -Dutils -Dservices -Dstarters
45+
mvn --show-version --batch-mode --errors --no-transfer-progress "-Dstyle.color=always" clean formatter:format sortpom:sort spotless:apply -Dmaven.build.cache.enabled=false -Pautoformat -Dutils -Dservices -Dstarters -Ddist -Ddeploy
4646
if ! git diff-index --quiet HEAD; then
4747
echo "Code formatting issues detected. Please format locally.";
4848
exit 1;

‎core/base-rest-responses/src/main/java/datawave/marking/ColumnVisibilitySecurityMarking.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
import org.apache.accumulo.access.Access;
1313
import org.apache.accumulo.access.AccessExpression;
14-
15-
import com.google.common.base.Preconditions;
1614
import org.apache.accumulo.access.examples.ParseExamples;
1715
import org.apache.accumulo.access.impl.AccessExpressionImpl;
1816

17+
import com.google.common.base.Preconditions;
18+
1919
@XmlAccessorType(XmlAccessType.NONE)
2020
@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
2121
public class ColumnVisibilitySecurityMarking implements SecurityMarking {

‎core/cached-results/src/main/java/datawave/core/query/cachedresults/CacheableQueryRowReader.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package datawave.core.query.cachedresults;
22

3+
import static org.apache.accumulo.access.examples.ParseExamples.ACCESS;
4+
35
import java.sql.ResultSet;
46
import java.sql.ResultSetMetaData;
57
import java.sql.SQLException;
@@ -18,8 +20,6 @@
1820
import datawave.webservice.query.cachedresults.CacheableQueryRow;
1921
import datawave.webservice.query.result.event.ResponseObjectFactory;
2022

21-
import static org.apache.accumulo.access.examples.ParseExamples.ACCESS;
22-
2323
public class CacheableQueryRowReader {
2424

2525
private static Logger log = LoggerFactory.getLogger(CacheableQueryRowReader.class);
@@ -109,8 +109,7 @@ public static CacheableQueryRow createRow(ResultSet cachedRowSet, Set<String> fi
109109
columnMarkingsMap.put(columnName, AccessExpressionUtil.toAccessExpressionMarkings(ACCESS.newExpression(markingStr)));
110110
columnVisibilityMap.put(columnName, combinedString.substring(x + 1));
111111
} else {
112-
columnMarkingsMap.put(columnName,
113-
AccessExpressionUtil.toAccessExpressionMarkings(ACCESS.newExpression(combinedString)));
112+
columnMarkingsMap.put(columnName, AccessExpressionUtil.toAccessExpressionMarkings(ACCESS.newExpression(combinedString)));
114113
columnVisibilityMap.put(columnName, "");
115114
}
116115
}

‎core/in-memory-accumulo/pom.xml‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,31 @@
135135
<build>
136136
<pluginManagement>
137137
<plugins>
138+
<plugin>
139+
<groupId>com.diffplug.spotless</groupId>
140+
<artifactId>spotless-maven-plugin</artifactId>
141+
<version>2.43.0</version>
142+
<configuration>
143+
<java>
144+
<removeUnusedImports />
145+
<importOrder>
146+
<order>\#java,\#javax,\#,java,javax,org,com,</order>
147+
</importOrder>
148+
<excludes>
149+
<exclude>**/thrift/*.java</exclude>
150+
<exclude>**/tokenize/StandardLexer.java</exclude>
151+
</excludes>
152+
</java>
153+
</configuration>
154+
<executions>
155+
<execution>
156+
<goals>
157+
<goal>apply</goal>
158+
</goals>
159+
<phase>process-sources</phase>
160+
</execution>
161+
</executions>
162+
</plugin>
138163
<plugin>
139164
<groupId>com.github.ekryd.sortpom</groupId>
140165
<artifactId>sortpom-maven-plugin</artifactId>
@@ -160,27 +185,6 @@
160185
</execution>
161186
</executions>
162187
</plugin>
163-
<plugin>
164-
<groupId>net.revelc.code</groupId>
165-
<artifactId>impsort-maven-plugin</artifactId>
166-
<version>1.9.0</version>
167-
<configuration>
168-
<groups>java.,javax.,org.,com.</groups>
169-
<staticGroups>java,*</staticGroups>
170-
<excludes>
171-
<exclude>**/thrift/*.java</exclude>
172-
</excludes>
173-
</configuration>
174-
<executions>
175-
<execution>
176-
<id>sort-imports</id>
177-
<goals>
178-
<goal>sort</goal>
179-
</goals>
180-
<phase>process-sources</phase>
181-
</execution>
182-
</executions>
183-
</plugin>
184188
<plugin>
185189
<groupId>net.revelc.code.formatter</groupId>
186190
<artifactId>formatter-maven-plugin</artifactId>
@@ -311,12 +315,12 @@
311315
<build>
312316
<plugins>
313317
<plugin>
314-
<groupId>com.github.ekryd.sortpom</groupId>
315-
<artifactId>sortpom-maven-plugin</artifactId>
318+
<groupId>com.diffplug.spotless</groupId>
319+
<artifactId>spotless-maven-plugin</artifactId>
316320
</plugin>
317321
<plugin>
318-
<groupId>net.revelc.code</groupId>
319-
<artifactId>impsort-maven-plugin</artifactId>
322+
<groupId>com.github.ekryd.sortpom</groupId>
323+
<artifactId>sortpom-maven-plugin</artifactId>
320324
</plugin>
321325
<plugin>
322326
<groupId>net.revelc.code.formatter</groupId>

‎core/in-memory-accumulo/src/main/java/datawave/accumulo/inmemory/InMemoryConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@
1717
package datawave.accumulo.inmemory;
1818

1919
import java.util.Map;
20-
import java.util.Map.Entry;
2120

2221
import org.apache.accumulo.core.conf.AccumuloConfiguration;
2322
import org.apache.accumulo.core.conf.Property;
2423

25-
import com.google.common.base.Predicate;
26-
2724
class InMemoryConfiguration extends AccumuloConfiguration {
2825
Map<String,String> map;
2926

‎core/in-memory-accumulo/src/main/java/datawave/accumulo/inmemory/InMemoryNamespace.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Map;
2424
import java.util.Map.Entry;
2525

26-
import org.apache.accumulo.core.conf.AccumuloConfiguration;
2726
import org.apache.accumulo.core.conf.DefaultConfiguration;
2827
import org.apache.accumulo.core.conf.Property;
2928
import org.apache.accumulo.core.security.NamespacePermission;

‎core/modification/src/main/java/datawave/modification/MutableMetadataHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package datawave.modification;
22

3+
import static org.apache.accumulo.access.examples.ParseExamples.ACCESS;
4+
35
import java.util.ArrayList;
46
import java.util.Arrays;
57
import java.util.Collections;
@@ -75,8 +77,6 @@
7577
import datawave.webservice.result.EventQueryResponseBase;
7678
import datawave.webservice.result.GenericResponse;
7779

78-
import static org.apache.accumulo.access.examples.ParseExamples.ACCESS;
79-
8080
/**
8181
* Class that handles requests for modification requests (INSERT, UPDATE, DELETE) for metadata in the shard schema. <br>
8282
* <br>

‎core/utils/accumulo-utils/src/main/java/datawave/marking/AccessExpressionMarkings.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import org.apache.accumulo.access.Access;
44
import org.apache.accumulo.access.AccessExpression;
5+
import org.apache.accumulo.access.examples.ParseExamples;
56

67
import com.fasterxml.jackson.annotation.JsonAutoDetect;
78
import com.fasterxml.jackson.annotation.JsonCreator;
89
import com.fasterxml.jackson.annotation.JsonProperty;
910

1011
import lombok.Builder;
1112
import lombok.Data;
12-
import org.apache.accumulo.access.examples.ParseExamples;
1313

1414
@Data
1515
@Builder

‎core/utils/metadata-utils/src/main/java/datawave/iterators/FrequencyMetadataAggregator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,8 +586,9 @@ private Map<Key,Value> buildCacheEntries() {
586586
private ColumnVisibility combineAllVisibilities() {
587587
Set<ColumnVisibility> visibilities = visibilityToDateFrequencies.keySet();
588588
try {
589-
return AccessExpressionUtil.toColumnVisibility(AccessExpressionUtil.combine(markingFunctions, visibilities.stream()
590-
.map(cv -> AccessExpressionUtil.toAccessExpressionMarkings(AccessExpressionUtil.toAccessExpression(cv))).collect(Collectors.toSet())));
589+
return AccessExpressionUtil.toColumnVisibility(AccessExpressionUtil.combine(markingFunctions,
590+
visibilities.stream().map(cv -> AccessExpressionUtil.toAccessExpressionMarkings(AccessExpressionUtil.toAccessExpression(cv)))
591+
.collect(Collectors.toSet())));
591592
} catch (MarkingFunctions.Exception e) {
592593
log.error("Failed to combine visibilities " + visibilities);
593594
throw new IllegalArgumentException("Failed to combine visibilities " + visibilities, e);

‎core/utils/type-utils/src/test/java/datawave/data/normalizer/regex/visitor/AnchorTrimmerTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.junit.jupiter.api.Test;
77

88
import datawave.data.normalizer.regex.Node;
9-
import datawave.data.normalizer.regex.visitor.AnchorTrimmer;
109

1110
class AnchorTrimmerTest {
1211

0 commit comments

Comments
 (0)