Skip to content

Commit

Permalink
use generic Class in core, moxy, sdo (#1324)
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
lukasj committed Sep 24, 2021
1 parent 61bbf0c commit f2857fc
Show file tree
Hide file tree
Showing 446 changed files with 2,358 additions and 2,354 deletions.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -48,7 +48,7 @@
* paramterized type of the collection when defined using
* generics.
*/
Class targetClass() default void.class;
Class<?> targetClass() default void.class;

/**
* (Required) The database name of the database array structure type.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -37,5 +37,5 @@
/**
* The Class that will be used to intercept EclipseLink's cache access.
*/
Class value();
Class<?> value();
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -58,5 +58,5 @@
* (Required) The converter class to be used. This class must implement the
* org.eclipse.persistence.mappings.converters.Converter interface.
*/
Class converterClass();
Class<?> converterClass();
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -50,5 +50,5 @@
* This defines the class of the copy policy. It must specify a class that
* implements org.eclipse.persistence.descriptors.copying.CopyPolicy
*/
Class value();
Class<?> value();
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -40,5 +40,5 @@
* (Required) Defines the name of the descriptor customizer that should be
* applied to this entity's descriptor.
*/
Class value();
Class<?> value();
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -37,5 +37,5 @@
/**
* (Required) The class to the instantiated with the given discriminator.
*/
Class value();
Class<?> value();
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@
* @see #resultClasses
*/
@Deprecated
Class resultClass() default void.class;
Class<?> resultClass() default void.class;

/**
* (Optional) Refers to the classes of the result.
*/
Class[] resultClasses() default {};
Class<?>[] resultClasses() default {};

/**
* (Optional) The name of the SQLResultMapping.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -57,13 +57,13 @@
* (Optional) Specify the type stored on the database. The default is
* inferred from the type of the persistence field or property.
*/
Class dataType() default void.class;
Class<?> dataType() default void.class;

/**
* (Optional) Specify the type stored on the entity. The default is inferred
* from the type of the persistent field or property.
*/
Class objectType() default void.class;
Class<?> objectType() default void.class;

/**
* (Required) Specify the conversion values to be used with the object
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -84,5 +84,5 @@
* If specified must be a simple type that could be handled by ConversionManager:
* numerical, boolean, temporal.
*/
Class valueType() default String.class;
Class<?> valueType() default String.class;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -41,7 +41,7 @@
* it or alternately performing some side effect like auditing.
*
*/
Class allQueries() default void.class;
Class<?> allQueries() default void.class;

/**
* A Default ReadAll Query Redirector will be applied to any executing
Expand All @@ -50,23 +50,23 @@
* it or alternately performing some side effect like auditing.
* For users executing a JPA Query through the getResultList() API this is the redirector that will be invoked
* */
Class readAll() default void.class;
Class<?> readAll() default void.class;

/**
* A Default ReadObject Query Redirector will be applied to any executing
* ReadObjectQuery that does not have a redirector set directly on the query.
* Query redirectors allow the user to intercept query execution preventing
* it or alternately performing some side effect like auditing.
* For users executing a JPA Query through the getSingleResult() API or EntityManager.find() this is the redirector that will be invoked */
Class readObject() default void.class;
Class<?> readObject() default void.class;

/**
* A Default ReportQuery Redirector will be applied to any executing
* ReportQuery that does not have a redirector set directly on the query.
* Query redirectors allow the user to intercept query execution preventing
* it or alternately performing some side effect like auditing.
* For users executing a JPA Query that contains agregate functions or selects multiple entities this is the redirector that will be invoked */
Class report() default void.class;
Class<?> report() default void.class;

/**
* A Default Update Query Redirector will be applied to any executing
Expand All @@ -75,7 +75,7 @@
* Query redirectors allow the user to intercept query execution preventing
* it or alternately performing some side effect like auditing.
*/
Class update() default void.class;
Class<?> update() default void.class;

/**
* A Default Insert Query Redirector will be applied to any executing
Expand All @@ -84,14 +84,14 @@
* Query redirectors allow the user to intercept query execution preventing
* it or alternately performing some side effect like auditing.
*/
Class insert() default void.class;
Class<?> insert() default void.class;

/**
* A Default Delete Object Query Redirector will be applied to any executing
* DeleteObjectQuery or DeleteAllQuery that does not have a redirector set directly on the query.
* Query redirectors allow the user to intercept query execution preventing
* it or alternately performing some side effect like auditing.
*/
Class delete() default void.class;
Class<?> delete() default void.class;

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -66,7 +66,7 @@
RangePartition[] partitions();

/** The type of the start and end values. */
Class partitionValueType() default String.class;
Class<?> partitionValueType() default String.class;

/**
* Defines if queries that do not contain the partition field should be sent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -52,7 +52,7 @@
* be used to create the value to be assigned to the attribute.
* Either transformerClass or method must be specified, but not both.
*/
Class transformerClass() default void.class;
Class<?> transformerClass() default void.class;

/**
* The mapped class must have a method with this name which returns a value
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -88,7 +88,7 @@
* The Class that implements org.eclipse.persistence.descriptors.SerializedObjectPolicy interface.
* This class must be specified.
*/
Class value();
Class<?> value();

/**
* (Optional) The column that holds the serialized object. By default it's a BLOB column named "SOP" in entity's main table.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
* (Optional) The type of Java class desired back from the procedure,
* this is dependent on the type returned from the procedure.
*/
Class type() default void.class;
Class<?> type() default void.class;

/**
* (Optional) The JDBC type code, this is dependent on the type returned
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -56,11 +56,11 @@
* (Optional) Specify the type stored on the database. The default is
* inferred from the type of the persistence field or property.
*/
Class dataType() default void.class;
Class<?> dataType() default void.class;

/**
* (Optional) Specify the type stored on the entity. The default is inferred
* from the type of the persistent field or property.
*/
Class objectType() default void.class;
Class<?> objectType() default void.class;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -62,7 +62,7 @@
ValuePartition[] partitions();

/** The type of the start and end values. */
Class partitionValueType() default String.class;
Class<?> partitionValueType() default String.class;

/** The default connection pool is used for any unmapped values. */
String defaultConnectionPool() default "";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -51,7 +51,7 @@
* not specified it will be inferred from the type of the object being
* referenced.
*/
Class targetInterface() default void.class;
Class<?> targetInterface() default void.class;

/**
* (Optional) The operations that must be cascaded to the target of the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand Down Expand Up @@ -66,7 +66,7 @@
* public Time buildFieldValue(Object instance, String fieldName, Session session).
* Either transformerClass or method must be specified, but not both.
*/
Class transformerClass() default void.class;
Class<?> transformerClass() default void.class;

/**
* The mapped class must have a method with this name which returns a value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ protected CoreInheritancePolicy() {
* INTERNAL:
* This method is invoked only for the abstract descriptors.
*/
public abstract Class classFromRow(ABSTRACT_RECORD record, ABSTRACT_SESSION session);
public abstract Class<?> classFromRow(ABSTRACT_RECORD record, ABSTRACT_SESSION session);

/**
* INTERNAL:
Expand Down Expand Up @@ -101,7 +101,7 @@ protected CoreInheritancePolicy() {
* PUBLIC:
* Return the parent class.
*/
public abstract Class getParentClass();
public abstract Class<?> getParentClass();

/**
* INTERNAL:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public interface CoreAttributeAccessor {
/**
* Return the class type of the attribute.
*/
Class getAttributeClass();
Class<?> getAttributeClass();

/**
* INTERNAL:
Expand All @@ -42,7 +42,7 @@ public interface CoreAttributeAccessor {
/**
* Allow any initialization to be performed with the descriptor class.
*/
void initializeAttributes(Class descriptorClass) throws DescriptorException;
void initializeAttributes(Class<?> descriptorClass) throws DescriptorException;

boolean isInstanceVariableAttributeAccessor();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected CoreMapping() {
*
* @return TODO
*/
public abstract Class getAttributeClassification();
public abstract Class<?> getAttributeClassification();

/**
* PUBLIC:
Expand Down

0 comments on commit f2857fc

Please sign in to comment.