This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
The following commit(s) were added to refs/heads/3 by this push:
new 8653714c Removed unused Java 8 adapters
8653714c is described below
commit 8653714c3f69d86946a9e9ad3cbae50c7dd518c5
Author: ddekany <[email protected]>
AuthorDate: Tue Nov 5 21:01:13 2024 +0100
Removed unused Java 8 adapters
---
.../java/org/apache/freemarker/core/_Java8.java | 34 --------------
.../org/apache/freemarker/core/_Java8Impl.java | 54 ----------------------
2 files changed, 88 deletions(-)
diff --git
a/freemarker-core/src/main/java/org/apache/freemarker/core/_Java8.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/_Java8.java
deleted file mode 100644
index 491a3ddc..00000000
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/_Java8.java
+++ /dev/null
@@ -1,34 +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
- *
- * http://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.freemarker.core;
-
-import java.lang.reflect.Method;
-
-/**
- * Used internally only, might change without notice!
- * Used for accessing functionality that's only present in Java 6 or later.
- */
-public interface _Java8 {
-
- /**
- * Returns if it's a Java 8 "default method".
- */
- boolean isDefaultMethod(Method method);
-}
diff --git
a/freemarker-core/src/main/java/org/apache/freemarker/core/_Java8Impl.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/_Java8Impl.java
deleted file mode 100644
index c94fbf5c..00000000
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/_Java8Impl.java
+++ /dev/null
@@ -1,54 +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
- *
- * http://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.freemarker.core;
-
-import java.lang.reflect.Method;
-
-/**
- * Used internally only, might change without notice!
- * Used for accessing functionality that's only present in Java 8 or later.
- */
-public final class _Java8Impl implements _Java8 {
-
- public static final _Java8 INSTANCE = new _Java8Impl();
-
- private final Method isDefaultMethodMethod;
-
- private _Java8Impl() {
- // Not meant to be instantiated
- try {
- isDefaultMethodMethod = Method.class.getMethod("isDefault");
- } catch (NoSuchMethodException e) {
- throw new IllegalStateException(e);
- }
- }
-
- @Override
- public boolean isDefaultMethod(Method method) {
- try {
- // In FM2 this was compiled against Java 8 and this was a direct
call. Doing that in a way that fits
- // IDE-s would be an overkill (would need introducing two new
modules), so we fell back to reflection.
- return ((Boolean)
isDefaultMethodMethod.invoke(method)).booleanValue();
- } catch (Exception e) {
- throw new IllegalStateException("Failed to call
Method.isDefaultMethod()", e);
- }
- }
-
-}
