Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix build warning messages #2277

Open
wants to merge 4 commits into
base: integration
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
@XmlType(factoryMethod = "anonymousPrincipal", propOrder = {"name", "proxiedUsers", "creationTime"})
@XmlAccessorType(XmlAccessType.NONE)
public class DatawavePrincipal implements ProxiedUserDetails, Principal, Serializable {

private static final long serialVersionUID = -4882226447158615343L;
private final String username;
private final DatawaveUser primaryUser;
@XmlElement
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class ExtJsResponse<T> extends BaseQueryResponse {

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 2957709211965763347L;
private List<T> data;
private int total;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

public class BaseTableCache implements Serializable, TableCache {

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = -5849784584173005890L;

private final transient Logger log = Logger.getLogger(this.getClass());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public interface EvictionCallback {
void evict(String dn);
}

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = -25185425479055590L;
private static final String LIVE_SERVERS = "/liveServers";
private static final long EVICT_MESSAGE_TIMEOUT = 60 * 1000L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ enum State {
*
* Deprecated in 2.2.3, use {@link #getClient(String, Collection, String, Priority, Map)}
*
* @param userDN
* the user's DN
* @param proxyServers
* thecollectiuon of proxy servers
* @param priority
* the connection's Priority
* @param trackingMap
Expand All @@ -50,6 +54,10 @@ enum State {
/**
* Gets a connection from the named pool with the assigned priority
*
* @param userDN
* the user's DN
* @param proxyServers
* collection of proxy servers
* @param poolName
* the name of the pool to retrieve the connection from
* @param priority
Expand All @@ -75,6 +83,8 @@ AccumuloClient getClient(String userDN, Collection<String> proxyServers, String

/**
* Return a report of the current connection factory usage
*
* @return the report
*/
String report();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ public void close() {
* the connection's Priority
* @return accumulo connection
* @throws Exception
* when error encountered getting client
*/
@Override
public AccumuloClient getClient(final String userDN, final Collection<String> proxyServers, Priority priority, Map<String,String> trackingMap)
Expand All @@ -196,6 +197,7 @@ public AccumuloClient getClient(final String userDN, final Collection<String> pr
* the tracking map
* @return Accumulo connection
* @throws Exception
* when error encountered getting client
*/
@Override
public AccumuloClient getClient(final String userDN, final Collection<String> proxyServers, final String cpn, final Priority priority,
Expand Down Expand Up @@ -236,6 +238,7 @@ public AccumuloClient getClient(final String userDN, final Collection<String> pr
* @param client
* The connection to return
* @throws Exception
* when error encountered getting client
*/
@Override
public void returnClient(AccumuloClient client) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
public class AccumuloTableCacheStatus extends BaseResponse implements HtmlProvider {

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = -4434127659799676913L;
private static final String TITLE = "Accumulo Table Cache Status", EMPTY = "";

@XmlElementWrapper(name = "TableCaches")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@XmlAccessorType(XmlAccessType.NONE)
public class Connection implements Serializable, Comparable<Connection> {

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = -2003281391380863328L;

@XmlAttribute
private String state = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
public class ConnectionFactoryResponse extends BaseResponse implements HtmlProvider {

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 6113726446236223919L;
private static final String TITLE = "Accumulo Connection Factory Metrics", EMPTY = "";

@XmlElementWrapper(name = "ConnectionPools")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@XmlAccessorType(XmlAccessType.NONE)
public class ConnectionPool implements Serializable, Comparable<ConnectionPool> {

private static final long serialVersionUID = 2L;
private static final long serialVersionUID = -1080014568240669701L;

public enum Priority {
ADMIN, HIGH, NORMAL, LOW
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@XmlAccessorType(XmlAccessType.NONE)
public class ConnectionProperty implements Serializable, Comparable<ConnectionProperty> {

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = -3008355929086673741L;

@XmlAttribute(required = true)
private String name = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
public class TableCacheDescription implements Serializable {
private static final long serialVersionUID = 1L;

private static final long serialVersionUID = -2832954010469120174L;
@XmlAttribute
private String tableName = null;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public interface EvictionCallback {
void evict(String dn);
}

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 849730389996326126L;
private static final String LIVE_SERVERS = "/liveServers";
private static final long EVICT_MESSAGE_TIMEOUT = 60 * 1000L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class BulkResultsFileOutputMapper extends ApplicationContextAwareMapper<K
*/
public static final String RESULT_SERIALIZATION_FORMAT = "bulk.results.serial.format";

private QueryLogicTransformer t = null;
private QueryLogicTransformer<Key,Value> t = null;
private Map<Key,Value> entries = new HashMap<>();
private Map<String,Class<? extends BaseQueryResponse>> responseClassMap = new HashMap<>();
private SerializationFormat format = SerializationFormat.XML;
Expand Down Expand Up @@ -98,7 +98,7 @@ protected void map(Key key, Value value, org.apache.hadoop.mapreduce.Mapper<Key,
entries.put(key, value);
for (Entry<Key,Value> entry : entries.entrySet()) {
try {
Object o = t.transform(entry);
Object o = t.transform(entry.getKey());
BaseQueryResponse response = t.createResponse(new ResultsPage(Collections.singletonList(o)));
Class<? extends BaseQueryResponse> responseClass = null;
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,8 @@ public AccumuloConnectionFactory.Priority getPriority() {
* operation
* @param userAuths
* set of user auths
* @param userDetails
* proxied user details
* @return Event
* @throws Exception
* if there are issues
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ public void reloadMutableFieldCache() {

/**
* List the mutable fields in the cache
*
* @return list of mutable fields
*/
public String listMutableFields() {
return cache.toString();
Expand All @@ -100,6 +102,7 @@ public String listMutableFields() {
* Check to see if field for specified datatype is mutable
*
* @param datatype
* the data type
* @param field
* name of field
* @return true if field is mutable for the given datatype
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public void setSecurityMarkingExemptFields(List<String> securityMarkingExemptFie
/**
* Handle to query service in case the modification service needs to run queries.
*
* @param userDetails
* proxied user details
* @return ModificationQueryService
*/
public ModificationQueryService getQueryService(ProxiedUserDetails userDetails) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
// used when a transformer gets a non-null empty object
// and the TransformIterator should call next instead of returning null
public class EmptyObjectException extends RuntimeException {

private static final long serialVersionUID = 1545558691183965869L;
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public interface CheckpointableQueryLogic {
* handling a previously returned checkpoint.
*
* @param checkpoint
* the checkpoint
* @return The updated checkpoint
*/
QueryCheckpoint updateCheckpoint(QueryCheckpoint checkpoint);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ default ResultPostprocessor getResultPostprocessor(GenericQueryConfiguration con

default String getResponseClass(Query query) throws QueryException {
try {
QueryLogicTransformer t = this.getEnrichedTransformer(query);
QueryLogicTransformer<?,?> t = this.getEnrichedTransformer(query);
BaseResponse refResponse = t.createResponse(new ResultsPage());
return refResponse.getClass().getCanonicalName();
} catch (RuntimeException e) {
Expand Down Expand Up @@ -463,6 +463,7 @@ default void preInitialize(Query settings, Set<Authorizations> userAuthorization
* Set a client configuration for scanner hints and consistency.
*
* @param config
* the client configuration
*/
void setClientConfig(AccumuloClientConfiguration config);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import datawave.webservice.query.exception.QueryException;

public class CompositeLogicException extends RuntimeException {
private static final long serialVersionUID = -1365648791651294460L;

public CompositeLogicException(String message, String logicName, Exception exception) {
super(getMessage(message, Collections.singletonMap(logicName, exception)), getRaisedQueryException(exception));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import datawave.microservice.query.QueryImpl;

public class CompositeQueryConfiguration extends GenericQueryConfiguration implements Serializable {
private static final long serialVersionUID = -1439235443475270042L;

private Map<String,GenericQueryConfiguration> configs = new HashMap<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,7 @@ public SelectorExtractor getSelectorExtractor() {
* Setting the current user is called after the logic is created. Pass this on to the children.
*
* @param user
* the proxied user
*/
@Override
public void setCurrentUser(ProxiedUserDetails user) {
Expand All @@ -711,6 +712,7 @@ public void setCurrentUser(ProxiedUserDetails user) {
* /** Setting the server user is called after the logic is created. Pass this on to the children.
*
* @param user
* the proxied user
*/
@Override
public void setServerUser(ProxiedUserDetails user) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public interface QueryPredictor<T extends BaseQueryMetric> {
Set<Prediction> predict(T query) throws PredictionException;

class PredictionException extends Exception implements Serializable {
private static final long serialVersionUID = 61150377750239886L;

public PredictionException() {
super();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public interface RemoteQueryService {
* @param callerObject
* the caller
* @return the generic response
* @throws QueryException
* on error when creating query
*/
GenericResponse<String> createQuery(String queryLogicName, Map<String,List<String>> queryParameters, ProxiedUserDetails callerObject) throws QueryException;

Expand All @@ -36,6 +38,8 @@ public interface RemoteQueryService {
* @param callerObject
* the caller
* @return the base query response
* @throws QueryException
* on error with query
*/
BaseQueryResponse next(String id, ProxiedUserDetails callerObject) throws QueryException;

Expand All @@ -47,6 +51,8 @@ public interface RemoteQueryService {
* @param callerObject
* the caller
* @return the void response
* @throws QueryException
* on error closing query
*/
VoidResponse close(String id, ProxiedUserDetails callerObject) throws QueryException;

Expand All @@ -60,6 +66,8 @@ public interface RemoteQueryService {
* @param callerObject
* the caller
* @return the generic response
* @throws QueryException
* on error planning query
*/
GenericResponse<String> planQuery(String queryLogicName, Map<String,List<String>> queryParameters, ProxiedUserDetails callerObject) throws QueryException;

Expand All @@ -71,6 +79,8 @@ public interface RemoteQueryService {
* @param callerObject
* the caller
* @return a generic response
* @throws QueryException
* on error planning query
*/
GenericResponse<String> planQuery(String id, ProxiedUserDetails callerObject) throws QueryException;

Expand Down
6 changes: 0 additions & 6 deletions docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,6 @@
<version>2.28.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.28.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion warehouse/accumulo-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<id>clover</id>
<dependencies>
<dependency>
<groupId>com.cenqua.clover</groupId>
<groupId>org.openclover</groupId>
<artifactId>clover</artifactId>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ public AgeOffFileGenerator(AgeOffFileConfiguration configuration) {
/**
* Writes the file to the writer.
*
* @param writer
* the writer
*
* @throws IOException
* i/o exception with writer
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* Creats a transformable node from an AgeOffRuleLoader.RuleConfig
*/
public class RuleConfigDocument extends DocumentImpl {
private static final long serialVersionUID = 8726547864456487943L;
private static final String FILTER_CLASS_ELEMENT_NAME = "filterClass";
private static final String MATCH_PATTERN_ELEMENT_NAME = "matchPattern";
private static final String TTL_ELEMENT_NAME = "ttl";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public abstract class TokenSpecParser<B extends TokenSpecParser> {
*
* @return TokenSpecParser child object
*/
@SuppressWarnings("unchecked")
public B parse(String configuration) {
ParserState parser = new ParserState(configuration);
parser.parseTo(this);
Expand Down Expand Up @@ -176,7 +177,7 @@ protected String expect(ParseTokenType type) {
* @param builder
* token spec parser
*/
protected void parseTo(TokenSpecParser builder) {
protected void parseTo(TokenSpecParser<?> builder) {
ParseToken initialToken;
while ((initialToken = peek()) != null) {
String tokenStr = parseStrliteral();
Expand Down
Loading
Loading