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.

Sign up for GitHub

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

warnings in core/oxm/schema, jpa/parser, helpers #1317

Merged
merged 6 commits into from
Sep 22, 2021
Merged

warnings in core/oxm/schema, jpa/parser, helpers #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad4c095
warnings in core/oxm/schema, jpa/parser, helpers
lukasj Sep 21, 2021
559cb3f
don't change bigdecimal creation
lukasj Sep 21, 2021
c5edd22
attempt to harden modules with no warnings,
lukasj Sep 22, 2021
0e1a804
hide corba dependencies in osgi tests for now
lukasj Sep 22, 2021
76a6bb9
jpa.nosql build fix
lukasj Sep 22, 2021
0d12bf7
fix wrong collection lookup
lukasj Sep 22, 2021
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
33 changes: 23 additions & 10 deletions bundles/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
<packaging>jar</packaging>

<properties>
<comp.xlint>-Xlint:all</comp.xlint>
<comp.xdoclint>-Xdoclint:all,-missing</comp.xdoclint>
<comp.test.xlint>-Xlint:all</comp.test.xlint>

<!--Test properties-->
<archive.tmp.dir>archive-tmp</archive.tmp.dir>
<eclipselink.unzip.dir>${project.build.directory}/stage</eclipselink.unzip.dir>
Expand Down Expand Up @@ -86,16 +90,16 @@
<artifactId>parsson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.corba</groupId>
<artifactId>glassfish-corba-omgapi</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.corba</groupId>
<artifactId>glassfish-corba-orb</artifactId>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.glassfish.corba</groupId>-->
<!-- <artifactId>glassfish-corba-omgapi</artifactId>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.glassfish.corba</groupId>-->
<!-- <artifactId>glassfish-corba-orb</artifactId>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -174,6 +178,15 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-Werror</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...src/test/java/org/eclipse/persistence/testing/osgi/beanvalidation/BeanValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 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 @@ -63,7 +63,7 @@ public static Option[] config() {

@BeforeClass
public static void setUp() throws Exception {
Class[] classes = new Class[1];
Class<?>[] classes = new Class<?>[1];
classes[0] = Customer.class;
jaxbContext = JAXBContextFactory.createContext(classes, null);
}
Expand Down
4 changes: 2 additions & 2 deletions ...c/test/java/org/eclipse/persistence/testing/osgi/beanvalidation/NoBeanValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 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 @@ public static Option[] config() {

@BeforeClass
public static void setUp() throws Exception {
Class[] classes = new Class[1];
Class<?>[] classes = new Class<?>[1];
classes[0] = Customer.class;
jaxbContext = JAXBContextFactory.createContext(classes, null);
}
Expand Down
13 changes: 13 additions & 0 deletions dbws/eclipselink.dbws.test.oracle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
</parent>

<properties>
<comp.xlint>-Xlint:all</comp.xlint>
<comp.xdoclint>-Xdoclint:all,-missing</comp.xdoclint>
<comp.test.xlint>-Xlint:all</comp.test.xlint>

<test-skip-dbws-oracle>${skipTests}</test-skip-dbws-oracle>
</properties>

Expand Down Expand Up @@ -79,6 +83,15 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-Werror</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions ...k.dbws.test.oracle/src/it/java/dbws/testing/plsqlcollection/PLSQLcollectionTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
import org.eclipse.persistence.queries.DatabaseQuery;
import org.eclipse.persistence.sessions.DatabaseLogin;
import org.eclipse.persistence.sessions.DatabaseSession;
import org.eclipse.persistence.sessions.DatasourceLogin;
import org.eclipse.persistence.sessions.Project;
import org.eclipse.persistence.sessions.Session;
import org.eclipse.persistence.sessions.factories.XMLProjectReader;
Expand Down Expand Up @@ -292,7 +291,7 @@ public void fromProjectXML() {
Class<?> t1Clz = t1Descriptor.getJavaClass();
((DatabaseSession)session).login();
String[] elements = {"first string", "second string", "third string"};
NonSynchronizedVector queryArgs = new NonSynchronizedVector();
NonSynchronizedVector<Object> queryArgs = new NonSynchronizedVector<>();
queryArgs.add(elements);
queryArgs.add("barf");
boolean worked = false;
Expand Down
5 changes: 2 additions & 3 deletions ....persistence.dbws/src/main/java/org/eclipse/persistence/internal/dbws/ProviderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,16 +564,15 @@ public byte[] getAttachmentAsByteArray(String id) {
* binary objects, we must convert
*/
org.eclipse.persistence.internal.oxm.schema.model.Element invocationElement =
(org.eclipse.persistence.internal.oxm.schema.model.Element)
dbwsAdapter.getExtendedSchema().getTopLevelElements().get(invocation.getName());
dbwsAdapter.getExtendedSchema().getTopLevelElements().get(invocation.getName());
String typeName = invocationElement.getType();
int idx = typeName.indexOf(':');
if (idx != -1) {
// strip-off any namespace prefix
typeName = typeName.substring(idx+1);
}
ComplexType complexType =
(ComplexType)dbwsAdapter.getExtendedSchema().getTopLevelComplexTypes().get(typeName);
dbwsAdapter.getExtendedSchema().getTopLevelComplexTypes().get(typeName);
if (complexType.getSequence() != null) {
// for each operation, there is a corresponding top-level Request type
// which has the arguments to the operation
Expand Down
4 changes: 2 additions & 2 deletions ...istence.corba/src/it/java/org/eclipse/persistence/testing/tests/corba/CorbaTestModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 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 @@ -46,7 +46,7 @@ public void addTests() {

for (int index = 0; index < tests.size(); ++index) {
try {
addTest((TestModel) Class.forName(tests.get(index)).newInstance());
addTest((TestModel) Class.forName(tests.get(index)).getConstructor().newInstance());
} catch (Throwable exception) {
System.out.println("Failed to set up " + tests.get(index) + " \n" + exception);
// exception.printStackTrace();
Expand Down
14 changes: 7 additions & 7 deletions ...ore.test.framework/src/main/java/org/eclipse/persistence/tools/history/HistoryFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*/
public class HistoryFacade {

private static Map timeOffsetsMap = new IdentityHashMap();
private static Map<Session, Long> timeOffsetsMap = new IdentityHashMap<>();

protected HistoryFacade() {
}
Expand All @@ -62,7 +62,7 @@ protected static void buildHistoricalTableDefinition(HistoryPolicy policy,
fieldDef.setType(ClassConstants.TIMESTAMP);
fieldDef.setSize(6);
histDef.addField(fieldDef);
histDef.setForeignKeys(new Vector());
histDef.setForeignKeys(new Vector<>());

for (FieldDefinition fieldDef2 : histDef.getFields()) {
// For now foreign key constraints are not supported, because shallow inserts are not...
Expand Down Expand Up @@ -107,7 +107,7 @@ public static long currentDatabaseTimeMillis(org.eclipse.persistence.sessions.Se
}
}
if (timeOffsetsMap.containsKey(rootSession)) {
Long offset = (Long)timeOffsetsMap.get(rootSession);
Long offset = timeOffsetsMap.get(rootSession);
return System.currentTimeMillis() + offset;
} else {
DatabaseQuery query =
Expand All @@ -132,11 +132,11 @@ public static long currentDatabaseTimeMillis(org.eclipse.persistence.sessions.Se
public static void generateHistoricalTableDefinitions(TableCreator creator, Session session) {

// First add all table definitions to a hashtable.
Map<String, TableDefinition> tableDefinitions = new HashMap(creator.getTableDefinitions().size());
Map<String, TableDefinition> tableDefinitions = new HashMap<>(creator.getTableDefinitions().size());
for (TableDefinition def : creator.getTableDefinitions()) {
tableDefinitions.put(def.getFullName(), def);
}
Set<String> generatedTables = new HashSet<String>();
Set<String> generatedTables = new HashSet<>();
for (ClassDescriptor descriptor : session.getDescriptors().values()) {
HistoryPolicy policy = descriptor.getHistoryPolicy();
if (policy != null) {
Expand Down Expand Up @@ -188,15 +188,15 @@ public static void generateHistoricalTableDefinitions(TableCreator creator, Sess
* being the current table name with a _HIST suffix. Hence Employee would
* become Employee_Hist.
*/
public static void generateHistoryPolicies(Iterator descriptors, DatasourcePlatform platform) {
public static void generateHistoryPolicies(Iterator<ClassDescriptor> descriptors, DatasourcePlatform platform) {
HistoryPolicy basePolicy = new HistoryPolicy();
basePolicy.addStartFieldName("ROW_START");
basePolicy.addEndFieldName("ROW_END");

HistoryPolicy policy = null;

while (descriptors.hasNext()) {
ClassDescriptor descriptor = (ClassDescriptor)descriptors.next();
ClassDescriptor descriptor = descriptors.next();
policy = (HistoryPolicy)basePolicy.clone();
List<DatabaseTable> tables = descriptor.getTables();
int size = tables.size();
Expand Down
14 changes: 7 additions & 7 deletions ...ersistence.core/src/main/java/org/eclipse/persistence/core/queries/CoreAttributeItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void addSubGroup(ATTRIBUTE_GROUP group) {
if (this.group == null){
this.group = group;
}
Object type = group.getType();
Serializable type = group.getType();
if (type == null){
type = group.getTypeName();
}
Expand Down Expand Up @@ -202,9 +202,9 @@ public boolean equals(Object obj) {
if(obj == null) {
return false;
}
CoreAttributeItem anotherItem = null;
CoreAttributeItem<ATTRIBUTE_GROUP> anotherItem = null;
try {
anotherItem = (CoreAttributeItem)obj;
anotherItem = (CoreAttributeItem<ATTRIBUTE_GROUP>)obj;
} catch (ClassCastException cce) {
return false;
}
Expand All @@ -215,7 +215,7 @@ public boolean equals(Object obj) {
}
if (this.subGroups.size() == anotherItem.subGroups.size()){
for (Map.Entry<Object, ATTRIBUTE_GROUP> entry : this.subGroups.entrySet()){
ATTRIBUTE_GROUP anotherGroup = (ATTRIBUTE_GROUP)anotherItem.subGroups.get(entry.getKey());
ATTRIBUTE_GROUP anotherGroup = anotherItem.subGroups.get(entry.getKey());
if (! entry.getValue().equals(anotherGroup)){
return false;
}
Expand All @@ -233,7 +233,7 @@ public boolean equals(Object obj) {
}
if (this.keyGroups.size() == anotherItem.keyGroups.size()){
for (Map.Entry<Object, ATTRIBUTE_GROUP> entry : this.keyGroups.entrySet()){
ATTRIBUTE_GROUP anotherGroup = (ATTRIBUTE_GROUP)anotherItem.keyGroups.get(entry.getKey());
ATTRIBUTE_GROUP anotherGroup = anotherItem.keyGroups.get(entry.getKey());
if (! entry.getValue().equals(anotherGroup)){
return false;
}
Expand Down Expand Up @@ -344,10 +344,10 @@ public void setRootGroup(ATTRIBUTE_GROUP group) {

@Override
public String toString() {
return getClass().getSimpleName() + "(" + getAttributeName() + ")" + (this.subGroups!=null ? " => " + this.subGroups.toString() : "") + (this.keyGroups!=null ? " => " + this.keyGroups.toString() : "");
return getClass().getSimpleName() + "(" + getAttributeName() + ")" + (this.subGroups!=null ? " => " + this.subGroups : "") + (this.keyGroups!=null ? " => " + this.keyGroups : "");
}

public String toStringNoClassName() {
return getAttributeName() + (this.subGroups!=null ? " => " + this.subGroups.toString() : "")+ (this.keyGroups!=null ? " => " + this.keyGroups.toString() : "");
return getAttributeName() + (this.subGroups!=null ? " => " + this.subGroups : "")+ (this.keyGroups!=null ? " => " + this.keyGroups : "");
}
}
7 changes: 3 additions & 4 deletions ...clipse.persistence.core/src/main/java/org/eclipse/persistence/descriptors/CacheIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.eclipse.persistence.internal.helper.ClassConstants;
Expand Down Expand Up @@ -43,11 +44,9 @@ public CacheIndex() {
this.fields = new ArrayList<>();
}

public CacheIndex(DatabaseField fields[]) {
public CacheIndex(DatabaseField[] fields) {
this.fields = new ArrayList<>(fields.length);
for (DatabaseField field : fields) {
this.fields.add(field);
}
Collections.addAll(this.fields, fields);
}

public CacheIndex(String... fields) {
Expand Down
2 changes: 0 additions & 2 deletions ...lipse.persistence.core/src/main/java/org/eclipse/persistence/descriptors/CachePolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.Map;
import java.util.Set;

import jakarta.persistence.Cache;
import org.eclipse.persistence.annotations.CacheCoordinationType;
import org.eclipse.persistence.annotations.CacheKeyType;
import org.eclipse.persistence.annotations.DatabaseChangeNotificationType;
Expand All @@ -47,7 +46,6 @@
import org.eclipse.persistence.mappings.DatabaseMapping;
import org.eclipse.persistence.sessions.DatabaseSession;
import org.eclipse.persistence.sessions.interceptors.CacheInterceptor;
import org.eclipse.persistence.sessions.interceptors.CacheKeyInterceptor;

/**
* <p><b>Purpose</b>:
Expand Down
Loading