You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2017/03/17 00:20:15 UTC

[07/19] ignite git commit: IGNITE-3429 - Rollback due to broken compilation

IGNITE-3429 - Rollback due to broken compilation


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0e2df26
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0e2df26
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0e2df26

Branch: refs/heads/ignite-1192
Commit: c0e2df26f056cd11690d821146f05e3fd938906e
Parents: 2f57760
Author: dkarachentsev <dk...@gridgain.com>
Authored: Mon Feb 20 11:17:35 2017 +0300
Committer: dkarachentsev <dk...@gridgain.com>
Committed: Mon Feb 20 11:17:35 2017 +0300

----------------------------------------------------------------------
 .../Hibernate5CacheKeyTypeConfiguration.java    | 52 --------------------
 .../HibernateCacheKeyTypeConfiguration.java     | 51 -------------------
 2 files changed, 103 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c0e2df26/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/config/Hibernate5CacheKeyTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/config/Hibernate5CacheKeyTypeConfiguration.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/config/Hibernate5CacheKeyTypeConfiguration.java
deleted file mode 100644
index 886f69b..0000000
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/config/Hibernate5CacheKeyTypeConfiguration.java
+++ /dev/null
@@ -1,52 +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.ignite.cache.hibernate.config;
-
-import java.util.Objects;
-import org.apache.ignite.binary.BinaryAbstractIdentityResolver;
-import org.apache.ignite.binary.BinaryIdentityResolver;
-import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.binary.BinaryTypeConfiguration;
-
-/**
- * This configuration provides correct {@link BinaryIdentityResolver} implementation
- * for Hibernate CacheKey class can be used as a key object.
- *
- * Note: for Hibernate version < 5.0 {@link HibernateCacheKeyTypeConfiguration} should be used.
-
- */
-public class Hibernate5CacheKeyTypeConfiguration extends BinaryTypeConfiguration {
-
-    /** {@inheritDoc} */
-    public Hibernate5CacheKeyTypeConfiguration() {
-        super("org.hibernate.cache.internal.CacheKeyImplementation");
-
-        setIdentityResolver(new BinaryAbstractIdentityResolver() {
-            @Override protected int hashCode0(BinaryObject obj) {
-                return obj.field("id").hashCode();
-            }
-
-            @Override protected boolean equals0(BinaryObject o1, BinaryObject o2) {
-                Object obj0 = o1.field("id");
-                Object obj1 = o2.field("id");
-
-                return Objects.equals(obj0, obj1);
-            }
-        });
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0e2df26/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/config/HibernateCacheKeyTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/config/HibernateCacheKeyTypeConfiguration.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/config/HibernateCacheKeyTypeConfiguration.java
deleted file mode 100644
index c54292e..0000000
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/config/HibernateCacheKeyTypeConfiguration.java
+++ /dev/null
@@ -1,51 +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.ignite.cache.hibernate.config;
-
-import java.util.Objects;
-import org.apache.ignite.binary.BinaryAbstractIdentityResolver;
-import org.apache.ignite.binary.BinaryIdentityResolver;
-import org.apache.ignite.binary.BinaryObject;
-import org.apache.ignite.binary.BinaryTypeConfiguration;
-
-/**
- * This configuration provides correct {@link BinaryIdentityResolver} implementation
- * for Hibernate CacheKey class can be used as a key object.
- *
- * Note: for Hibernate version >= 5.0 {@link Hibernate5CacheKeyTypeConfiguration} should be used.
- */
-public class HibernateCacheKeyTypeConfiguration extends BinaryTypeConfiguration {
-
-    /** {@inheritDoc} */
-    public HibernateCacheKeyTypeConfiguration() {
-        super("org.hibernate.cache.spi.CacheKey");
-
-        setIdentityResolver(new BinaryAbstractIdentityResolver() {
-            @Override protected int hashCode0(BinaryObject obj) {
-                return obj.field("key").hashCode();
-            }
-
-            @Override protected boolean equals0(BinaryObject o1, BinaryObject o2) {
-                Object obj0 = o1.field("key");
-                Object obj1 = o2.field("key");
-
-                return Objects.equals(obj0, obj1);
-            }
-        });
-    }
-}