Skip to content

Commit

Permalink
chore: no star imports (#15743)
Browse files Browse the repository at this point in the history 
* chore: no star imports

* fix: revert changes in flyway script files

* chore: code formatting
  • Loading branch information
@jbee
jbee authored Nov 20, 2023
1 parent 7fd3140 commit 719ce54
Show file tree
Hide file tree
Showing 104 changed files with 561 additions and 129 deletions.
3 changes: 2 additions & 1 deletion dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ParseType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
*/
package org.hisp.dhis.expression;

import static org.hisp.dhis.analytics.DataType.*;
import static org.hisp.dhis.analytics.DataType.BOOLEAN;
import static org.hisp.dhis.analytics.DataType.NUMERIC;

import org.hisp.dhis.analytics.DataType;

Expand Down
6 changes: 5 additions & 1 deletion dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import java.util.HashSet;
import java.util.Set;
import org.hisp.dhis.common.*;
import org.hisp.dhis.common.BaseDimensionalItemObject;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DimensionItemType;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.MetadataObject;
import org.hisp.dhis.common.coordinate.CoordinateObject;
import org.hisp.dhis.common.coordinate.CoordinateUtils;
import org.locationtech.jts.geom.Geometry;
Expand Down
6 changes: 5 additions & 1 deletion dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import java.io.Serializable;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import lombok.EqualsAndHashCode;
Expand Down
5 changes: 4 additions & 1 deletion ...is-api/src/main/java/org/hisp/dhis/programrule/engine/ProgramRuleEntityMapperService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@
import org.hisp.dhis.programrule.ProgramRule;
import org.hisp.dhis.programrule.ProgramRuleVariable;
import org.hisp.dhis.rules.DataItem;
import org.hisp.dhis.rules.models.*;
import org.hisp.dhis.rules.models.Rule;
import org.hisp.dhis.rules.models.RuleEnrollment;
import org.hisp.dhis.rules.models.RuleEvent;
import org.hisp.dhis.rules.models.RuleVariable;
import org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValue;

/**
Expand Down
22 changes: 19 additions & 3 deletions dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/JobProgress.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,33 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.*;
import java.util.Collection;
import java.util.Date;
import java.util.Deque;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.*;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Stream;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import lombok.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.experimental.Accessors;
import org.hisp.dhis.feedback.ErrorCode;
import org.hisp.dhis.tracker.imports.validation.ValidationCode;
Expand Down
4 changes: 3 additions & 1 deletion dhis-2/dhis-api/src/test/java/org/hisp/dhis/eventhook/targets/auth/ApiTokenAuthTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
*/
package org.hisp.dhis.eventhook.targets.auth;

import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.hisp.dhis.common.auth.ApiTokenAuth;
import org.junit.jupiter.api.Test;
Expand Down
4 changes: 3 additions & 1 deletion dhis-2/dhis-api/src/test/java/org/hisp/dhis/eventhook/targets/auth/HttpBasicAuthTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
*/
package org.hisp.dhis.eventhook.targets.auth;

import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.hisp.dhis.common.auth.HttpBasicAuth;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...nalytics/src/main/java/org/hisp/dhis/analytics/common/query/NotLikeConditionRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*/
package org.hisp.dhis.analytics.common.query;

import static org.hisp.dhis.common.QueryOperator.*;
import static org.hisp.dhis.common.QueryOperator.NLIKE;

public class NotLikeConditionRenderer extends AbstractLikeConditionRenderer {
private NotLikeConditionRenderer(Renderable field, Renderable value) {
Expand Down
7 changes: 5 additions & 2 deletions .../src/main/java/org/hisp/dhis/analytics/data/NestedIndicatorCyclicDependencyInspector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
package org.hisp.dhis.analytics.data;

import static java.lang.String.format;
import static java.util.Collections.*;
import static java.util.Collections.emptyList;
import static org.hisp.dhis.common.DimensionItemType.INDICATOR;
import static org.hisp.dhis.common.DimensionalObjectUtils.asTypedList;
import static org.hisp.dhis.expression.ParseType.INDICATOR_EXPRESSION;
Expand All @@ -40,7 +40,10 @@
import java.util.Set;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.hisp.dhis.common.*;
import org.hisp.dhis.common.CyclicReferenceException;
import org.hisp.dhis.common.DimensionService;
import org.hisp.dhis.common.DimensionalItemId;
import org.hisp.dhis.common.DimensionalItemObject;
import org.hisp.dhis.expression.ExpressionService;
import org.hisp.dhis.indicator.Indicator;
import org.springframework.stereotype.Component;
Expand Down
4 changes: 3 additions & 1 deletion ...-analytics/src/main/java/org/hisp/dhis/analytics/event/data/AbstractAnalyticsService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@

import static java.util.Collections.emptyList;
import static java.util.Optional.empty;
import static java.util.stream.Collectors.*;
import static java.util.stream.Collectors.counting;
import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.toList;
import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
import static org.apache.commons.lang3.StringUtils.EMPTY;
import static org.apache.commons.lang3.StringUtils.joinWith;
Expand Down
6 changes: 5 additions & 1 deletion ...e-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultQueryItemLocator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@
import static org.hisp.dhis.common.DimensionalObject.ITEM_SEP;
import static org.hisp.dhis.feedback.ErrorCode.E7224;

import java.util.*;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Supplier;
import java.util.stream.Stream;
import lombok.RequiredArgsConstructor;
Expand Down
15 changes: 13 additions & 2 deletions ...ytics/src/test/java/org/hisp/dhis/analytics/common/query/BinaryConditionRendererTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,20 @@
package org.hisp.dhis.analytics.common.query;

import static org.hisp.dhis.analytics.common.query.Field.of;
import static org.hisp.dhis.common.QueryOperator.*;
import static org.hisp.dhis.common.QueryOperator.EQ;
import static org.hisp.dhis.common.QueryOperator.GE;
import static org.hisp.dhis.common.QueryOperator.GT;
import static org.hisp.dhis.common.QueryOperator.ILIKE;
import static org.hisp.dhis.common.QueryOperator.IN;
import static org.hisp.dhis.common.QueryOperator.LE;
import static org.junit.jupiter.api.Assertions.*;
import static org.hisp.dhis.common.QueryOperator.LIKE;
import static org.hisp.dhis.common.QueryOperator.LT;
import static org.hisp.dhis.common.QueryOperator.NEQ;
import static org.hisp.dhis.common.QueryOperator.NILIKE;
import static org.hisp.dhis.common.QueryOperator.NLIKE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.math.BigDecimal;
import java.math.BigInteger;
Expand Down
21 changes: 18 additions & 3 deletions ...e-analytics/src/test/java/org/hisp/dhis/analytics/data/DimensionalObjectProducerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,21 @@
import static org.hisp.dhis.DhisConvenienceTest.createOrganisationUnitGroup;
import static org.hisp.dhis.analytics.AnalyticsFinancialYearStartKey.FINANCIAL_YEAR_APRIL;
import static org.hisp.dhis.analytics.DataQueryParams.DYNAMIC_DIM_CLASSES;
import static org.hisp.dhis.common.DimensionType.*;
import static org.hisp.dhis.common.DimensionType.CATEGORY;
import static org.hisp.dhis.common.DimensionType.DATA_X;
import static org.hisp.dhis.common.DimensionType.ORGANISATION_UNIT;
import static org.hisp.dhis.common.DimensionType.ORGANISATION_UNIT_GROUP;
import static org.hisp.dhis.common.DimensionType.PERIOD;
import static org.hisp.dhis.common.DisplayProperty.SHORTNAME;
import static org.hisp.dhis.common.IdScheme.NAME;
import static org.hisp.dhis.common.IdScheme.UID;
import static org.hisp.dhis.feedback.ErrorCode.E7124;
import static org.hisp.dhis.setting.SettingKey.ANALYTICS_FINANCIAL_YEAR_START;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.when;
Expand All @@ -59,8 +67,15 @@
import org.hisp.dhis.analytics.AnalyticsSecurityManager;
import org.hisp.dhis.category.Category;
import org.hisp.dhis.category.CategoryOption;
import org.hisp.dhis.common.*;
import org.hisp.dhis.common.BaseDimensionalItemObject;
import org.hisp.dhis.common.BaseDimensionalObject;
import org.hisp.dhis.common.DimensionItemKeywords;
import org.hisp.dhis.common.DimensionItemKeywords.Keyword;
import org.hisp.dhis.common.DimensionService;
import org.hisp.dhis.common.DimensionalItemObject;
import org.hisp.dhis.common.DisplayProperty;
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.common.IllegalQueryException;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.i18n.I18n;
Expand Down
4 changes: 3 additions & 1 deletion ...c/test/java/org/hisp/dhis/analytics/event/data/AbstractJdbcEventAnalyticsManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
import static org.hisp.dhis.common.RequestTypeAware.EndpointAction.AGGREGATE;
import static org.hisp.dhis.common.RequestTypeAware.EndpointAction.QUERY;
import static org.hisp.dhis.common.RequestTypeAware.EndpointItem.ENROLLMENT;
import static org.hisp.dhis.common.ValueType.*;
import static org.hisp.dhis.common.ValueType.BOOLEAN;
import static org.hisp.dhis.common.ValueType.NUMBER;
import static org.hisp.dhis.common.ValueType.TEXT;
import static org.hisp.dhis.period.RelativePeriodEnum.THIS_YEAR;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
Expand Down
4 changes: 3 additions & 1 deletion ...his-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/AppMenuManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
*/
package org.hisp.dhis.appmanager;

import java.util.*;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
2 changes: 1 addition & 1 deletion ...service-core/src/main/java/org/hisp/dhis/expression/dataitem/DimItemProgramAttribute.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*/
package org.hisp.dhis.expression.dataitem;

import static org.hisp.dhis.common.DimensionItemType.*;
import static org.hisp.dhis.common.DimensionItemType.PROGRAM_ATTRIBUTE;
import static org.hisp.dhis.parser.expression.ParserUtils.assumeExpressionProgramAttribute;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext;

Expand Down
12 changes: 10 additions & 2 deletions ...ervice-core/src/main/java/org/hisp/dhis/fileresource/JCloudsFileResourceContentStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@
import java.io.OutputStream;
import java.net.URI;
import java.nio.file.Files;
import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.regex.Pattern;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Expand All @@ -49,7 +53,11 @@
import org.hisp.dhis.external.conf.DhisConfigurationProvider;
import org.hisp.dhis.external.location.LocationManager;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.*;
import org.jclouds.blobstore.BlobRequestSigner;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.ContainerNotFoundException;
import org.jclouds.blobstore.LocalBlobRequestSigner;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.internal.RequestSigningUnsupported;
import org.jclouds.domain.Credentials;
Expand Down
7 changes: 5 additions & 2 deletions ...rvice-core/src/main/java/org/hisp/dhis/program/ProgramElementsAndAttributesCollecter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@
package org.hisp.dhis.program;

import static com.google.common.base.Preconditions.checkNotNull;
import static org.hisp.dhis.parser.expression.ParserUtils.*;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.*;
import static org.hisp.dhis.parser.expression.ParserUtils.assumeProgramExpressionProgramAttribute;
import static org.hisp.dhis.parser.expression.ParserUtils.assumeStageElementSyntax;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.A_BRACE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.HASH_BRACE;

import java.util.Set;
import org.hisp.dhis.parser.expression.antlr.ExpressionBaseListener;
Expand Down
24 changes: 23 additions & 1 deletion ...s/dhis-service-core/src/main/java/org/hisp/dhis/program/variable/ProgramVariableItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,29 @@
*/
package org.hisp.dhis.program.variable;

import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.*;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.ExprContext;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_ANALYTICS_PERIOD_END;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_ANALYTICS_PERIOD_START;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_COMPLETED_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_CREATION_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_CURRENT_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_DUE_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_ENROLLMENT_COUNT;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_ENROLLMENT_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_ENROLLMENT_STATUS;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_EVENT_COUNT;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_EVENT_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_EVENT_STATUS;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_EXECUTION_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_INCIDENT_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_ORG_UNIT_COUNT;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_PROGRAM_STAGE_ID;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_PROGRAM_STAGE_NAME;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_SCHEDULED_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_SCHEDULED_EVENT_COUNT;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_SYNC_DATE;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_TEI_COUNT;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_VALUE_COUNT;
import static org.hisp.dhis.parser.expression.antlr.ExpressionParser.V_ZERO_POS_VALUE_COUNT;

import com.google.common.collect.ImmutableMap;
Expand Down
4 changes: 3 additions & 1 deletion ...s-service-core/src/main/java/org/hisp/dhis/scheduling/DefaultJobConfigurationService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@
import org.hisp.dhis.fileresource.FileResource;
import org.hisp.dhis.fileresource.FileResourceDomain;
import org.hisp.dhis.fileresource.FileResourceService;
import org.hisp.dhis.jsontree.*;
import org.hisp.dhis.jsontree.JsonMixed;
import org.hisp.dhis.jsontree.JsonNode;
import org.hisp.dhis.jsontree.JsonObject;
import org.hisp.dhis.scheduling.JobType.Defaults;
import org.hisp.dhis.schema.Property;
import org.hisp.dhis.setting.SettingKey;
Expand Down
6 changes: 5 additions & 1 deletion .../dhis-service-core/src/main/java/org/hisp/dhis/scheduling/DefaultJobSchedulerService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.*;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
import javax.annotation.Nonnull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
11 changes: 9 additions & 2 deletions .../dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/scheduling/JobScheduler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,15 @@
import java.time.Instant;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.concurrent.*;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import lombok.RequiredArgsConstructor;
Expand Down
6 changes: 5 additions & 1 deletion ...is-service-core/src/main/java/org/hisp/dhis/security/oidc/DhisOidcClientRegistration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@

import com.nimbusds.jose.jwk.JWK;
import java.security.interfaces.RSAPublicKey;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.Builder;
import lombok.Data;
Expand Down
Loading

0 comments on commit 719ce54

Please sign in to comment.