Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OGM-220 Fix remaining wrong line endings
- Loading branch information
Showing
4 changed files
with
210 additions
and
209 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,3 +13,4 @@ | |
| # Specify we want Java-friendly readable chunk headers for diff: | ||
|
|
||
| *.java diff=java | ||
|
|
||
106 changes: 53 additions & 53 deletions
106
hibernate-ogm-core/src/main/java/org/hibernate/ogm/datastore/spi/TupleContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,53 @@ | ||
| /* | ||
| * Hibernate, Relational Persistence for Idiomatic Java | ||
| * | ||
| * JBoss, Home of Professional Open Source | ||
| * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors | ||
| * as indicated by the @authors tag. All rights reserved. | ||
| * See the copyright.txt in the distribution for a | ||
| * full listing of individual contributors. | ||
| * | ||
| * This copyrighted material is made available to anyone wishing to use, | ||
| * modify, copy, or redistribute it subject to the terms and conditions | ||
| * of the GNU Lesser General Public License, v. 2.1. | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT A | ||
| * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
| * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | ||
| * You should have received a copy of the GNU Lesser General Public License, | ||
| * v.2.1 along with this distribution; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
| * MA 02110-1301, USA. | ||
| */ | ||
| package org.hibernate.ogm.datastore.spi; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Represents all information used to load an entity | ||
| * with some specific characteristics like a projection | ||
| * | ||
| * @author Guillaume Scheibel <guillaume.scheibel@gmail.com> | ||
| */ | ||
| public class TupleContext { | ||
| public TupleContext(List<String> selectableColumns) { | ||
| this.selectableColumns = selectableColumns; | ||
| } | ||
|
|
||
| private final List<String> selectableColumns; | ||
|
|
||
| public List<String> getSelectableColumns() { | ||
| return selectableColumns; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| final StringBuilder builder = new StringBuilder( "Tuple Context {" ); | ||
| for ( String columnName : this.getSelectableColumns() ) { | ||
| builder.append( columnName ); | ||
| } | ||
| builder.append( "}" ); | ||
| return builder.toString(); | ||
| } | ||
| } | ||
| /* | ||
| * Hibernate, Relational Persistence for Idiomatic Java | ||
| * | ||
| * JBoss, Home of Professional Open Source | ||
| * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors | ||
| * as indicated by the @authors tag. All rights reserved. | ||
| * See the copyright.txt in the distribution for a | ||
| * full listing of individual contributors. | ||
| * | ||
| * This copyrighted material is made available to anyone wishing to use, | ||
| * modify, copy, or redistribute it subject to the terms and conditions | ||
| * of the GNU Lesser General Public License, v. 2.1. | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT A | ||
| * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
| * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | ||
| * You should have received a copy of the GNU Lesser General Public License, | ||
| * v.2.1 along with this distribution; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
| * MA 02110-1301, USA. | ||
| */ | ||
| package org.hibernate.ogm.datastore.spi; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Represents all information used to load an entity | ||
| * with some specific characteristics like a projection | ||
| * | ||
| * @author Guillaume Scheibel <guillaume.scheibel@gmail.com> | ||
| */ | ||
| public class TupleContext { | ||
| public TupleContext(List<String> selectableColumns) { | ||
| this.selectableColumns = selectableColumns; | ||
| } | ||
|
|
||
| private final List<String> selectableColumns; | ||
|
|
||
| public List<String> getSelectableColumns() { | ||
| return selectableColumns; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| final StringBuilder builder = new StringBuilder( "Tuple Context {" ); | ||
| for ( String columnName : this.getSelectableColumns() ) { | ||
| builder.append( columnName ); | ||
| } | ||
| builder.append( "}" ); | ||
| return builder.toString(); | ||
| } | ||
| } |
128 changes: 64 additions & 64 deletions
128
hibernate-ogm-core/src/test/java/org/hibernate/ogm/test/id/Label.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,64 @@ | ||
| /* | ||
| * Hibernate, Relational Persistence for Idiomatic Java | ||
| * | ||
| * JBoss, Home of Professional Open Source | ||
| * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors | ||
| * as indicated by the @authors tag. All rights reserved. | ||
| * See the copyright.txt in the distribution for a | ||
| * full listing of individual contributors. | ||
| * | ||
| * This copyrighted material is made available to anyone wishing to use, | ||
| * modify, copy, or redistribute it subject to the terms and conditions | ||
| * of the GNU Lesser General Public License, v. 2.1. | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT A | ||
| * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
| * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | ||
| * You should have received a copy of the GNU Lesser General Public License, | ||
| * v.2.1 along with this distribution; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
| * MA 02110-1301, USA. | ||
| */ | ||
| package org.hibernate.ogm.test.id; | ||
|
|
||
| import javax.persistence.Entity; | ||
| import javax.persistence.GeneratedValue; | ||
| import javax.persistence.GenerationType; | ||
| import javax.persistence.Id; | ||
|
|
||
| /** | ||
| * @author Guillaume Scheibel <guillaume.scheibel@gmail.com> | ||
| */ | ||
| @Entity | ||
| public class Label { | ||
|
|
||
| @Id | ||
| @GeneratedValue(strategy = GenerationType.AUTO) | ||
| private Long id; | ||
|
|
||
| private String name; | ||
|
|
||
| public Label() { | ||
| super(); | ||
| } | ||
|
|
||
| public Label(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public Long getId() { | ||
|
|
||
| return id; | ||
| } | ||
|
|
||
| public void setId(Long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
| } | ||
| /* | ||
| * Hibernate, Relational Persistence for Idiomatic Java | ||
| * | ||
| * JBoss, Home of Professional Open Source | ||
| * Copyright 2012 Red Hat Inc. and/or its affiliates and other contributors | ||
| * as indicated by the @authors tag. All rights reserved. | ||
| * See the copyright.txt in the distribution for a | ||
| * full listing of individual contributors. | ||
| * | ||
| * This copyrighted material is made available to anyone wishing to use, | ||
| * modify, copy, or redistribute it subject to the terms and conditions | ||
| * of the GNU Lesser General Public License, v. 2.1. | ||
| * This program is distributed in the hope that it will be useful, but WITHOUT A | ||
| * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
| * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. | ||
| * You should have received a copy of the GNU Lesser General Public License, | ||
| * v.2.1 along with this distribution; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
| * MA 02110-1301, USA. | ||
| */ | ||
| package org.hibernate.ogm.test.id; | ||
|
|
||
| import javax.persistence.Entity; | ||
| import javax.persistence.GeneratedValue; | ||
| import javax.persistence.GenerationType; | ||
| import javax.persistence.Id; | ||
|
|
||
| /** | ||
| * @author Guillaume Scheibel <guillaume.scheibel@gmail.com> | ||
| */ | ||
| @Entity | ||
| public class Label { | ||
|
|
||
| @Id | ||
| @GeneratedValue(strategy = GenerationType.AUTO) | ||
| private Long id; | ||
|
|
||
| private String name; | ||
|
|
||
| public Label() { | ||
| super(); | ||
| } | ||
|
|
||
| public Label(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public Long getId() { | ||
|
|
||
| return id; | ||
| } | ||
|
|
||
| public void setId(Long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| public void setName(String name) { | ||
| this.name = name; | ||
| } | ||
| } |
Oops, something went wrong.