This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new df4c02f51 CAY-2823 Merge ServerRuntime back to CayenneRuntime and
deprecate it - delete unused internal classes
df4c02f51 is described below
commit df4c02f516bceb24314e4a094dcb99354603c092
Author: stariy95 <[email protected]>
AuthorDate: Thu Nov 23 16:24:26 2023 +0400
CAY-2823 Merge ServerRuntime back to CayenneRuntime and deprecate it
- delete unused internal classes
---
.../server/FixedDataSourceFactory.java | 40 ---------------------
.../server/FixedJNDIDataSourceFactory.java | 41 ----------------------
2 files changed, 81 deletions(-)
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/FixedDataSourceFactory.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/FixedDataSourceFactory.java
deleted file mode 100644
index 6745b012f..000000000
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/FixedDataSourceFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.configuration.server;
-
-import javax.sql.DataSource;
-
-import org.apache.cayenne.configuration.DataNodeDescriptor;
-
-/**
- * @since 4.0
- */
-class FixedDataSourceFactory implements DataSourceFactory {
-
- private DataSource dataSource;
-
- public FixedDataSourceFactory(DataSource dataSource) {
- this.dataSource = dataSource;
- }
-
- @Override
- public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws
Exception {
- return dataSource;
- }
-}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/FixedJNDIDataSourceFactory.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/FixedJNDIDataSourceFactory.java
deleted file mode 100644
index 5016508cb..000000000
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/FixedJNDIDataSourceFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.configuration.server;
-
-import org.apache.cayenne.configuration.DataNodeDescriptor;
-
-/**
- * @since 4.0
- * @deprecated since 5.0
- */
-@Deprecated
-class FixedJNDIDataSourceFactory extends JNDIDataSourceFactory {
-
- private String location;
-
- public FixedJNDIDataSourceFactory(String location) {
- this.location = location;
- }
-
- @Override
- protected String getLocation(DataNodeDescriptor nodeDescriptor) {
- return location;
- }
-
-}
